Re: [PATCH v2] mmc: dt: Consolidate DT bindings
On Sunday 13 May 2012, Chris Ball wrote: Hi Arnd, On Sun, May 13 2012, Arnd Bergmann wrote: I've verified that there are no conflicts with anything we have in arm-soc right now, so I think it should just go through your tree. Ah, I based the patch on latest linux-next. That's why there aren't conflicts against arm-soc, but there are conflicts (in the omap and tegra dts changes) between the patch and Linus master/mmc-next: Applying: mmc: dt: Consolidate DT bindings error: patch failed: arch/arm/boot/dts/omap3-beagle.dts:57 error: patch failed: arch/arm/boot/dts/omap4-panda.dts:55 error: patch failed: arch/arm/boot/dts/omap4-sdp.dts:94 error: patch failed: arch/arm/boot/dts/tegra-cardhu.dts:141 error: patch failed: arch/arm/boot/dts/tegra-harmony.dts:335 error: patch failed: arch/arm/boot/dts/tegra-ventana.dts:338 Patch failed at 0001 mmc: dt: Consolidate DT bindings So I think merging via arm-soc is the only way to get it to Linus without conflicts. (Alternatively I can take it in mmc-next and Linus can handle the conflicts.) I've created a drivers/mmc branch with this patch and its direct dependencies now and pulled that into the next/drivers branch of arm-soc Thanks, Arnd -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] mmc: dt: Consolidate DT bindings
Hi Chris Good to see this happening! Is anyone also planning to submit a generic OF parser to convert OF properties into respective host capability flags? I didn't thoroughly review this patch, just a minor typo correction: On Sun, 13 May 2012, Chris Ball wrote: Hi Arnd, On Fri, Mar 30 2012, Stephen Warren wrote: No progress so far. I would suggest we apply the patch below to unify the bindings we have. I tried to minimize the impact by picking the most common version for each property, but if we know about devices that would get broken by this, we may have to be more careful. Signed-off-by: Arnd Bergmann a...@arndb.de Here's a version of your MMC DT bindings patch that responds to Stephen Warren's review comments, refreshed against latest linux-next -- I'd like to get this merged for v3.5. Since it touches many .dts files, should it go via arm-soc? Thanks. From: Arnd Bergmann a...@arndb.de Subject: [PATCH] mmc: dt: Consolidate DT bindings This patch unifies the current DT MMC bindings documentation and code, adds generic MMC DT bindings documentation, and updates .dts files for consistency. Signed-off-by: Arnd Bergmann a...@arndb.de [cjb: typo fixes, addition of max-frequency property] Signed-off-by: Chris Ball c...@laptop.org --- Changes since Arnd's v1: * Typo fix from Stephen Warren: s/interrupt/interrupts/ * Typo fix: s/non-removable/ti,non-removable/. This one's being preserved for backwards compatibility. * Add max-frequency property. .../devicetree/bindings/mmc/fsl-esdhc.txt |6 +++-- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt |2 +- .../devicetree/bindings/mmc/mmc-spi-slot.txt |3 ++- Documentation/devicetree/bindings/mmc/mmc.txt | 27 .../devicetree/bindings/mmc/nvidia-sdhci.txt |4 +-- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt |4 +-- arch/arm/boot/dts/imx53-smd.dts|4 +-- arch/arm/boot/dts/imx6q-arm2.dts |2 +- arch/arm/boot/dts/omap3-beagle.dts |2 +- arch/arm/boot/dts/omap4-panda.dts |4 +-- arch/arm/boot/dts/omap4-sdp.dts|6 ++--- arch/arm/boot/dts/tegra-cardhu.dts |2 ++ arch/arm/boot/dts/tegra-harmony.dts|2 ++ arch/arm/boot/dts/tegra-paz00.dts |2 ++ arch/arm/boot/dts/tegra-seaboard.dts |2 ++ arch/arm/boot/dts/tegra-ventana.dts|2 ++ arch/powerpc/boot/dts/mpc8569mds.dts |1 + drivers/mmc/host/omap_hsmmc.c |2 +- drivers/mmc/host/sdhci-esdhc-imx.c |2 +- drivers/mmc/host/sdhci-pltfm.c |8 -- 20 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/mmc.txt diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt index 64bcb8b..0d93b4b 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt @@ -11,9 +11,11 @@ Required properties: - interrupt-parent : interrupt source phandle. - clock-frequency : specifies eSDHC base clock frequency. - sdhci,wp-inverted : (optional) specifies that eSDHC controller -reports inverted write-protect state; +reports inverted write-protect state; New devices should use +the generic wp-inverted property. - sdhci,1-bit-only : (optional) specifies that a controller can -only handle 1-bit data transfers. +only handle 1-bit data transfers. New devices should use the +generic bus-width = 1 property. - sdhci,auto-cmd12: (optional) specifies that a controller can only handle auto CMD12. diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index ab22fe6..c7e404b 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -9,7 +9,7 @@ Required properties: - interrupts : Should contain eSDHC interrupt Optional properties: -- fsl,card-wired : Indicate the card is wired to host permanently +- non-removable : 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 - cd-gpios : Specify GPIOs for card detection diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt index 89a0084..d64aea5 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt @@ -10,7 +10,8 @@ Required properties: Optional properties: - gpios : may
Re: [PATCH v2] mmc: dt: Consolidate DT bindings
Hi Arnd, On Sun, May 13 2012, Arnd Bergmann wrote: I've verified that there are no conflicts with anything we have in arm-soc right now, so I think it should just go through your tree. Ah, I based the patch on latest linux-next. That's why there aren't conflicts against arm-soc, but there are conflicts (in the omap and tegra dts changes) between the patch and Linus master/mmc-next: Applying: mmc: dt: Consolidate DT bindings error: patch failed: arch/arm/boot/dts/omap3-beagle.dts:57 error: patch failed: arch/arm/boot/dts/omap4-panda.dts:55 error: patch failed: arch/arm/boot/dts/omap4-sdp.dts:94 error: patch failed: arch/arm/boot/dts/tegra-cardhu.dts:141 error: patch failed: arch/arm/boot/dts/tegra-harmony.dts:335 error: patch failed: arch/arm/boot/dts/tegra-ventana.dts:338 Patch failed at 0001 mmc: dt: Consolidate DT bindings So I think merging via arm-soc is the only way to get it to Linus without conflicts. (Alternatively I can take it in mmc-next and Linus can handle the conflicts.) Thanks! - Chris. -- Chris Ball c...@laptop.org http://printf.net/ One Laptop Per Child -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] mmc: dt: Consolidate DT bindings
Hi Arnd, On Fri, Mar 30 2012, Stephen Warren wrote: No progress so far. I would suggest we apply the patch below to unify the bindings we have. I tried to minimize the impact by picking the most common version for each property, but if we know about devices that would get broken by this, we may have to be more careful. Signed-off-by: Arnd Bergmann a...@arndb.de Here's a version of your MMC DT bindings patch that responds to Stephen Warren's review comments, refreshed against latest linux-next -- I'd like to get this merged for v3.5. Since it touches many .dts files, should it go via arm-soc? Thanks. From: Arnd Bergmann a...@arndb.de Subject: [PATCH] mmc: dt: Consolidate DT bindings This patch unifies the current DT MMC bindings documentation and code, adds generic MMC DT bindings documentation, and updates .dts files for consistency. Signed-off-by: Arnd Bergmann a...@arndb.de [cjb: typo fixes, addition of max-frequency property] Signed-off-by: Chris Ball c...@laptop.org --- Changes since Arnd's v1: * Typo fix from Stephen Warren: s/interrupt/interrupts/ * Typo fix: s/non-removable/ti,non-removable/. This one's being preserved for backwards compatibility. * Add max-frequency property. .../devicetree/bindings/mmc/fsl-esdhc.txt |6 +++-- .../devicetree/bindings/mmc/fsl-imx-esdhc.txt |2 +- .../devicetree/bindings/mmc/mmc-spi-slot.txt |3 ++- Documentation/devicetree/bindings/mmc/mmc.txt | 27 .../devicetree/bindings/mmc/nvidia-sdhci.txt |4 +-- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt |4 +-- arch/arm/boot/dts/imx53-smd.dts|4 +-- arch/arm/boot/dts/imx6q-arm2.dts |2 +- arch/arm/boot/dts/omap3-beagle.dts |2 +- arch/arm/boot/dts/omap4-panda.dts |4 +-- arch/arm/boot/dts/omap4-sdp.dts|6 ++--- arch/arm/boot/dts/tegra-cardhu.dts |2 ++ arch/arm/boot/dts/tegra-harmony.dts|2 ++ arch/arm/boot/dts/tegra-paz00.dts |2 ++ arch/arm/boot/dts/tegra-seaboard.dts |2 ++ arch/arm/boot/dts/tegra-ventana.dts|2 ++ arch/powerpc/boot/dts/mpc8569mds.dts |1 + drivers/mmc/host/omap_hsmmc.c |2 +- drivers/mmc/host/sdhci-esdhc-imx.c |2 +- drivers/mmc/host/sdhci-pltfm.c |8 -- 20 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/mmc.txt diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt index 64bcb8b..0d93b4b 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt @@ -11,9 +11,11 @@ Required properties: - interrupt-parent : interrupt source phandle. - clock-frequency : specifies eSDHC base clock frequency. - sdhci,wp-inverted : (optional) specifies that eSDHC controller -reports inverted write-protect state; +reports inverted write-protect state; New devices should use +the generic wp-inverted property. - sdhci,1-bit-only : (optional) specifies that a controller can -only handle 1-bit data transfers. +only handle 1-bit data transfers. New devices should use the +generic bus-width = 1 property. - sdhci,auto-cmd12: (optional) specifies that a controller can only handle auto CMD12. diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index ab22fe6..c7e404b 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -9,7 +9,7 @@ Required properties: - interrupts : Should contain eSDHC interrupt Optional properties: -- fsl,card-wired : Indicate the card is wired to host permanently +- non-removable : 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 - cd-gpios : Specify GPIOs for card detection diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt index 89a0084..d64aea5 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt @@ -10,7 +10,8 @@ Required properties: Optional properties: - gpios : may specify GPIOs in this order: Card-Detect GPIO, - Write-Protect GPIO. + Write-Protect GPIO. Note that this does not follow the + binding from mmc.txt, for historic reasons. - interrupts : the interrupt of a card detect interrupt. - interrupt-parent : the phandle for the interrupt controller that services interrupts for this device. diff --git
