| Message ID | 20181219190734.23331-1-shc_work@mail.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: imx51: Add default bus-width property for esdhc1 | expand |
On Wed, Dec 19, 2018 at 10:07:34PM +0300, Alexander Shiyan wrote: > This patch adds bus-width property for esdhc1 to avoid mmc > core warning: "bus-width" property is missing, assuming 1 bit. > Additionally, the patch removes this property for boards where > 4-bit width is already specified, and adds 1-bit width for > boards where this property is omitted. I suspect that even boards omitting the property support more than just 1-bit. The warning is a good reminder for board maintainers/users to check the bus-width. Shawn > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> > --- > arch/arm/boot/dts/imx51-apf51dev.dts | 1 - > arch/arm/boot/dts/imx51-babbage.dts | 1 + > arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 + > arch/arm/boot/dts/imx51-ts4800.dts | 1 + > arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 - > arch/arm/boot/dts/imx51.dtsi | 1 + > 6 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts > index 3e1846a..b26d92f 100644 > --- a/arch/arm/boot/dts/imx51-apf51dev.dts > +++ b/arch/arm/boot/dts/imx51-apf51dev.dts > @@ -97,7 +97,6 @@ > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_esdhc1>; > cd-gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; > - bus-width = <4>; > status = "okay"; > }; > > diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts > index 35ee1b4..8e86116 100644 > --- a/arch/arm/boot/dts/imx51-babbage.dts > +++ b/arch/arm/boot/dts/imx51-babbage.dts > @@ -322,6 +322,7 @@ > &esdhc1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_esdhc1>; > + bus-width = <1>; > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > status = "okay"; > diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts > index e9e819f..f2c3c87 100644 > --- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts > +++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts > @@ -101,6 +101,7 @@ > &esdhc1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>; > + bus-width = <1>; > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts > index 39eb067..e6d25a5 100644 > --- a/arch/arm/boot/dts/imx51-ts4800.dts > +++ b/arch/arm/boot/dts/imx51-ts4800.dts > @@ -82,6 +82,7 @@ > &esdhc1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_esdhc1>; > + bus-width = <1>; > cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > status = "okay"; > diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts > index 69d753c..1287b57 100644 > --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts > +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts > @@ -459,7 +459,6 @@ > &esdhc1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_esdhc1>; > - bus-width = <4>; > no-1-8-v; > non-removable; > no-sdio; > diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi > index 67d4627..eac432a 100644 > --- a/arch/arm/boot/dts/imx51.dtsi > +++ b/arch/arm/boot/dts/imx51.dtsi > @@ -172,6 +172,7 @@ > <&clks IMX5_CLK_DUMMY>, > <&clks IMX5_CLK_ESDHC1_PER_GATE>; > clock-names = "ipg", "ahb", "per"; > + bus-width = <4>; > status = "disabled"; > }; > > -- > 2.10.2 >
diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts index 3e1846a..b26d92f 100644 --- a/arch/arm/boot/dts/imx51-apf51dev.dts +++ b/arch/arm/boot/dts/imx51-apf51dev.dts @@ -97,7 +97,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; cd-gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; - bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index 35ee1b4..8e86116 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -322,6 +322,7 @@ &esdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; + bus-width = <1>; cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; status = "okay"; diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts index e9e819f..f2c3c87 100644 --- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts @@ -101,6 +101,7 @@ &esdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>; + bus-width = <1>; cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts index 39eb067..e6d25a5 100644 --- a/arch/arm/boot/dts/imx51-ts4800.dts +++ b/arch/arm/boot/dts/imx51-ts4800.dts @@ -82,6 +82,7 @@ &esdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; + bus-width = <1>; cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; status = "okay"; diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index 69d753c..1287b57 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -459,7 +459,6 @@ &esdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; - bus-width = <4>; no-1-8-v; non-removable; no-sdio; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 67d4627..eac432a 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -172,6 +172,7 @@ <&clks IMX5_CLK_DUMMY>, <&clks IMX5_CLK_ESDHC1_PER_GATE>; clock-names = "ipg", "ahb", "per"; + bus-width = <4>; status = "disabled"; };
This patch adds bus-width property for esdhc1 to avoid mmc core warning: "bus-width" property is missing, assuming 1 bit. Additionally, the patch removes this property for boards where 4-bit width is already specified, and adds 1-bit width for boards where this property is omitted. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> --- arch/arm/boot/dts/imx51-apf51dev.dts | 1 - arch/arm/boot/dts/imx51-babbage.dts | 1 + arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 + arch/arm/boot/dts/imx51-ts4800.dts | 1 + arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 - arch/arm/boot/dts/imx51.dtsi | 1 + 6 files changed, 4 insertions(+), 2 deletions(-)