diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-27 07:42:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-27 07:42:49 -0400 |
| commit | aab8b17e94c447561a402bc7508b73fd8ee712e5 (patch) | |
| tree | d3e78693f4f68ce3ea716f9405d34a64c5f4ffb8 /arch | |
| parent | a0ecfa568d3309bb21869622bfc7147665c4260d (diff) | |
| parent | fed603f868469a0d8f2548bdac137feead333c6b (diff) | |
| download | u-boot-aab8b17e94c447561a402bc7508b73fd8ee712e5.tar.gz u-boot-aab8b17e94c447561a402bc7508b73fd8ee712e5.tar.xz u-boot-aab8b17e94c447561a402bc7508b73fd8ee712e5.zip | |
Merge tag 'ti-v2021.07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ti
- Fix reset for AM64 platforms
- Enable networking PHY driver for AM64
- Fix default R5F cluster setting in J7
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 9b0ba6b721..10dea7a1cc 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 4ac7f5db91..35b49df851 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -60,6 +60,10 @@ &dmsc { u-boot,dm-spl; + k3_sysreset: sysreset-controller { + compatible = "ti,sci-sysreset"; + u-boot,dm-spl; + }; }; &k3_pds { diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi index 3384ed9f3a..fe095a6153 100644 --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi @@ -193,3 +193,11 @@ &mcu_fss0_ospi1_pins_default { u-boot,dm-spl; }; + +&main_r5fss0 { + ti,cluster-mode = <0>; +}; + +&main_r5fss1 { + ti,cluster-mode = <0>; +}; |