diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-26 16:17:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-26 16:19:33 -0600 |
| commit | d8a7100d658eb201fa0e955667fdff298db31945 (patch) | |
| tree | 90447acc915dafdd9227d24f748b5f1a3976b9d3 /arch | |
| parent | 2348dd8e41ea7912f2ecf35684bbe6386281fb57 (diff) | |
| parent | 844493d7e99cb795f3e28130ee09ba7a6441162f (diff) | |
| download | u-boot-d8a7100d658eb201fa0e955667fdff298db31945.tar.gz | |
Subtree merge tag 'v6.13-dts' of dts repo [1] into dts/upstreamWIP/26Jan2025
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
[rockchip fixes from Jonas Karlman via IRC]
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/rk3328-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/rk3568-generic.dts | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 0135bc08d49..b0e50a973a8 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -146,6 +146,10 @@ bootph-some-ram; }; +&xin24m { + bootph-all; +}; + #ifdef CONFIG_ROCKCHIP_SPI_IMAGE &binman { simple-bin-spi { diff --git a/arch/arm/dts/rk3568-generic.dts b/arch/arm/dts/rk3568-generic.dts index 085a09268e8..83ce6d324cc 100644 --- a/arch/arm/dts/rk3568-generic.dts +++ b/arch/arm/dts/rk3568-generic.dts @@ -4,7 +4,7 @@ */ /dts-v1/; -#include "rk356x.dtsi" +#include "rk356x-base.dtsi" / { model = "Generic RK3566/RK3568"; |