Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60050d67 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-4.16-2' of... 

Merge tag 'samsung-soc-4.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc changes for v4.16

Add SPDX license identifiers.

* tag 'samsung-soc-4.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: SAMSUNG: Add SPDX license identifiers
  ARM: S5PV210: Add SPDX license identifiers
  ARM: S3C64XX: Add SPDX license identifiers
  ARM: S3C24XX: Add SPDX license identifiers
  ARM: EXYNOS: Add SPDX license identifiers

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents adb319a0 4490e3c6

arch/arm/mach-exynos/Kconfig

+1 −3
Original line number Diff line number Diff line 
# arch/arm/mach-exynos/Kconfig

# SPDX-License-Identifier: GPL-2.0

#

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



# Configuration options for the EXYNOS

arch/arm/mach-exynos/Makefile

+1 −3
Original line number Diff line number Diff line 
# arch/arm/mach-exynos/Makefile

# SPDX-License-Identifier: GPL-2.0

#

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include

arch/arm/mach-exynos/common.h

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Common Header for EXYNOS machines

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H

arch/arm/mach-exynos/exynos-smc.S

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2012 Samsung Electronics.

 *

 * Copied from omap-smc.S Copyright (C) 2010 Texas Instruments, Inc.

 *

 * This program is free software,you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/linkage.h>

arch/arm/mach-exynos/exynos.c

+6 −10
Original line number Diff line number Diff line 
/*

 * SAMSUNG EXYNOS Flattened Device Tree enabled machine

 *

 * Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

// SPDX-License-Identifier: GPL-2.0

//

// SAMSUNG EXYNOS Flattened Device Tree enabled machine

//

// Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.

//		http://www.samsung.com



#include <linux/init.h>

#include <linux/io.h>