summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/k3-j722s-evm-u-boot.dtsi4
-rw-r--r--arch/arm/dts/k3-j722s-r5-evm.dts17
-rw-r--r--arch/arm/mach-k3/include/mach/j722s_spl.h1
-rw-r--r--arch/arm/mach-k3/j722s/j722s_init.c2
4 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/dts/k3-j722s-evm-u-boot.dtsi b/arch/arm/dts/k3-j722s-evm-u-boot.dtsi
index 88c4a72db61..6ae76beea3e 100644
--- a/arch/arm/dts/k3-j722s-evm-u-boot.dtsi
+++ b/arch/arm/dts/k3-j722s-evm-u-boot.dtsi
@@ -16,3 +16,7 @@
&dmsc {
bootph-pre-ram;
};
+
+&main_bcdma {
+ bootph-pre-ram;
+};
diff --git a/arch/arm/dts/k3-j722s-r5-evm.dts b/arch/arm/dts/k3-j722s-r5-evm.dts
index 08286ed792d..286ab50d3da 100644
--- a/arch/arm/dts/k3-j722s-r5-evm.dts
+++ b/arch/arm/dts/k3-j722s-r5-evm.dts
@@ -41,8 +41,8 @@
ti,host-id = <36>;
ti,secure-host;
mbox-names = "rx", "tx";
- mboxes= <&secure_proxy_main 22>,
- <&secure_proxy_main 23>;
+ mboxes= <&secure_proxy_main 28>,
+ <&secure_proxy_main 29>;
bootph-all;
};
};
@@ -89,3 +89,16 @@
&wkup_uart0 {
status = "okay";
};
+
+&ospi0 {
+ reg = <0x00 0x0fc40000 0x00 0x100>,
+ <0x00 0x60000000 0x00 0x08000000>;
+};
+
+&main_bcdma {
+ ti,sci = <&dm_tifs>;
+};
+
+&main_pktdma {
+ ti,sci = <&dm_tifs>;
+};
diff --git a/arch/arm/mach-k3/include/mach/j722s_spl.h b/arch/arm/mach-k3/include/mach/j722s_spl.h
index eab8c511b7c..a91cc82448f 100644
--- a/arch/arm/mach-k3/include/mach/j722s_spl.h
+++ b/arch/arm/mach-k3/include/mach/j722s_spl.h
@@ -24,6 +24,7 @@
#define BOOT_DEVICE_DFU 0x0A
#define BOOT_DEVICE_GPMC_NAND 0x0B
#define BOOT_DEVICE_GPMC_NOR 0x0C
+#define BOOT_DEVICE_FAST_XSPI 0x0D
#define BOOT_DEVICE_XSPI 0x0E
#define BOOT_DEVICE_NOBOOT 0x0F
diff --git a/arch/arm/mach-k3/j722s/j722s_init.c b/arch/arm/mach-k3/j722s/j722s_init.c
index 0313e1148bc..f8c5c2a5edc 100644
--- a/arch/arm/mach-k3/j722s/j722s_init.c
+++ b/arch/arm/mach-k3/j722s/j722s_init.c
@@ -220,6 +220,8 @@ static u32 __get_primary_bootmedia(u32 devstat)
fallthrough;
case BOOT_DEVICE_XSPI:
fallthrough;
+ case BOOT_DEVICE_FAST_XSPI:
+ fallthrough;
case BOOT_DEVICE_SPI:
return BOOT_DEVICE_SPI;