mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-30 23:54:04 +08:00
ARM: SoC code changes for 6.7
The AMD Pensando DPU platform gets added to arm64, and some minor updates make it into Renesas' 32-bit platforms. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmVCG78ACgkQYKtH/8kJ UidjTxAAvZBsS8Zsk7kJyLPYE5KjMb+UywT2VYAq/eBTtK+dpL09TPCpfmVencVL G3RbNUQgnM9Honn7lOUaLuO+0QSnB3NDEeScSetjNksU+Xp23lNta6Zgp3ux4DBV 9uGhVO7pze8uwEI0IzIwOjGOn7j+Y7fvCW0ODDEVocZCoqmrUvuSL0dtG4RT24BV zAMGuCWEmimmkMHNNWaI66KapB6cM/AHbqZaY2Wvysw52xgLAQwufiisZ86Zx7u4 8IMcvFw2DHojIuYPpFGn54cGjCI6EkQD+fQiGKKT5EMHKNStd26y7rrKO3nSbnoM JWAoqfK2uK+dvHaVqB8B6nH0BqeFxPe6TOW5aLrzJvFBBhz0Exw1alJcBmJq+3vR SSzUc6y8FmNsLYvi7fGAvCYqwCEIqpxjYs0s335Nd16oyyHQt0DPEE6x06sAMrU7 emCqwz09qBxGdwW7vnV7RKQe+9FxfCAoSBYRl3cW2lZHpB3eLpp9mVBFoTy+kvPV d5lj/vjSRhahj/fysA7fU3/QY1pRnlmWOAJ66sXZGbz2ZAokXW/oRGdgRyDFFdd9 TDeEsKWlcSNclo7TRH/lgfc+kF6jFiwmRpWECZgu1YKPT9hhbAW3c9w32KTE43QI eTma5j0MNZsBkYFBmfjpmipBjv2HYzXhnkQRB8c7Z1naZUiuL0M= =GXVf -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
4684e928db
@ -1826,6 +1826,13 @@ N: allwinner
|
|||||||
N: sun[x456789]i
|
N: sun[x456789]i
|
||||||
N: sun[25]0i
|
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
|
ARM/Amlogic Meson SoC CLOCK FRAMEWORK
|
||||||
M: Neil Armstrong <neil.armstrong@linaro.org>
|
M: Neil Armstrong <neil.armstrong@linaro.org>
|
||||||
M: Jerome Brunet <jbrunet@baylibre.com>
|
M: Jerome Brunet <jbrunet@baylibre.com>
|
||||||
|
@ -1593,10 +1593,8 @@ config DEBUG_UART_PHYS
|
|||||||
default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
||||||
default 0x48022000 if DEBUG_TI81XXUART2
|
default 0x48022000 if DEBUG_TI81XXUART2
|
||||||
default 0x48024000 if DEBUG_TI81XXUART3
|
default 0x48024000 if DEBUG_TI81XXUART3
|
||||||
default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
default 0x4806a000 if DEBUG_OMAP2UART1
|
||||||
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
default 0x4806c000 if DEBUG_OMAP2UART2
|
||||||
default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
|
||||||
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
|
|
||||||
default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
|
default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
|
||||||
default 0x49020000 if DEBUG_OMAP3UART3
|
default 0x49020000 if DEBUG_OMAP3UART3
|
||||||
default 0x49042000 if DEBUG_OMAP3UART4
|
default 0x49042000 if DEBUG_OMAP3UART4
|
||||||
@ -1719,10 +1717,8 @@ config DEBUG_UART_VIRT
|
|||||||
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
||||||
default 0xfa022000 if DEBUG_TI81XXUART2
|
default 0xfa022000 if DEBUG_TI81XXUART2
|
||||||
default 0xfa024000 if DEBUG_TI81XXUART3
|
default 0xfa024000 if DEBUG_TI81XXUART3
|
||||||
default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
default 0xfa06a000 if DEBUG_OMAP2UART1
|
||||||
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
default 0xfa06c000 if DEBUG_OMAP2UART2
|
||||||
default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
|
||||||
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
|
|
||||||
default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
|
default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
|
||||||
default 0xfa71e000 if DEBUG_QCOM_UARTDM
|
default 0xfa71e000 if DEBUG_QCOM_UARTDM
|
||||||
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
|
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
|
||||||
|
@ -46,15 +46,16 @@ void __init rcar_gen2_pm_init(void)
|
|||||||
{
|
{
|
||||||
void __iomem *p;
|
void __iomem *p;
|
||||||
u32 bar;
|
u32 bar;
|
||||||
static int once;
|
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
bool has_a7 = false;
|
bool has_a7 = false;
|
||||||
bool has_a15 = false;
|
bool has_a15 = false;
|
||||||
struct resource res;
|
struct resource res;
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
if (once++)
|
if (!request_mem_region(0, SZ_256K, "Boot Area")) {
|
||||||
|
pr_err("Failed to request boot area\n");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for_each_of_cpu_node(np) {
|
for_each_of_cpu_node(np) {
|
||||||
if (of_device_is_compatible(np, "arm,cortex-a15"))
|
if (of_device_is_compatible(np, "arm,cortex-a15"))
|
||||||
|
@ -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)
|
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) */
|
/* Map the reset vector (in headsmp-scu.S, headsmp.S) */
|
||||||
writel(__pa(shmobile_boot_vector), base + AVECR);
|
writel(__pa(shmobile_boot_vector), base + AVECR);
|
||||||
|
@ -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)
|
static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
|
||||||
{
|
{
|
||||||
void __iomem *ap = ioremap(AP_BASE, PAGE_SIZE);
|
void __iomem *ap, *sysc;
|
||||||
void __iomem *sysc = ioremap(SYSC_BASE, PAGE_SIZE);
|
|
||||||
|
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) */
|
/* 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(0, ap + APARMBAREA); /* 4k */
|
||||||
writel(__pa(shmobile_boot_vector), sysc + SBAR);
|
writel(__pa(shmobile_boot_vector), sysc + SBAR);
|
||||||
iounmap(sysc);
|
iounmap(sysc);
|
||||||
|
@ -244,6 +244,18 @@ config ARCH_NPCM
|
|||||||
General support for NPCM8xx BMC (Arbel).
|
General support for NPCM8xx BMC (Arbel).
|
||||||
Nuvoton NPCM8xx BMC based on the Cortex A35.
|
Nuvoton NPCM8xx BMC based on the Cortex A35.
|
||||||
|
|
||||||
|
config ARCH_PENSANDO
|
||||||
|
bool "AMD Pensando Platforms"
|
||||||
|
help
|
||||||
|
This enables support for the ARMv8 based AMD Pensando SoC
|
||||||
|
family to include the Elba SoC.
|
||||||
|
|
||||||
|
AMD Pensando SoCs support a range of Distributed Services
|
||||||
|
Cards in PCIe format installed into servers. The Elba
|
||||||
|
SoC includes 16 Cortex A-72 CPU cores, 144 P4-programmable
|
||||||
|
cores for a minimal latency/jitter datapath, and network
|
||||||
|
interfaces up to 200 Gb/s.
|
||||||
|
|
||||||
config ARCH_QCOM
|
config ARCH_QCOM
|
||||||
bool "Qualcomm Platforms"
|
bool "Qualcomm Platforms"
|
||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
|
Loading…
Reference in New Issue
Block a user