Unverified Commit def0c983 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm64-dt-for-5.14' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM64: DT: HiSilicon ARM64 DT updates for 5.14

- Correct the HiSilicon copyright

* tag 'hisi-arm64-dt-for-5.14' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: use the correct HiSilicon copyright

Link: https://lore.kernel.org/r/60CBF4AE.7040301@hisilicon.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 79eb3cbf e3211e41
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
/*
 * dtsi for Hisilicon Hi3660 Coresight
 *
 * Copyright (C) 2016-2018 Hisilicon Ltd.
 * Copyright (C) 2016-2018 HiSilicon Ltd.
 *
 * Author: Wanglai Shi <shiwanglai@hisilicon.com>
 *
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
/*
 * dts file for Hisilicon HiKey960 Development Board
 *
 * Copyright (C) 2016, Hisilicon Ltd.
 * Copyright (C) 2016, HiSilicon Ltd.
 *
 */

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
/*
 * dts file for Hisilicon Hi3660 SoC
 *
 * Copyright (C) 2016, Hisilicon Ltd.
 * Copyright (C) 2016, HiSilicon Ltd.
 */

#include <dt-bindings/interrupt-controller/arm-gic.h>
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
/*
 * dts file for Hisilicon HiKey970 Development Board
 *
 * Copyright (C) 2016, Hisilicon Ltd.
 * Copyright (C) 2016, HiSilicon Ltd.
 * Copyright (C) 2018, Linaro Ltd.
 *
 */
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
/*
 * dts file for Hisilicon Hi3670 SoC
 *
 * Copyright (C) 2016, Hisilicon Ltd.
 * Copyright (C) 2016, HiSilicon Ltd.
 * Copyright (C) 2018, Linaro Ltd.
 */

Loading