Commit 4561a426 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v4.20' of... 

Merge tag 'renesas-arm-soc-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Renesas ARM Based SoC Updates for v4.20

* Rework the PMIC IRQ line quirk to use DT rather than hard coded topology
* Convert to SPDX identifiers
* Convert to using %pOFn instead of device_node.name
* Remove the no longer needed ARCH_SHMOBILE Kconfig symbol
* RZ/G1N (r8a7744) SoC: Add basic SoC and debug-ll support
* R-Car H1 (r8a7779) SoC: remove unused includes

* tag 'renesas-arm-soc-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Rework the PMIC IRQ line quirk
  ARM: debug-ll: Add support for r8a7744
  ARM: shmobile: r8a7744: Basic SoC support
  ARM: shmobile: convert to SPDX identifiers
  ARM: shmobile: Convert to using %pOFn instead of device_node.name
  ARM: shmobile: Remove the ARCH_SHMOBILE Kconfig symbol
  ARM: shmobile: r8a7779: Remove unused includes

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7f08c966 6d14d4d3

arch/arm/Kconfig.debug

+5 −4
Original line number Diff line number Diff line
@@ -940,12 +940,13 @@ choice 


	config DEBUG_RCAR_GEN2_SCIF0

		bool "Kernel low-level debugging messages via SCIF0 on R-Car Gen2 and RZ/G1"

		depends on ARCH_R8A7743 || ARCH_R8A7790 || ARCH_R8A7791 || \

			ARCH_R8A7792 || ARCH_R8A7793

		depends on ARCH_R8A7743 || ARCH_R8A7744 || ARCH_R8A7790 || \

			ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793

		help

		  Say Y here if you want kernel low-level debugging support

		  via SCIF0 on Renesas RZ/G1M (R8A7743), R-Car H2 (R8A7790),

		  M2-W (R8A7791), V2H (R8A7792), or M2-N (R8A7793).

		  via SCIF0 on Renesas RZ/G1M (R8A7743), RZ/G1N (R8A7744),

		  R-Car H2 (R8A7790), M2-W (R8A7791), V2H (R8A7792), or

		  M2-N (R8A7793).



	config DEBUG_RCAR_GEN2_SCIF1

		bool "Kernel low-level debugging messages via SCIF1 on R8A77470"

arch/arm/mach-shmobile/Kconfig

+6 −4
Original line number Diff line number Diff line 
config ARCH_SHMOBILE

	bool



# SPDX-License-Identifier: GPL-2.0

config PM_RMOBILE

	bool

	select PM
@@ -30,7 +28,6 @@ config ARCH_RMOBILE 
menuconfig ARCH_RENESAS

	bool "Renesas ARM SoCs"

	depends on ARCH_MULTI_V7 && MMU

	select ARCH_SHMOBILE

	select ARM_GIC

	select GPIOLIB

	select HAVE_ARM_SCU if SMP
@@ -72,6 +69,11 @@ config ARCH_R8A7743 
	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP



config ARCH_R8A7744

	bool "RZ/G1N (R8A77440)"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP



config ARCH_R8A7745

	bool "RZ/G1E (R8A77450)"

	select ARCH_RCAR_GEN2

arch/arm/mach-shmobile/headsmp-scu.S

+2 −11
Original line number Diff line number Diff line 
/*

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

 *

 * Shared SCU setup for mach-shmobile

 *

 * Copyright (C) 2012 Bastian Hecht

 *

 * 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.

 */



#include <linux/linkage.h>

arch/arm/mach-shmobile/headsmp.S

+2 −5
Original line number Diff line number Diff line 
/*

/* SPDX-License-Identifier: GPL-2.0

 *

 * SMP support for R-Mobile / SH-Mobile

 *

 * Copyright (C) 2010  Magnus Damm

 * Copyright (C) 2010  Takashi Yoshii

 *

 * Based on vexpress, Copyright (c) 2003 ARM Limited, All Rights Reserved

 *

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

#include <linux/linkage.h>

arch/arm/mach-shmobile/platsmp-scu.c

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

/*

 * SMP support for SoCs with SCU covered by mach-shmobile

 *

 * Copyright (C) 2013  Magnus Damm

 *

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

#include <linux/delay.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE