random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[DO NOT MERGE] sunxi: Enable SCP/SCPI on A33 as well

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2022-06-08 07:55:54 -05:00
parent 03db81bb31
commit c8ea2780f2
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/Kconfig
View File

@ -86,7 +86,7 @@ config ARMV7_PSCI
choice choice
prompt "Supported PSCI version" prompt "Supported PSCI version"
depends on ARMV7_PSCI 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_0_1 if ARCH_SUNXI
default ARMV7_PSCI_1_0 default ARMV7_PSCI_1_0
help help

2
arch/arm/cpu/armv7/sunxi/Makefile
View File

@ -13,7 +13,7 @@ obj-$(CONFIG_MACH_SUN6I) += sram.o
obj-$(CONFIG_MACH_SUN8I) += sram.o obj-$(CONFIG_MACH_SUN8I) += sram.o
ifndef CONFIG_SPL_BUILD 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 obj-$(CONFIG_ARMV7_PSCI) += psci-scpi.o
else else
obj-$(CONFIG_ARMV7_PSCI) += psci.o obj-$(CONFIG_ARMV7_PSCI) += psci.o

4
arch/arm/cpu/armv7/sunxi/psci-scpi.c
View File

@ -24,7 +24,11 @@
#define MPIDR_AFFLVL0(mpidr) (mpidr & 0xf) #define MPIDR_AFFLVL0(mpidr) (mpidr & 0xf)
#define MPIDR_AFFLVL1(mpidr) (mpidr >> 8 & 0xf) #define MPIDR_AFFLVL1(mpidr) (mpidr >> 8 & 0xf)
#if defined(CONFIG_MACH_SUN8I_H3)
#define SCPI_SHMEM_BASE 0x0004be00 #define SCPI_SHMEM_BASE 0x0004be00
#else
#define SCPI_SHMEM_BASE 0x00053e00
#endif
#define SCPI_SHMEM ((struct scpi_shmem *)SCPI_SHMEM_BASE) #define SCPI_SHMEM ((struct scpi_shmem *)SCPI_SHMEM_BASE)
#define SCPI_RX_CHANNEL 1 #define SCPI_RX_CHANNEL 1

14
arch/arm/dts/sun8i-a23-a33.dtsi
View File

@ -138,6 +138,14 @@
#size-cells = <1>; #size-cells = <1>;
ranges; 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 { sram_c: sram@1d00000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x01d00000 0x80000>; reg = <0x01d00000 0x80000>;
@ -847,5 +855,11 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
}; };
remoteproc@1f01c00 {
compatible = "allwinner,sun6i-a31-ar100";
reg = <0x01f01c00 0x400>;
sram = <&sram_a2>;
};
}; };
}; };

2
arch/arm/mach-sunxi/Kconfig
View File

@ -174,7 +174,7 @@ config SUNXI_RESUME_BASE
config SUNXI_SCP_BASE config SUNXI_SCP_BASE
hex hex
default 0x00048000 if MACH_SUN8I_H3 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 0x00114000 if MACH_SUN50I_H6
default 0x0 default 0x0
help help