[PATCH v4 2/4] ARM: dts: am335x-boneblack: add eMMC DT entry

2013-09-12 Thread Koen Kooi 
The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC 
cape.

Signed-off-by: Koen Kooi 
---
 arch/arm/boot/dts/am335x-bone-common.dtsi | 22 ++
 arch/arm/boot/dts/am335x-boneblack.dts| 14 ++
 2 files changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi 
b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 0d95d54..bc8d1a2 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -113,6 +113,21 @@
0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
>;
};
+
+   emmc_pins: pinmux_emmc_pins {
+   pinctrl-single,pins = <
+   0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* 
gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */
+   0x84 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */
+   0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */
+   0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */
+   0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */
+   0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */
+   0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */
+   0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */
+   0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */
+   0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */
+   >;
+   };
};
 
ocp {
@@ -242,6 +257,13 @@
regulator-always-on;
};
};
+
+   vmmcsd_fixed: fixedregulator@0 {
+   compatible = "regulator-fixed";
+   regulator-name = "vmmcsd_fixed";
+   regulator-min-microvolt = <330>;
+   regulator-max-microvolt = <330>;
+   };
 };
 
 &cpsw_emac0 {
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts 
b/arch/arm/boot/dts/am335x-boneblack.dts
index 197cadf..f4703cf 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -15,3 +15,17 @@
regulator-max-microvolt = <180>;
regulator-always-on;
 };
+
+&mmc1 { 
+   vmmc-supply = <&vmmcsd_fixed>;
+};
+
+&mmc2 { 
+   vmmc-supply = <&vmmcsd_fixed>;
+   pinctrl-names = "default";
+   pinctrl-0 = <&emmc_pins>;
+   bus-width = <8>;
+   status = "okay";
+   ti,vcc-aux-disable-is-sleep;
+};
+
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 2/4] ARM: dts: am335x-boneblack: add eMMC DT entry

2013-09-13 Thread Tony Lindgren 
* Koen Kooi  [130912 11:43]:
> The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC 
> cape.
> 
> Signed-off-by: Koen Kooi 
> ---
>  arch/arm/boot/dts/am335x-bone-common.dtsi | 22 ++
>  arch/arm/boot/dts/am335x-boneblack.dts| 14 ++
>  2 files changed, 36 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi 
> b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index 0d95d54..bc8d1a2 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -113,6 +113,21 @@
>   0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
>   >;
>   };
> +
> + emmc_pins: pinmux_emmc_pins {
> + pinctrl-single,pins = <
> + 0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* 
> gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */
> + 0x84 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */
> + 0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */
> + 0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */
> + 0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */
> + 0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */
> + 0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */
> + 0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */
> + 0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */
> + 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
> gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */
> + >;
> + };
>   };
>  
>   ocp {

Here you can now use just the defines to make it a bit shorter:

0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 2/4] ARM: dts: am335x-boneblack: add eMMC DT entry

2013-09-17 Thread Benoit Cousson 

Hi Tony,

On 13/09/2013 17:27, Tony Lindgren wrote:

* Koen Kooi  [130912 11:43]:

The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC 
cape.

Signed-off-by: Koen Kooi 
---
  arch/arm/boot/dts/am335x-bone-common.dtsi | 22 ++
  arch/arm/boot/dts/am335x-boneblack.dts| 14 ++
  2 files changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi 
b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 0d95d54..bc8d1a2 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -113,6 +113,21 @@
0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
>;
};
+
+   emmc_pins: pinmux_emmc_pins {
+   pinctrl-single,pins = <
+   0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* 
gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */
+   0x84 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */
+   0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */
+   0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */
+   0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */
+   0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */
+   0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */
+   0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */
+   0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */
+   0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* 
gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */
+   >;
+   };
};

ocp {


Here you can now use just the defines to make it a bit shorter:

0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */


Considering that Koen has just disappeared for a 3 weeks honeymoon, I'll 
fix the patch. GIT does complain about various trailing spaces and end 
of file issue for this patch as well :-(


Regards,
Benoit

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html