diff options
| author | Tom Rini <trini@konsulko.com> | 2023-12-03 16:30:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-03 16:30:32 -0500 |
| commit | 5c4e9d0c74a8c2f8d0f4e0ab9cf44959298c2bad (patch) | |
| tree | c15a51b13e778520d519663ce27e69fbdadf0bf3 | |
| parent | b56d21f3bbc28f773536df282467833af6fdab1f (diff) | |
| parent | 13bdb6a269108d3f9b953bf4b73079d66ecc37af (diff) | |
| download | u-boot-5c4e9d0c74a8c2f8d0f4e0ab9cf44959298c2bad.zip u-boot-5c4e9d0c74a8c2f8d0f4e0ab9cf44959298c2bad.tar.gz u-boot-5c4e9d0c74a8c2f8d0f4e0ab9cf44959298c2bad.tar.bz2 | |
Merge branch 'master-rpc-off' of https://source.denx.de/u-boot/custodians/u-boot-sh
| -rw-r--r-- | arch/arm/dts/r8a779g0-u-boot.dtsi | 18 | ||||
| -rw-r--r-- | arch/arm/dts/r8a779g0-white-hawk-u-boot.dts | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/dts/r8a779g0-u-boot.dtsi b/arch/arm/dts/r8a779g0-u-boot.dtsi index 150657f..cc8beca 100644 --- a/arch/arm/dts/r8a779g0-u-boot.dtsi +++ b/arch/arm/dts/r8a779g0-u-boot.dtsi @@ -7,20 +7,10 @@ #include "r8a779x-u-boot.dtsi" -/ { - soc { - rpc: spi@ee200000 { - compatible = "renesas,r8a779g0-rpc-if", "renesas,rcar-gen4-rpc-if"; - reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x04000000>; - interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cpg CPG_MOD 629>; - power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>; - resets = <&cpg 629>; - bank-width = <2>; - num-cs = <1>; - status = "disabled"; - }; - }; +&rpc { + reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x04000000>; + bank-width = <2>; + num-cs = <1>; }; &extalr_clk { diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts index efc1b95..bd75603 100644 --- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts +++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts @@ -28,7 +28,7 @@ #address-cells = <1>; #size-cells = <0>; spi-max-frequency = <40000000>; - status = "okay"; + status = "disabled"; spi-flash@0 { #address-cells = <1>; |