| Message ID | 1345643887-30606-1-git-send-email-shawn.guo@linaro.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
Hi, (removing stable@ from e-mail) On Wed, Aug 22 2012, Shawn Guo wrote: > The binding doc and dts use properties "fsl,{cd,wp}-internal" while > esdhc driver uses "fsl,{cd,wp}-controller". Fix binding doc and dts > to get them match driver code. > > Reported-by: Chris Ball <cjb@laptop.org> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: <stable@vger.kernel.org> > --- > .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 ++++---- > arch/arm/boot/dts/imx51-babbage.dts | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) Want to take this through your own tree, to avoid .dts conflicts later? If so: Acked-by: Chris Ball <cjb@laptop.org> Thanks, - Chris.
On Wed, Aug 22, 2012 at 10:02:48AM -0400, Chris Ball wrote: > Want to take this through your own tree, to avoid .dts conflicts later? > If so: Yes, I have another a few IMX fixing queued for 3.6-rc, and would send this one together shortly. > > Acked-by: Chris Ball <cjb@laptop.org> > Thanks.
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index 70cd49b..1dd6225 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -10,8 +10,8 @@ Required properties: - compatible : Should be "fsl,<chip>-esdhc" Optional properties: -- fsl,cd-internal : Indicate to use controller internal card detection -- fsl,wp-internal : Indicate to use controller internal write protection +- fsl,cd-controller : Indicate to use controller internal card detection +- fsl,wp-controller : Indicate to use controller internal write protection Examples: @@ -19,8 +19,8 @@ esdhc@70004000 { compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; - fsl,cd-internal; - fsl,wp-internal; + fsl,cd-controller; + fsl,wp-controller; }; esdhc@70008000 { diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index cd86177..59d9789 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -25,8 +25,8 @@ aips@70000000 { /* aips-1 */ spba@70000000 { esdhc@70004000 { /* ESDHC1 */ - fsl,cd-internal; - fsl,wp-internal; + fsl,cd-controller; + fsl,wp-controller; status = "okay"; };
The binding doc and dts use properties "fsl,{cd,wp}-internal" while esdhc driver uses "fsl,{cd,wp}-controller". Fix binding doc and dts to get them match driver code. Reported-by: Chris Ball <cjb@laptop.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: <stable@vger.kernel.org> --- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 ++++---- arch/arm/boot/dts/imx51-babbage.dts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)