github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 00:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Samsung mach/soc changes for v4.17

Browse Source 
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).
 -----BEGIN PGP SIGNATURE-----
 
 iQItBAABCAAXBQJantXhEBxrcnprQGtlcm5lbC5vcmcACgkQwTdm5oaLg9dwzw//
 bxG9xzeZT83sxBk6QhgvDH2w5E0jtOtEvh//vHPyFt+CQNpOuauLULmqbEoVKhEd
 XFWNima/eJtY69DzJ5pjJwm5vfE6EAqLb3XNjMc90aIGKJOhEX9q16IOHoSrdeqX
 kjDXGGYmbpwSUVXgYq6noutr3S5U/t5A7zs+Rz+2OZo2NZY31PwmYs06VWHZ7ygL
 uISte/Rhcq5i02iGHLEJ9lmyoLlUS9RAWR+Wujd5WY3xKNm0lMPEjIs80pSJXZDz
 VADGMQJVHYok8O7DI30+SuHnIjIk6pyjl/SAmxKgPV9N8GJ4UueuQRijC4R2dPLY
 jBD4ZboSjsc2vN3ioxvLTmmaSsLKHBIfv7LZW69olKVLgqYPubEcGJcdOTzUursp
 7qKSB5Q1eEuiFkWB+M+aowKKuu3wy4gZNlC69hPKxEJtaBQ2AT5ltoiE58qa8IaE
 jOCeHOVw6Q/NSEOEyFcRLBvH4+JLZYGYTCmxFlfjVGOYOKV0pAXXeMX0BabfRaLn
 lc0Tc5x1MyDBnByXomJzd33H3mg8axPg5Cik3YlNskm5qbWTckf6uEqkg4H7kumQ
 7GR3qfWsZdafFxINBHbVHM+sij8aY1Yl4w2sNW/HsWIk/VdCIyK8ahdKhMPevU3A
 xWNnh0fJwxELZTv9GO3dlWqSAdUBs2Hxn4/V38XuAo4=
 =sUWr
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-07 16:30:18 +01:00
commit 242b205bb6
4 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/include/debug/exynos.S
View File

@ -1,11 +1,8 @@
/* 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. */

10
arch/arm/include/debug/samsung.S
View File

@ -1,13 +1,9 @@
/* 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>

3
arch/arm/mach-exynos/exynos.c
View File

@ -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);

17
include/linux/serial_s3c.h
View File

@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Internal header file for Samsung S3C2410 serial ports (UART0-2)
*
@ -10,21 +11,7 @@
* 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
#define __ASM_ARM_REGS_SERIAL_H