2013-09-12 18:35:45

by Koen Kooi

[permalink] [raw]
Subject: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

Here are two patches to fix MMC on beaglebone, one fixes card detect on BBW,
the other adds the eMMC entry for BBB and its fixed regulator. After that mmc1
gets a nice speed boost by moving to 4-bit mode and LED triggers get assigned.

This series depends on:

http://comments.gmane.org/gmane.linux.kernel.stable/63648
https://lkml.org/lkml/2013/9/10/454
http://comments.gmane.org/gmane.linux.kernel.mmc/22381

Or as git-cherry would put it:

[koen@rrMBP patches]$ git cherry -v
+ 564fc88cc64387af5312e2abd8019c75a13223b2 ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
+ e5133ed98acc1c3e01c370b851041a8ca629cd15 ARM: EDMA: Fix clearing of unused list for DT DMA resources
+ ac71bb58605d3bdd5d14af770a639fb3ff11c612 ARM: dts: add AM33XX EDMA support
+ 31a8270a299c57c7de7510f44d9dc36fd1787243 ARM: dts: add AM33XX SPI DMA support
+ 4fa0a4cb9ea17da30cf43085c03e5ec1361a4fc2 ARM: dts: add AM33XX MMC support and documentation
+ 0553f50bd45f019a0cc11050e2f20bddbf07dfe0 ARM: dts: am335x-bone: add CD for mmc1
+ 7d64f765630a2921a63b82f93f9959a6de37f29d ARM: dts: am335x-boneblack: add eMMC DT entry
+ dc96cd4003e2668d8ec7e7fe19e402e97a198f81 ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode
+ f8262e78830cda56c936724549ba9f04dddde312 ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers

Also available as a git branch at https://github.com/koenkooi/linux/commits/mainline

Changes since v3:
Addressed Nishants nitpicks for commit messages
Addressed Russ' comments about moving LDO3 for mmc1 out of the common dtsi

Changes since v2:
Missing pinmux entries for eMMC added

Changes since v1:
Removed ti,non-removable entry from eMMC node, see http://marc.info/?l=linux-arm-kernel&m=137889435710552&w=2
---

Alexander Holler (1):
arm: bone: dts: add CD for mmc1

Koen Kooi (3):
am335x-boneblack: add eMMC DT entry
ARM: am335x-bone-common: switch mmc1 to 4-bit mode
ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers

arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/am335x-bone.dts | 1 -
arch/arm/boot/dts/am335x-boneblack.dts | 14 +++++++++++
3 files changed, 53 insertions(+), 1 deletion(-)

--
1.8.2.1


2013-09-12 18:35:53

by Koen Kooi

[permalink] [raw]
Subject: [PATCH v4 4/4] ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers

This matches the vendor 3.8.x configuration that is shipping with the boards.

The LED layout is now:

USR0: heartbeat
USR1: mmc0 (micro-SD slot)
USR2: cpu0
USR3: mmc1 (eMMC)

The cpu0 triggers was put in between the mmc triggers to make is easier to see
where the disk activity is.

Signed-off-by: Koen Kooi <[email protected]>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 303df81..adce9fe 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -204,12 +204,14 @@
led@4 {
label = "beaglebone:green:usr2";
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "cpu0";
default-state = "off";
};

led@5 {
label = "beaglebone:green:usr3";
gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc1";
default-state = "off";
};
};
--
1.8.2.1

2013-09-12 18:35:47

by Koen Kooi

[permalink] [raw]
Subject: [PATCH v4 1/4] ARM: dts: am335x-bone: add CD for mmc1

From: Alexander Holler <[email protected]>

This enables the use of MMC cards even when no card was inserted at boot.

Signed-off-by: Alexander Holler <[email protected]>
Signed-off-by: Koen Kooi <[email protected]>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++
arch/arm/boot/dts/am335x-bone.dts | 1 -
2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 2f66ded..0d95d54 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -107,6 +107,12 @@
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
>;
};
+
+ mmc1_pins: pinmux_mmc1_pins {
+ pinctrl-single,pins = <
+ 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
+ >;
+ };
};

ocp {
@@ -260,3 +266,11 @@
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
};
+
+&mmc1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index d5f43fe..0d63348 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -17,6 +17,5 @@
};

&mmc1 {
- status = "okay";
vmmc-supply = <&ldo3_reg>;
};
--
1.8.2.1

2013-09-12 18:36:33

by Koen Kooi

[permalink] [raw]
Subject: [PATCH v4 3/4] ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode

The micro-SD slot hooks up all four data pins so lets' use them.

Signed-off-by: Koen Kooi <[email protected]>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index bc8d1a2..303df81 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -291,6 +291,7 @@

&mmc1 {
status = "okay";
+ bus-width = <0x4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
--
1.8.2.1

2013-09-12 18:36:50

by Koen Kooi

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

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

Signed-off-by: Koen Kooi <[email protected]>
---
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 = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
};

&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 = <1800000>;
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

2013-09-12 19:22:44

by Nishanth Menon

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

On 09/12/2013 01:35 PM, Koen Kooi wrote:
> Here are two patches to fix MMC on beaglebone, one fixes card detect on BBW,
> the other adds the eMMC entry for BBB and its fixed regulator. After that mmc1
> gets a nice speed boost by moving to 4-bit mode and LED triggers get assigned.
>
> This series depends on:
>
> http://comments.gmane.org/gmane.linux.kernel.stable/63648
> https://lkml.org/lkml/2013/9/10/454
> http://comments.gmane.org/gmane.linux.kernel.mmc/22381
>
> Or as git-cherry would put it:
>
> [koen@rrMBP patches]$ git cherry -v
> + 564fc88cc64387af5312e2abd8019c75a13223b2 ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
> + e5133ed98acc1c3e01c370b851041a8ca629cd15 ARM: EDMA: Fix clearing of unused list for DT DMA resources
> + ac71bb58605d3bdd5d14af770a639fb3ff11c612 ARM: dts: add AM33XX EDMA support
> + 31a8270a299c57c7de7510f44d9dc36fd1787243 ARM: dts: add AM33XX SPI DMA support
> + 4fa0a4cb9ea17da30cf43085c03e5ec1361a4fc2 ARM: dts: add AM33XX MMC support and documentation
> + 0553f50bd45f019a0cc11050e2f20bddbf07dfe0 ARM: dts: am335x-bone: add CD for mmc1
> + 7d64f765630a2921a63b82f93f9959a6de37f29d ARM: dts: am335x-boneblack: add eMMC DT entry
> + dc96cd4003e2668d8ec7e7fe19e402e97a198f81 ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode
> + f8262e78830cda56c936724549ba9f04dddde312 ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers
>
> Also available as a git branch at https://github.com/koenkooi/linux/commits/mainline
>
> Changes since v3:
> Addressed Nishants nitpicks for commit messages

Series:
Reviewed-by: Nishanth Menon <[email protected]>


--
Regards,
Nishanth Menon

2013-09-12 22:27:48

by Kevin Hilman

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

Koen Kooi <[email protected]> writes:

> Here are two patches to fix MMC on beaglebone, one fixes card detect on BBW,
> the other adds the eMMC entry for BBB and its fixed regulator. After that mmc1
> gets a nice speed boost by moving to 4-bit mode and LED triggers get assigned.
>
> This series depends on:
>
> http://comments.gmane.org/gmane.linux.kernel.stable/63648
> https://lkml.org/lkml/2013/9/10/454
> http://comments.gmane.org/gmane.linux.kernel.mmc/22381
>
> Or as git-cherry would put it:
>
> [koen@rrMBP patches]$ git cherry -v
> + 564fc88cc64387af5312e2abd8019c75a13223b2 ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
> + e5133ed98acc1c3e01c370b851041a8ca629cd15 ARM: EDMA: Fix clearing of unused list for DT DMA resources
> + ac71bb58605d3bdd5d14af770a639fb3ff11c612 ARM: dts: add AM33XX EDMA support
> + 31a8270a299c57c7de7510f44d9dc36fd1787243 ARM: dts: add AM33XX SPI DMA support
> + 4fa0a4cb9ea17da30cf43085c03e5ec1361a4fc2 ARM: dts: add AM33XX MMC support and documentation
> + 0553f50bd45f019a0cc11050e2f20bddbf07dfe0 ARM: dts: am335x-bone: add CD for mmc1
> + 7d64f765630a2921a63b82f93f9959a6de37f29d ARM: dts: am335x-boneblack: add eMMC DT entry
> + dc96cd4003e2668d8ec7e7fe19e402e97a198f81 ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode
> + f8262e78830cda56c936724549ba9f04dddde312 ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers
>
> Also available as a git branch at https://github.com/koenkooi/linux/commits/mainline

FWIW, tested this branch on BB black/white with MMC rootfs.

Tested-by: Kevin Hilman <[email protected]>

Koen, Thanks for your persistence getting this stuff merged.

Kevin

2013-09-13 09:19:22

by Koen Kooi

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes


Op 13 sep. 2013, om 00:27 heeft Kevin Hilman <[email protected]> het volgende geschreven:

> Koen Kooi <[email protected]> writes:
>
>> Here are two patches to fix MMC on beaglebone, one fixes card detect on BBW,
>> the other adds the eMMC entry for BBB and its fixed regulator. After that mmc1
>> gets a nice speed boost by moving to 4-bit mode and LED triggers get assigned.
>>
>> This series depends on:
>>
>> http://comments.gmane.org/gmane.linux.kernel.stable/63648
>> https://lkml.org/lkml/2013/9/10/454
>> http://comments.gmane.org/gmane.linux.kernel.mmc/22381
>>
>> Or as git-cherry would put it:
>>
>> [koen@rrMBP patches]$ git cherry -v
>> + 564fc88cc64387af5312e2abd8019c75a13223b2 ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
>> + e5133ed98acc1c3e01c370b851041a8ca629cd15 ARM: EDMA: Fix clearing of unused list for DT DMA resources
>> + ac71bb58605d3bdd5d14af770a639fb3ff11c612 ARM: dts: add AM33XX EDMA support
>> + 31a8270a299c57c7de7510f44d9dc36fd1787243 ARM: dts: add AM33XX SPI DMA support
>> + 4fa0a4cb9ea17da30cf43085c03e5ec1361a4fc2 ARM: dts: add AM33XX MMC support and documentation
>> + 0553f50bd45f019a0cc11050e2f20bddbf07dfe0 ARM: dts: am335x-bone: add CD for mmc1
>> + 7d64f765630a2921a63b82f93f9959a6de37f29d ARM: dts: am335x-boneblack: add eMMC DT entry
>> + dc96cd4003e2668d8ec7e7fe19e402e97a198f81 ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode
>> + f8262e78830cda56c936724549ba9f04dddde312 ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers
>>
>> Also available as a git branch at https://github.com/koenkooi/linux/commits/mainline
>
> FWIW, tested this branch on BB black/white with MMC rootfs.
>
> Tested-by: Kevin Hilman <[email protected]>
>
> Koen, Thanks for your persistence getting this stuff merged.

No problem, with all comments addressed I can safely disappear for 3 weeks to go on honeymoon :)

regards,

Koen-

2013-09-13 15:27:14

by Tony Lindgren

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

* Koen Kooi <[email protected]> [130912 11:43]:
> The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC cape.
>
> Signed-off-by: Koen Kooi <[email protected]>
> ---
> 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

2013-09-17 13:26:42

by Benoit Cousson

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

Hi Tony,

On 13/09/2013 17:27, Tony Lindgren wrote:
> * Koen Kooi <[email protected]> [130912 11:43]:
>> The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC cape.
>>
>> Signed-off-by: Koen Kooi <[email protected]>
>> ---
>> 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

2013-09-17 13:30:30

by Benoit Cousson

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

Hi Koen,

On 12/09/2013 20:35, Koen Kooi wrote:
> Here are two patches to fix MMC on beaglebone, one fixes card detect on BBW,
> the other adds the eMMC entry for BBB and its fixed regulator. After that mmc1
> gets a nice speed boost by moving to 4-bit mode and LED triggers get assigned.
>
> This series depends on:
>
> http://comments.gmane.org/gmane.linux.kernel.stable/63648
> https://lkml.org/lkml/2013/9/10/454
> http://comments.gmane.org/gmane.linux.kernel.mmc/22381

I've just applied it on top of Joel's one.

Thanks,
Benoit

>
> Or as git-cherry would put it:
>
> [koen@rrMBP patches]$ git cherry -v
> + 564fc88cc64387af5312e2abd8019c75a13223b2 ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
> + e5133ed98acc1c3e01c370b851041a8ca629cd15 ARM: EDMA: Fix clearing of unused list for DT DMA resources
> + ac71bb58605d3bdd5d14af770a639fb3ff11c612 ARM: dts: add AM33XX EDMA support
> + 31a8270a299c57c7de7510f44d9dc36fd1787243 ARM: dts: add AM33XX SPI DMA support
> + 4fa0a4cb9ea17da30cf43085c03e5ec1361a4fc2 ARM: dts: add AM33XX MMC support and documentation
> + 0553f50bd45f019a0cc11050e2f20bddbf07dfe0 ARM: dts: am335x-bone: add CD for mmc1
> + 7d64f765630a2921a63b82f93f9959a6de37f29d ARM: dts: am335x-boneblack: add eMMC DT entry
> + dc96cd4003e2668d8ec7e7fe19e402e97a198f81 ARM: dts: am335x-bone-common: switch mmc1 to 4-bit mode
> + f8262e78830cda56c936724549ba9f04dddde312 ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers
>
> Also available as a git branch at https://github.com/koenkooi/linux/commits/mainline
>
> Changes since v3:
> Addressed Nishants nitpicks for commit messages
> Addressed Russ' comments about moving LDO3 for mmc1 out of the common dtsi
>
> Changes since v2:
> Missing pinmux entries for eMMC added
>
> Changes since v1:
> Removed ti,non-removable entry from eMMC node, see http://marc.info/?l=linux-arm-kernel&m=137889435710552&w=2
> ---
>
> Alexander Holler (1):
> arm: bone: dts: add CD for mmc1
>
> Koen Kooi (3):
> am335x-boneblack: add eMMC DT entry
> ARM: am335x-bone-common: switch mmc1 to 4-bit mode
> ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers
>
> arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
> arch/arm/boot/dts/am335x-bone.dts | 1 -
> arch/arm/boot/dts/am335x-boneblack.dts | 14 +++++++++++
> 3 files changed, 53 insertions(+), 1 deletion(-)
>

2013-09-28 03:13:58

by Jason Kridner

[permalink] [raw]
Subject: Re: [PATCH v4 1/4] ARM: dts: am335x-bone: add CD for mmc1

On Thu, Sep 12, 2013 at 2:35 PM, Koen Kooi <[email protected]> wrote:
> From: Alexander Holler <[email protected]>
>
> This enables the use of MMC cards even when no card was inserted at boot.
>
> Signed-off-by: Alexander Holler <[email protected]>
> Signed-off-by: Koen Kooi <[email protected]>

Acked-by: Jason Kridner <[email protected]>

> ---
> arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++
> arch/arm/boot/dts/am335x-bone.dts | 1 -
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index 2f66ded..0d95d54 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -107,6 +107,12 @@
> 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
> >;
> };
> +
> + mmc1_pins: pinmux_mmc1_pins {
> + pinctrl-single,pins = <
> + 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
> + >;
> + };
> };
>
> ocp {
> @@ -260,3 +266,11 @@
> pinctrl-0 = <&davinci_mdio_default>;
> pinctrl-1 = <&davinci_mdio_sleep>;
> };
> +
> +&mmc1 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc1_pins>;
> + cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
> + cd-inverted;
> +};
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index d5f43fe..0d63348 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -17,6 +17,5 @@
> };
>
> &mmc1 {
> - status = "okay";
> vmmc-supply = <&ldo3_reg>;
> };
> --
> 1.8.2.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

2013-10-25 09:04:52

by Richard Cochran

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

On Tue, Sep 17, 2013 at 03:30:23PM +0200, Benoit Cousson wrote:
>
> I've just applied it on top of Joel's one.

Benoit,

Can you tell me where to find your git tree so that I can follow these
patches' progress?

Thanks,
Richard

2013-10-25 09:11:37

by Nishanth Menon

[permalink] [raw]
Subject: Re: [PATCH v4 0/2] ARM: dts: Beaglebone MMC fixes

On 10/25/2013 04:04 AM, Richard Cochran wrote:
> On Tue, Sep 17, 2013 at 03:30:23PM +0200, Benoit Cousson wrote:
>>
>> I've just applied it on top of Joel's one.
>
> Benoit,
>
> Can you tell me where to find your git tree so that I can follow these
> patches' progress?
>

https://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.13/dts


--
Regards,
Nishanth Menon