diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig index 9dccc122538..e60b0049ea1 100644 --- a/arch/arm/cpu/armv7/Kconfig +++ b/arch/arm/cpu/armv7/Kconfig @@ -86,7 +86,7 @@ config ARMV7_PSCI choice prompt "Supported PSCI version" depends on ARMV7_PSCI - default ARMV7_PSCI_1_1 if MACH_SUN8I_H3 + default ARMV7_PSCI_1_1 if MACH_SUN8I_A33 || MACH_SUN8I_H3 default ARMV7_PSCI_0_1 if ARCH_SUNXI default ARMV7_PSCI_1_0 help diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index 6473b9acbde..033042666f0 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_MACH_SUN6I) += sram.o obj-$(CONFIG_MACH_SUN8I) += sram.o ifndef CONFIG_SPL_BUILD -ifdef CONFIG_MACH_SUN8I_H3 +ifneq ($(CONFIG_MACH_SUN8I_A33)$(CONFIG_MACH_SUN8I_H3),) obj-$(CONFIG_ARMV7_PSCI) += psci-scpi.o else obj-$(CONFIG_ARMV7_PSCI) += psci.o diff --git a/arch/arm/cpu/armv7/sunxi/psci-scpi.c b/arch/arm/cpu/armv7/sunxi/psci-scpi.c index fea51eb4568..d459eef22e9 100644 --- a/arch/arm/cpu/armv7/sunxi/psci-scpi.c +++ b/arch/arm/cpu/armv7/sunxi/psci-scpi.c @@ -24,7 +24,11 @@ #define MPIDR_AFFLVL0(mpidr) (mpidr & 0xf) #define MPIDR_AFFLVL1(mpidr) (mpidr >> 8 & 0xf) +#if defined(CONFIG_MACH_SUN8I_H3) #define SCPI_SHMEM_BASE 0x0004be00 +#else +#define SCPI_SHMEM_BASE 0x00053e00 +#endif #define SCPI_SHMEM ((struct scpi_shmem *)SCPI_SHMEM_BASE) #define SCPI_RX_CHANNEL 1 diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi index a0cac966af3..a26edbbf317 100644 --- a/arch/arm/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/dts/sun8i-a23-a33.dtsi @@ -138,6 +138,14 @@ #size-cells = <1>; ranges; + sram_a2: sram@40000 { + compatible = "mmio-sram"; + reg = <0x00040000 0x14000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00040000 0x14000>; + }; + sram_c: sram@1d00000 { compatible = "mmio-sram"; reg = <0x01d00000 0x80000>; @@ -847,5 +855,11 @@ #address-cells = <1>; #size-cells = <0>; }; + + remoteproc@1f01c00 { + compatible = "allwinner,sun6i-a31-ar100"; + reg = <0x01f01c00 0x400>; + sram = <&sram_a2>; + }; }; }; diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index a6d5de9e3bc..381cc3f6fd1 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -174,7 +174,7 @@ config SUNXI_RESUME_BASE config SUNXI_SCP_BASE hex default 0x00048000 if MACH_SUN8I_H3 - default 0x00050000 if MACH_SUN50I || MACH_SUN50I_H5 + default 0x00050000 if MACH_SUN8I_A33 || MACH_SUN50I || MACH_SUN50I_H5 default 0x00114000 if MACH_SUN50I_H6 default 0x0 help