Message ID | 20241017200039.1235524-6-jonas@kwiboo.se |
---|---|
State | Accepted |
Commit | d1c38bb4a80f1d5b4797f892adeb0cf35440d69a |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: Add support for FriendlyElec NanoPC-T6 LTS | expand |
On 2024/10/18 04:00, Jonas Karlman wrote: > The SPI flash node has been added in upstream DT, drop all props beside > bootph-* props from the SPI flash related nodes from u-boot.dtsi. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi > index 968385622fa5..3261b2c42b4b 100644 > --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi > +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi > @@ -12,19 +12,8 @@ > }; > > &sfc { > - pinctrl-names = "default"; > - pinctrl-0 = <&fspim1_pins>; > - #address-cells = <1>; > - #size-cells = <0>; > - status = "okay"; > - > flash@0 { > - compatible = "jedec,spi-nor"; > - reg = <0>; > bootph-pre-ram; > bootph-some-ram; > - spi-max-frequency = <24000000>; > - spi-rx-bus-width = <4>; > - spi-tx-bus-width = <1>; > }; > };
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi index 968385622fa5..3261b2c42b4b 100644 --- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi +++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi @@ -12,19 +12,8 @@ }; &sfc { - pinctrl-names = "default"; - pinctrl-0 = <&fspim1_pins>; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; bootph-pre-ram; bootph-some-ram; - spi-max-frequency = <24000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; }; };
The SPI flash node has been added in upstream DT, drop all props beside bootph-* props from the SPI flash related nodes from u-boot.dtsi. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 11 ----------- 1 file changed, 11 deletions(-)