| commit | ebe3840ba80c06ba7485c49588866ba468b41076 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sun Jan 26 16:17:48 2025 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Sun Jan 26 16:19:33 2025 -0600 |
| tree | 90447acc915dafdd9227d24f748b5f1a3976b9d3 | |
| parent | f008627d8bcf364e2470d82666c403819a3215c3 [diff] | |
| parent | 844493d7e99cb795f3e28130ee09ba7a6441162f [diff] |
Subtree merge tag 'v6.13-dts' of dts repo [1] into dts/upstream [1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git [rockchip fixes from Jonas Karlman via IRC]
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 0135bc0..b0e50a9 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 085a092..83ce6d3 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";