| Message ID | 20241016201413.903112-1-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 130850597457b7b75060a7365e34a3a6050a48b3 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3588-rock-5b: Drop upstream props from u-boot.dtsi | expand |
On Wed, 16 Oct 2024 at 21:32, Jonas Karlman <jonas@kwiboo.se> wrote: > > The SPI flash node has been added in upstream DT, drop all props beside > bootph-* props from the SPI flash related nodes in u-boot.dtsi. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> > --- > arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > index 4dd17ff408cb..3ff3bb64e4f7 100644 > --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > @@ -16,18 +16,9 @@ > }; > > &sfc { > - pinctrl-names = "default"; > - pinctrl-0 = <&fspim2_pins>; > - 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>; > }; > }; > > -- > 2.46.2 >
On 2024/10/17 04:14, 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 in 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-rock-5b-u-boot.dtsi | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > index 4dd17ff408cb..3ff3bb64e4f7 100644 > --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > @@ -16,18 +16,9 @@ > }; > > &sfc { > - pinctrl-names = "default"; > - pinctrl-0 = <&fspim2_pins>; > - 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-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 4dd17ff408cb..3ff3bb64e4f7 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -16,18 +16,9 @@ }; &sfc { - pinctrl-names = "default"; - pinctrl-0 = <&fspim2_pins>; - 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 in u-boot.dtsi. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 9 --------- 1 file changed, 9 deletions(-)