Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+42 -13
+7
MAINTAINERS
··· 1826 1826 N: sun[x456789]i 1827 1827 N: sun[25]0i 1828 1828 1829 + ARM/AMD PENSANDO ARM64 ARCHITECTURE 1830 + M: Brad Larson <blarson@amd.com> 1831 + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1832 + S: Supported 1833 + F: Documentation/devicetree/bindings/*/amd,pensando* 1834 + F: arch/arm64/boot/dts/amd/elba* 1835 + 1829 1836 ARM/Amlogic Meson SoC CLOCK FRAMEWORK 1830 1837 M: Neil Armstrong <neil.armstrong@linaro.org> 1831 1838 M: Jerome Brunet <jbrunet@baylibre.com>
+4 -8
arch/arm/Kconfig.debug
··· 1593 1593 default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1 1594 1594 default 0x48022000 if DEBUG_TI81XXUART2 1595 1595 default 0x48024000 if DEBUG_TI81XXUART3 1596 - default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \ 1597 - DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1 1598 - default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \ 1599 - DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2 1596 + default 0x4806a000 if DEBUG_OMAP2UART1 1597 + default 0x4806c000 if DEBUG_OMAP2UART2 1600 1598 default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4 1601 1599 default 0x49020000 if DEBUG_OMAP3UART3 1602 1600 default 0x49042000 if DEBUG_OMAP3UART4 ··· 1717 1719 default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1 1718 1720 default 0xfa022000 if DEBUG_TI81XXUART2 1719 1721 default 0xfa024000 if DEBUG_TI81XXUART3 1720 - default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \ 1721 - DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1 1722 - default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \ 1723 - DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2 1722 + default 0xfa06a000 if DEBUG_OMAP2UART1 1723 + default 0xfa06c000 if DEBUG_OMAP2UART2 1724 1724 default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4 1725 1725 default 0xfa71e000 if DEBUG_QCOM_UARTDM 1726 1726 default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
+3 -2
arch/arm/mach-shmobile/pm-rcar-gen2.c
··· 46 46 { 47 47 void __iomem *p; 48 48 u32 bar; 49 - static int once; 50 49 struct device_node *np; 51 50 bool has_a7 = false; 52 51 bool has_a15 = false; 53 52 struct resource res; 54 53 int error; 55 54 56 - if (once++) 55 + if (!request_mem_region(0, SZ_256K, "Boot Area")) { 56 + pr_err("Failed to request boot area\n"); 57 57 return; 58 + } 58 59 59 60 for_each_of_cpu_node(np) { 60 61 if (of_device_is_compatible(np, "arm,cortex-a15"))
+8 -1
arch/arm/mach-shmobile/smp-r8a7779.c
··· 38 38 39 39 static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) 40 40 { 41 - void __iomem *base = ioremap(HPBREG_BASE, 0x1000); 41 + void __iomem *base; 42 + 43 + if (!request_mem_region(0, SZ_4K, "Boot Area")) { 44 + pr_err("Failed to request boot area\n"); 45 + return; 46 + } 47 + 48 + base = ioremap(HPBREG_BASE, 0x1000); 42 49 43 50 /* Map the reset vector (in headsmp-scu.S, headsmp.S) */ 44 51 writel(__pa(shmobile_boot_vector), base + AVECR);
+8 -2
arch/arm/mach-shmobile/smp-sh73a0.c
··· 44 44 45 45 static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) 46 46 { 47 - void __iomem *ap = ioremap(AP_BASE, PAGE_SIZE); 48 - void __iomem *sysc = ioremap(SYSC_BASE, PAGE_SIZE); 47 + void __iomem *ap, *sysc; 48 + 49 + if (!request_mem_region(0, SZ_4K, "Boot Area")) { 50 + pr_err("Failed to request boot area\n"); 51 + return; 52 + } 49 53 50 54 /* Map the reset vector (in headsmp.S) */ 55 + ap = ioremap(AP_BASE, PAGE_SIZE); 56 + sysc = ioremap(SYSC_BASE, PAGE_SIZE); 51 57 writel(0, ap + APARMBAREA); /* 4k */ 52 58 writel(__pa(shmobile_boot_vector), sysc + SBAR); 53 59 iounmap(sysc);
+12
arch/arm64/Kconfig.platforms
··· 244 244 General support for NPCM8xx BMC (Arbel). 245 245 Nuvoton NPCM8xx BMC based on the Cortex A35. 246 246 247 + config ARCH_PENSANDO 248 + bool "AMD Pensando Platforms" 249 + help 250 + This enables support for the ARMv8 based AMD Pensando SoC 251 + family to include the Elba SoC. 252 + 253 + AMD Pensando SoCs support a range of Distributed Services 254 + Cards in PCIe format installed into servers. The Elba 255 + SoC includes 16 Cortex A-72 CPU cores, 144 P4-programmable 256 + cores for a minimal latency/jitter datapath, and network 257 + interfaces up to 200 Gb/s. 258 + 247 259 config ARCH_QCOM 248 260 bool "Qualcomm Platforms" 249 261 select GPIOLIB