| Message ID | 20241105160054.1373319-4-jonas@kwiboo.se |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: rk3288-tinker: Migrate to OF_UPSTREAM | expand |
On 2024/11/6 00:00, Jonas Karlman wrote: > Drop the unneeded bootph-all prop from dmc node, it is already defined > in soc u-boot.dtsi. > > Remove booth-all prop from gpio7 node, this node is not needed in TPL. > > Adjust bootph props to include pinctrl related nodes for UART2. > > Remove the explicit bootph-all prop from the pinctrl node, any bootph- > prop will automatically be propagated to the pinctrl node. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3288-tinker-u-boot.dtsi | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > index 032dac221c24..1665e4f5d10f 100644 > --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi > +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > @@ -6,7 +6,6 @@ > #include "rk3288-u-boot.dtsi" > > &dmc { > - bootph-all; > rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d > 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 > 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 > @@ -18,6 +17,7 @@ > }; > > &gpio7 { > + /delete-property/ bootph-all; > bootph-pre-ram; > }; > > @@ -29,7 +29,7 @@ > }; > > &pcfg_pull_none { > - bootph-pre-ram; > + bootph-all; > }; > > &pcfg_pull_none_drv_8ma { > @@ -37,17 +37,13 @@ > }; > > &pcfg_pull_up { > - bootph-pre-ram; > + bootph-all; > }; > > &pcfg_pull_up_drv_8ma { > bootph-pre-ram; > }; > > -&pinctrl { > - bootph-all; > -}; > - > &sdmmc { > bootph-pre-ram; > }; > @@ -77,7 +73,8 @@ > }; > > &uart2_xfer { > - bootph-all; > + bootph-pre-sram; > + bootph-pre-ram; > }; > > &vcc_sd {
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 032dac221c24..1665e4f5d10f 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -6,7 +6,6 @@ #include "rk3288-u-boot.dtsi" &dmc { - bootph-all; rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 @@ -18,6 +17,7 @@ }; &gpio7 { + /delete-property/ bootph-all; bootph-pre-ram; }; @@ -29,7 +29,7 @@ }; &pcfg_pull_none { - bootph-pre-ram; + bootph-all; }; &pcfg_pull_none_drv_8ma { @@ -37,17 +37,13 @@ }; &pcfg_pull_up { - bootph-pre-ram; + bootph-all; }; &pcfg_pull_up_drv_8ma { bootph-pre-ram; }; -&pinctrl { - bootph-all; -}; - &sdmmc { bootph-pre-ram; }; @@ -77,7 +73,8 @@ }; &uart2_xfer { - bootph-all; + bootph-pre-sram; + bootph-pre-ram; }; &vcc_sd {
Drop the unneeded bootph-all prop from dmc node, it is already defined in soc u-boot.dtsi. Remove booth-all prop from gpio7 node, this node is not needed in TPL. Adjust bootph props to include pinctrl related nodes for UART2. Remove the explicit bootph-all prop from the pinctrl node, any bootph- prop will automatically be propagated to the pinctrl node. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)