lkml.org 
[lkml]   [2012]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 016/135] ARM: dts: imx51-babbage: fix esdhc cd/wp properties
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Shawn Guo <shawn.guo@linaro.org>

    commit a46d2619d7180bda12bad2bf15bbd0731dfc2dcf upstream.

    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>
    Acked-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 ++++----
    arch/arm/boot/dts/imx51-babbage.dts | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
    +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
    @@ -10,8 +10,8 @@ Required properties:

    Optional properties:
    - fsl,card-wired : Indicate the card is wired to host permanently
    -- 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
    - cd-gpios : Specify GPIOs for card detection
    - wp-gpios : Specify GPIOs for write protection

    @@ -21,8 +21,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 {
    --- a/arch/arm/boot/dts/imx51-babbage.dts
    +++ b/arch/arm/boot/dts/imx51-babbage.dts
    @@ -29,8 +29,8 @@
    aips@70000000 { /* aips-1 */
    spba@70000000 {
    esdhc@70004000 { /* ESDHC1 */
    - fsl,cd-internal;
    - fsl,wp-internal;
    + fsl,cd-controller;
    + fsl,wp-controller;
    status = "okay";
    };




    \
     
     \ /
      Last update: 2012-09-17 04:01    [W:0.029 / U:0.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site