Commit 4684e928 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC code updates from Arnd Bergmann:
 "The AMD Pensando DPU platform gets added to arm64, and some minor
  updates make it into Renesas' 32-bit platforms"

* tag 'soc-arm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm: debug: reuse the config DEBUG_OMAP2UART{1,2} for OMAP{3,4,5}
  arm64: Add config for AMD Pensando SoC platforms
  MAINTAINERS: Add entry for AMD PENSANDO
  ARM: shmobile: sh73a0: Reserve boot area when SMP is enabled
  ARM: shmobile: r8a7779: Reserve boot area when SMP is enabled
  ARM: shmobile: rcar-gen2: Reserve boot area when SMP is enabled
  ARM: shmobile: rcar-gen2: Remove unneeded once handling
parents a39ba9b4 a9838799

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1826,6 +1826,13 @@ N: allwinner 
N:	sun[x456789]i

N:	sun[25]0i









ARM/AMD PENSANDO ARM64 ARCHITECTURE









M:	Brad Larson <blarson@amd.com>









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









S:	Supported









F:	Documentation/devicetree/bindings/*/amd,pensando*









F:	arch/arm64/boot/dts/amd/elba*

















ARM/Amlogic Meson SoC CLOCK FRAMEWORK









M:	Neil Armstrong <neil.armstrong@linaro.org>









M:	Jerome Brunet <jbrunet@baylibre.com>
































arch/arm/Kconfig.debug



+4
−8






























Original line number
Diff line number
Diff line







@@ -1593,10 +1593,8 @@ config DEBUG_UART_PHYS







	default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1









	default 0x48022000 if DEBUG_TI81XXUART2









	default 0x48024000 if DEBUG_TI81XXUART3









	default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \









				DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1









	default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \









				DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2









	default 0x4806a000 if DEBUG_OMAP2UART1









	default 0x4806c000 if DEBUG_OMAP2UART2









	default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4









	default 0x49020000 if DEBUG_OMAP3UART3









	default 0x49042000 if DEBUG_OMAP3UART4








@@ -1719,10 +1717,8 @@ config DEBUG_UART_VIRT







	default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1









	default 0xfa022000 if DEBUG_TI81XXUART2









	default 0xfa024000 if DEBUG_TI81XXUART3









	default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \









				DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1









	default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \









				DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2









	default 0xfa06a000 if DEBUG_OMAP2UART1









	default 0xfa06c000 if DEBUG_OMAP2UART2









	default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4









	default 0xfa71e000 if DEBUG_QCOM_UARTDM









	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
































arch/arm/mach-shmobile/pm-rcar-gen2.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -46,15 +46,16 @@ void __init rcar_gen2_pm_init(void)







{









	void __iomem *p;









	u32 bar;









	static int once;









	struct device_node *np;









	bool has_a7 = false;









	bool has_a15 = false;









	struct resource res;









	int error;



















	if (once++)









	if (!request_mem_region(0, SZ_256K, "Boot Area")) {









		pr_err("Failed to request boot area\n");









		return;









	}



















	for_each_of_cpu_node(np) {









		if (of_device_is_compatible(np, "arm,cortex-a15"))
































arch/arm/mach-shmobile/smp-r8a7779.c



+8
−1






























Original line number
Diff line number
Diff line







@@ -38,7 +38,14 @@ static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)

















static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)









{









	void __iomem *base = ioremap(HPBREG_BASE, 0x1000);









	void __iomem *base;



















	if (!request_mem_region(0, SZ_4K, "Boot Area")) {









		pr_err("Failed to request boot area\n");









		return;









	}



















	base = ioremap(HPBREG_BASE, 0x1000);



















	/* Map the reset vector (in headsmp-scu.S, headsmp.S) */









	writel(__pa(shmobile_boot_vector), base + AVECR);
































arch/arm/mach-shmobile/smp-sh73a0.c



+8
−2






























Original line number
Diff line number
Diff line







@@ -44,10 +44,16 @@ static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)

















static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)









{









	void __iomem *ap = ioremap(AP_BASE, PAGE_SIZE);









	void __iomem *sysc = ioremap(SYSC_BASE, PAGE_SIZE);









	void __iomem *ap, *sysc;



















	if (!request_mem_region(0, SZ_4K, "Boot Area")) {









		pr_err("Failed to request boot area\n");









		return;









	}



















	/* Map the reset vector (in headsmp.S) */









	ap = ioremap(AP_BASE, PAGE_SIZE);









	sysc = ioremap(SYSC_BASE, PAGE_SIZE);









	writel(0, ap + APARMBAREA);      /* 4k */









	writel(__pa(shmobile_boot_vector), sysc + SBAR);









	iounmap(sysc);