Commit b06db0b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC updates from Arnd Bergmann:
 "These are updates for SoC specific code, mostly in the 32-bit
  architecture:

   - A rework for handling MMIO accesses in Renesas SoCs in a more
     portable way

   - Updates to SoC version detection in NXP i.MX SoCs.

   - Smaller bug fixes for OMAP, Samsung, Marvell, Amlogic"

* tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits)
  arm64: Kconfig: meson: drop pinctrl
  ARM: mxs: Add serial number support for i.MX23, i.MX28 SoCs
  MAINTAINERS: switch mvebu tree to kernel.org
  MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards
  ARM: shmobile: Stop using __raw_*() I/O accessors
  ARM: shmobile: sh73a0: Remove obsolete static mapping
  ARM: shmobile: sh73a0: Use ioremap() to map SMP registers
  ARM: shmobile: sh73a0: Use ioremap() to map L2C registers
  ARM: shmobile: r8a7779: Remove obsolete static mappings
  ARM: shmobile: r8a7779: Use ioremap() to map SMP registers
  ARM: shmobile: r8a7779: Use ioremap() to map INTC2 registers
  ARM: shmobile: r8a7778: Introduce HPBREG_BASE
  ARM: OMAP1: clock: Use IS_ERR_OR_NULL() to clean code
  ARM: OMAP2+: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare
  ARM: OMAP2+: Remove redundant assignment to variable ret
  ARM: OMAP2+: Fix kfree NULL pointer in omap2xxx_clkt_vps_init
  ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init
  ARM: exynos: extend cpuidle support to P4 Note boards
  ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs
  ARM: imx: imx7ulp: Add a comment explaining the B2 silicon version
  ...
parents 0c71cc04 dcb11100

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -2026,7 +2026,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
M:	Gregory Clement <gregory.clement@bootlin.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.infradead.org/linux-mvebu.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git

F:	Documentation/devicetree/bindings/soc/dove/

F:	arch/arm/boot/dts/dove*

F:	arch/arm/boot/dts/orion5x*
@@ -2042,7 +2042,7 @@ M: Gregory Clement <gregory.clement@bootlin.com> 
M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.infradead.org/linux-mvebu.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git

F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*

F:	arch/arm/configs/mvebu_*_defconfig
@@ -11780,6 +11780,17 @@ M: Oliver Neukum <oliver@neukum.org> 
S:	Maintained

F:	drivers/usb/image/microtek.*













MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT













M:	Luka Kovacic <luka.kovacic@sartura.hr>













M:	Luka Perkov <luka.perkov@sartura.hr>













S:	Maintained













F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts













F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts













F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts













F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts













F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts













F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts



























MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER















M:	Sakari Ailus <sakari.ailus@linux.intel.com>















L:	linux-media@vger.kernel.org

































arch/arm/mach-exynos/exynos.c



+4
−3






























Original line number
Diff line number
Diff line








@@ -177,7 +177,8 @@ static void __init exynos_dt_machine_init(void)













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















	    (of_machine_is_compatible("samsung,exynos4412") &&















	     (of_machine_is_compatible("samsung,trats2") ||













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













		  of_machine_is_compatible("samsung,midas") ||













		  of_machine_is_compatible("samsung,p4note"))) ||















	    of_machine_is_compatible("samsung,exynos3250") ||















	    of_machine_is_compatible("samsung,exynos5250"))















		platform_device_register(&exynos_cpuidle);










@@ -206,8 +207,8 @@ static void __init exynos_dt_fixup(void)













}































DT_MACHINE_START(EXYNOS_DT, "Samsung Exynos (Flattened Device Tree)")













	.l2c_aux_val	= 0x38400000,













	.l2c_aux_mask	= 0xc60fffff,













	.l2c_aux_val	= 0x08400000,













	.l2c_aux_mask	= 0xf60fffff,















	.smp		= smp_ops(exynos_smp_ops),















	.map_io		= exynos_init_io,















	.init_early	= exynos_firmware_init,

































arch/arm/mach-exynos/platsmp.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -215,7 +215,7 @@ void exynos_core_restart(u32 core_id)













	unsigned int timeout = 16;















	u32 val;





























	if (!of_machine_is_compatible("samsung,exynos3250"))













	if (!soc_is_exynos3250())















		return;































	while (timeout && !pmu_raw_readl(S5P_PMU_SPARE2)) {

































arch/arm/mach-imx/mach-imx6q.c



+7
−2






























Original line number
Diff line number
Diff line








@@ -245,8 +245,13 @@ static void __init imx6q_axi_init(void)





























static void __init imx6q_init_machine(void)















{













	if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)













		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);













	if (cpu_is_imx6q() && imx_get_soc_revision() >= IMX_CHIP_REVISION_2_0)













		/*













		 * SoCs that identify as i.MX6Q >= rev 2.0 are really i.MX6QP.













		 * Quirk: i.MX6QP revision = i.MX6Q revision - (1, 0),













		 * e.g. i.MX6QP rev 1.1 identifies as i.MX6Q rev 2.1.













		 */













		imx_print_silicon_rev("i.MX6QP", imx_get_soc_revision() - 0x10);















	else















		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",















				imx_get_soc_revision());

































arch/arm/mach-imx/mach-imx7ulp.c



+4
−0






























Original line number
Diff line number
Diff line








@@ -37,6 +37,7 @@ static void __init imx7ulp_set_revision(void)













	 * bit[31:28] of JTAG_ID register defines revision as below from B0:















	 * 0001        B0















	 * 0010        B1













	 * 0011        B2















	 */















	switch (revision >> 28) {















	case 1:









@@ -45,6 +46,9 @@ static void __init imx7ulp_set_revision(void)













	case 2:















		imx_set_soc_revision(IMX_CHIP_REVISION_2_1);















		break;













	case 3:













		imx_set_soc_revision(IMX_CHIP_REVISION_2_2);













		break;















	default:















		imx_set_soc_revision(IMX_CHIP_REVISION_1_0);















		break;









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE