Commit 242b205b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-4.17' of... 

Merge tag 'samsung-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Pull "Samsung mach/soc changes for v4.17" from Krzysztof Kozłowski:

1. Add few remaining SPDX license identifiers.
2. Add cpuidle support to all Midas-based boards (including new
   GT-I9300/GT-I9305/GT-N7100/GT-N7105).

* tag 'samsung-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: EXYNOS: Extend cpuidle support to Midas boards
  ARM: EXYNOS: Add SPDX license identifiers
parents 3bf5c70d cc14b2b1

arch/arm/include/debug/exynos.S

+2 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2010-2011 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.

 */



/* pull in the relevant register and map files. */

arch/arm/include/debug/samsung.S

+3 −7
Original line number Diff line number Diff line 
/* arch/arm/plat-samsung/include/plat/debug-macro.S

 *

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright 2005, 2007 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * 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/serial_s3c.h>

arch/arm/mach-exynos/exynos.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ static void __init exynos_dt_machine_init(void) 
#endif

	if (of_machine_is_compatible("samsung,exynos4210") ||

	    (of_machine_is_compatible("samsung,exynos4412") &&

	     of_machine_is_compatible("samsung,trats2")) ||

	     (of_machine_is_compatible("samsung,trats2") ||

		  of_machine_is_compatible("samsung,midas"))) ||

	    of_machine_is_compatible("samsung,exynos3250") ||

	    of_machine_is_compatible("samsung,exynos5250"))

		platform_device_register(&exynos_cpuidle);

include/linux/serial_s3c.h

+2 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 *  Internal header file for Samsung S3C2410 serial ports (UART0-2)

 *
@@ -10,20 +11,6 @@ 
 *  Internal header file for MX1ADS serial ports (UART1 & 2)

 *

 *  Copyright (C) 2002 Shane Nay (shane@minirl.com)

 *

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

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef __ASM_ARM_REGS_SERIAL_H

CRA Git | Maintained and supported by SUSTech CRA and CCSE