Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "Fix OSPI boot for J722S"

Browse source 
Prasanth Babu Mantena <p-mantena@ti.com> says:

This series fixes OSPI boot for J722S. It contains fixes for DMSC
communication, R5 regmap for ospi and dma specific overrides for ospi.

Test log: https://gist.github.com/PrasanthBabuMantena/ad469dd09ab7263f85f87dadda46c86d

Link: https://lore.kernel.org/r/20241218131341.2073823-1-p-mantena@ti.com
This commit is contained in:
Tom Rini 2024-12-31 15:24:34 -06:00
commit 43cae09eab
5 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/dts/k3-j722s-evm-u-boot.dtsi
View file

@ -16,3 +16,7 @@
&dmsc { &dmsc {
bootph-pre-ram; bootph-pre-ram;
}; };
&main_bcdma {
bootph-pre-ram;
};

17
arch/arm/dts/k3-j722s-r5-evm.dts
View file

@ -41,8 +41,8 @@
ti,host-id = <36>; ti,host-id = <36>;
ti,secure-host; ti,secure-host;
mbox-names = "rx", "tx"; mbox-names = "rx", "tx";
mboxes= <&secure_proxy_main 22>, mboxes= <&secure_proxy_main 28>,
<&secure_proxy_main 23>; <&secure_proxy_main 29>;
bootph-all; bootph-all;
}; };
}; };
@ -89,3 +89,16 @@
&wkup_uart0 { &wkup_uart0 {
status = "okay"; status = "okay";
}; };
&ospi0 {
reg = <0x00 0x0fc40000 0x00 0x100>,
<0x00 0x60000000 0x00 0x08000000>;
};
&main_bcdma {
ti,sci = <&dm_tifs>;
};
&main_pktdma {
ti,sci = <&dm_tifs>;
};

1
arch/arm/mach-k3/include/mach/j722s_spl.h
View file

@ -24,6 +24,7 @@
#define BOOT_DEVICE_DFU 0x0A #define BOOT_DEVICE_DFU 0x0A
#define BOOT_DEVICE_GPMC_NAND 0x0B #define BOOT_DEVICE_GPMC_NAND 0x0B
#define BOOT_DEVICE_GPMC_NOR 0x0C #define BOOT_DEVICE_GPMC_NOR 0x0C
#define BOOT_DEVICE_FAST_XSPI 0x0D
#define BOOT_DEVICE_XSPI 0x0E #define BOOT_DEVICE_XSPI 0x0E
#define BOOT_DEVICE_NOBOOT 0x0F #define BOOT_DEVICE_NOBOOT 0x0F

2
arch/arm/mach-k3/j722s/j722s_init.c
View file

@ -220,6 +220,8 @@ static u32 __get_primary_bootmedia(u32 devstat)
fallthrough; fallthrough;
case BOOT_DEVICE_XSPI: case BOOT_DEVICE_XSPI:
fallthrough; fallthrough;
case BOOT_DEVICE_FAST_XSPI:
fallthrough;
case BOOT_DEVICE_SPI: case BOOT_DEVICE_SPI:
return BOOT_DEVICE_SPI; return BOOT_DEVICE_SPI;

2
drivers/mailbox/k3-sec-proxy.c
View file

@ -408,7 +408,7 @@ static int k3_sec_proxy_remove(struct udevice *dev)
return 0; return 0;
} }
static const u32 am6x_valid_threads[] = { 0, 1, 4, 5, 6, 7, 8, 9, 11, 12, 13, 20, 21, 22, 23 }; static const u32 am6x_valid_threads[] = { 0, 1, 4, 5, 6, 7, 8, 9, 11, 12, 13, 20, 21, 22, 23, 28, 29 };
static const struct k3_sec_proxy_desc am654_desc = { static const struct k3_sec_proxy_desc am654_desc = {
.thread_count = 90, .thread_count = 90,