| Message ID | 20200415131057.2366-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 051083dddf07a4472bc1720d5c2b1909e0865890 |
| Headers | show |
| Series | arm64: dts: rockchip: remove bus-width from mmc nodes in rk3308-roc-cc.dts | expand |
On Wed, 15 Apr 2020 15:10:57 +0200, Johan Jonker wrote: > The 'bus-width' property for mmc nodes is defined both in > 'rk3308.dtsi' and 'rk3308-roc-cc.dts'. > 'bus-width' and pinctrl containing the bus-pins > should be in the same file, so remove all entries > from mmc nodes in 'rk3308-roc-cc.dts'. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > [...] Applied, thanks! [1/1] arm64: dts: rockchip: remove bus-width from mmc nodes in rk3308-roc-cc commit: 051083dddf07a4472bc1720d5c2b1909e0865890 Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts index aa256350b..8011e9b12 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts @@ -123,7 +123,6 @@ }; &emmc { - bus-width = <8>; cap-mmc-highspeed; disable-wp; mmc-hs200-1_8v; @@ -171,7 +170,6 @@ }; &sdmmc { - bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; card-detect-delay = <300>;
The 'bus-width' property for mmc nodes is defined both in 'rk3308.dtsi' and 'rk3308-roc-cc.dts'. 'bus-width' and pinctrl containing the bus-pins should be in the same file, so remove all entries from mmc nodes in 'rk3308-roc-cc.dts'. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 2 -- 1 file changed, 2 deletions(-)