Commit d74b2557 authored Apr 08, 2021 by Arnd Bergmann

Merge tag 'hisi-armv7soc-for-5.13' of git://github.com/hisilicon/linux-hisi into arm/soc

HiSilicon ARMv7 SoC updates for v5.13

- Correct the HiSilicon copyright

* tag 'hisi-armv7soc-for-5.13' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: use the correct HiSilicon copyright

Link: https://lore.kernel.org/r/eba8b55e-0969-8ca2-eca3-7c471cb0ff6f@hisilicon.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 6f35f629 c1ce9d80

arch/arm/mach-hisi/hisilicon.c

+2 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* (Hisilicon's SoC based) flattened device tree enabled machine
		* (HiSilicon's SoC based) flattened device tree enabled machine
		*
		* Copyright (c) 2012-2013 Hisilicon Ltd.
		* Copyright (c) 2012-2013 HiSilicon Ltd.
		* Copyright (c) 2012-2013 Linaro Ltd.
		*
		* Author: Haojian Zhuang <haojian.zhuang@linaro.org>

arch/arm/mach-hisi/hotplug.c

+1 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013 Linaro Ltd.
		* Copyright (c) 2013 Hisilicon Limited.
		* Copyright (c) 2013 HiSilicon Limited.
		*/

		#include <linux/cpu.h>

arch/arm/mach-hisi/platmcpm.c

+1 −1

Original line number	Diff line number	Diff line
		// 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 <linux/init.h>
		#include <linux/smp.h>

arch/arm/mach-hisi/platsmp.c

+1 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013 Linaro Ltd.
		* Copyright (c) 2013 Hisilicon Limited.
		* Copyright (c) 2013 HiSilicon Limited.
		* Based on arch/arm/mach-vexpress/platsmp.c, Copyright (C) 2002 ARM Ltd.
		*/
		#include <linux/smp.h>