Skip to content

Commit

Permalink
Merge tag 'hisi-arm32-dt-for-5.14' of git://github.com/hisilicon/linu…
Browse files Browse the repository at this point in the history
…x-hisi into arm/dt

ARM: DT: HiSilicon ARM32 DT updates for 5.14

- Correct the HiSilicon copyright

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

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
olofj committed Jun 24, 2021
2 parents 9be3899 + da1eab9 commit 79eb3cb
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/hi3620.dtsi
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Hisilicon Ltd. Hi3620 SoC
* HiSilicon Ltd. Hi3620 SoC
*
* Copyright (C) 2012-2013 Hisilicon Ltd.
* Copyright (C) 2012-2013 HiSilicon Ltd.
* Copyright (C) 2012-2013 Linaro Ltd.
*
* Author: Haojian Zhuang <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/hip01-ca9x2.dts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Hisilicon Ltd. HiP01 SoC
* HiSilicon Ltd. HiP01 SoC
*
* Copyright (C) 2014 Hisilicon Ltd.
* Copyright (C) 2014 HiSilicon Ltd.
* Copyright (C) 2014 Huawei Ltd.
*
* Author: Wang Long <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/hip01.dtsi
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Hisilicon Ltd. HiP01 SoC
* HiSilicon Ltd. HiP01 SoC
*
* Copyright (c) 2014 Hisilicon Ltd.
* Copyright (c) 2014 HiSilicon Ltd.
* Copyright (c) 2014 Huawei Ltd.
*
* Author: Wang Long <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/hip04.dtsi
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Hisilicon Ltd. HiP04 SoC
* HiSilicon Ltd. HiP04 SoC
*
* Copyright (C) 2013-2014 Hisilicon Ltd.
* Copyright (C) 2013-2014 HiSilicon Ltd.
* Copyright (C) 2013-2014 Linaro Ltd.
*
* Author: Haojian Zhuang <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hisi-x5hd2-dkb.dts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2014 Linaro Ltd.
* Copyright (c) 2013-2014 Hisilicon Limited.
* Copyright (c) 2013-2014 HiSilicon Limited.
*/

/dts-v1/;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hisi-x5hd2.dtsi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2014 Linaro Ltd.
* Copyright (c) 2013-2014 Hisilicon Limited.
* Copyright (c) 2013-2014 HiSilicon Limited.
*/

#include <dt-bindings/clock/hix5hd2-clock.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sd5203.dts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2020 Hisilicon Limited.
* Copyright (c) 2020 HiSilicon Limited.
*
* DTS file for Hisilicon SD5203 Board
*/
Expand Down

0 comments on commit 79eb3cb

Please sign in to comment.