Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
Now that all dependent DMA patches and fixes are in linux next or mainline, except
for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
and this patch series enables it. These are originally Matt Porter's patches with
changes to make it work with recent kernels, addition of irq, memory resources and
enable other extra properties.
These patches should cleanly apply on master branch after Koen's patch [2] for basic
BBB DT support is applied.
MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
for BBB is intentionally not added due to custom fixes and other patches that are
in Koen's tree and which will be separately submitted by him.
[1] http://marc.info/?l=linux-omap&m=137883926226451&w=2
[2] http://comments.gmane.org/gmane.linux.kernel.stable/63648
Matt Porter (3):
ARM: dts: add AM33XX EDMA support
ARM: dts: add AM33XX SPI DMA support
ARM: dts: add AM33XX MMC support and documentation
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 +++++++++-
arch/arm/boot/dts/am335x-bone.dts | 11 ++++
arch/arm/boot/dts/am335x-evm.dts | 7 +++
arch/arm/boot/dts/am335x-evmsk.dts | 7 +++
arch/arm/boot/dts/am33xx.dtsi | 60 ++++++++++++++++++++++
5 files changed, 110 insertions(+), 1 deletion(-)
--
1.8.1.2
From: Matt Porter <[email protected]>
Adds AM33XX EDMA support to the am33xx.dtsi as documented in
Documentation/devicetree/bindings/dma/ti-edma.txt
[Joel Fernandes <[email protected]>]
Drop DT entries that are non-hardware-description as discussed in [1]
[1] https://patchwork.kernel.org/patch/2226761/
Signed-off-by: Matt Porter <[email protected]>
Signed-off-by: Joel A Fernandes <[email protected]>
---
arch/arm/boot/dts/am33xx.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index f9c5da9..19a1c1d 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -100,6 +100,18 @@
reg = <0x48200000 0x1000>;
};
+ edma: edma@49000000 {
+ compatible = "ti,edma3";
+ ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
+ reg = <0x49000000 0x10000>,
+ <0x44e10f90 0x10>;
+ interrupts = <12 13 14>;
+ #dma-cells = <1>;
+ dma-channels = <64>;
+ ti,edma-regions = <4>;
+ ti,edma-slots = <256>;
+ };
+
gpio0: gpio@44e07000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio1";
--
1.8.1.2
From: Matt Porter <[email protected]>
Adds DMA resources to the AM33XX SPI nodes.
Signed-off-by: Matt Porter <[email protected]>
Signed-off-by: Joel A Fernandes <[email protected]>
---
arch/arm/boot/dts/am33xx.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 19a1c1d..9ce85e5 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -335,6 +335,11 @@
interrupts = <65>;
ti,spi-num-cs = <2>;
ti,hwmods = "spi0";
+ dmas = <&edma 16
+ &edma 17
+ &edma 18
+ &edma 19>;
+ dma-names = "tx0", "rx0", "tx1", "rx1";
status = "disabled";
};
@@ -346,6 +351,11 @@
interrupts = <125>;
ti,spi-num-cs = <2>;
ti,hwmods = "spi1";
+ dmas = <&edma 42
+ &edma 43
+ &edma 44
+ &edma 45>;
+ dma-names = "tx0", "rx0", "tx1", "rx1";
status = "disabled";
};
--
1.8.1.2
From: Matt Porter <[email protected]>
Adds AM33XX MMC support for am335x-bone, am335x-evm and am335x-evmsk boards.
Also added is the DMA binding definitions based on the generic DMA request
binding.
Additional changes made to DTS:
* Interrupt, reg and compatible properties added
* ti,needs-special-hs-handling added
Signed-off-by: Matt Porter <[email protected]>
Acked-by: Tony Lindgren <[email protected]>
Signed-off-by: Joel Fernandes <[email protected]>
---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 ++++++++++++++-
arch/arm/boot/dts/am335x-bone.dts | 11 +++++++
arch/arm/boot/dts/am335x-evm.dts | 7 ++++
arch/arm/boot/dts/am335x-evmsk.dts | 7 ++++
arch/arm/boot/dts/am33xx.dtsi | 38 ++++++++++++++++++++++
5 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index ed271fc..8c8908a 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -20,8 +20,29 @@ ti,dual-volt: boolean, supports dual voltage cards
ti,non-removable: non-removable slot (like eMMC)
ti,needs-special-reset: Requires a special softreset sequence
ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
+dmas: List of DMA specifiers with the controller specific format
+as described in the generic DMA client binding. A tx and rx
+specifier is required.
+dma-names: List of DMA request names. These strings correspond
+1:1 with the DMA specifiers listed in dmas. The string naming is
+to be "rx" and "tx" for RX and TX DMA requests, respectively.
+
+Examples:
+
+[hwmod populated DMA resources]
+
+ mmc1: mmc@0x4809c000 {
+ compatible = "ti,omap4-hsmmc";
+ reg = <0x4809c000 0x400>;
+ ti,hwmods = "mmc1";
+ ti,dual-volt;
+ bus-width = <4>;
+ vmmc-supply = <&vmmc>; /* phandle to regulator node */
+ ti,non-removable;
+ };
+
+[generic DMA request binding]
-Example:
mmc1: mmc@0x4809c000 {
compatible = "ti,omap4-hsmmc";
reg = <0x4809c000 0x400>;
@@ -30,4 +51,7 @@ Example:
bus-width = <4>;
vmmc-supply = <&vmmc>; /* phandle to regulator node */
ti,non-removable;
+ dmas = <&edma 24
+ &edma 25>;
+ dma-names = "tx", "rx";
};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 7993c48..d5f43fe 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -9,3 +9,14 @@
#include "am33xx.dtsi"
#include "am335x-bone-common.dtsi"
+
+&ldo3_reg {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+};
+
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&ldo3_reg>;
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index e8ec875..bc4a69d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -477,6 +477,8 @@
};
vmmc_reg: regulator@12 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
@@ -517,3 +519,8 @@
ti,adc-channels = <4 5 6 7>;
};
};
+
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&vmmc_reg>;
+};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 4f339fa..55fd194 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -393,6 +393,8 @@
};
vmmc_reg: regulator@12 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
@@ -419,3 +421,8 @@
phy_id = <&davinci_mdio>, <1>;
phy-mode = "rgmii-txid";
};
+
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&vmmc_reg>;
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 9ce85e5..0a82fca 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -240,6 +240,44 @@
status = "disabled";
};
+ mmc1: mmc@48060000 {
+ compatible = "ti,omap4-hsmmc";
+ ti,hwmods = "mmc1";
+ ti,dual-volt;
+ ti,needs-special-reset;
+ ti,needs-special-hs-handling;
+ dmas = <&edma 24
+ &edma 25>;
+ dma-names = "tx", "rx";
+ interrupts = <64>;
+ interrupt-parent = <&intc>;
+ reg = <0x48060000 0x1000>;
+ status = "disabled";
+ };
+
+ mmc2: mmc@481d8000 {
+ compatible = "ti,omap4-hsmmc";
+ ti,hwmods = "mmc2";
+ ti,needs-special-reset;
+ dmas = <&edma 2
+ &edma 3>;
+ dma-names = "tx", "rx";
+ interrupts = <28>;
+ interrupt-parent = <&intc>;
+ reg = <0x481d8000 0x1000>;
+ status = "disabled";
+ };
+
+ mmc3: mmc@47810000 {
+ compatible = "ti,omap4-hsmmc";
+ ti,hwmods = "mmc3";
+ ti,needs-special-reset;
+ interrupts = <29>;
+ interrupt-parent = <&intc>;
+ reg = <0x47810000 0x1000>;
+ status = "disabled";
+ };
+
wdt2: wdt@44e35000 {
compatible = "ti,omap3-wdt";
ti,hwmods = "wd_timer2";
--
1.8.1.2
Op 10 sep. 2013, om 21:24 heeft Joel Fernandes <[email protected]> het volgende geschreven:
> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>
> Now that all dependent DMA patches and fixes are in linux next or mainline, except
> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
> and this patch series enables it. These are originally Matt Porter's patches with
> changes to make it work with recent kernels, addition of irq, memory resources and
> enable other extra properties.
>
> These patches should cleanly apply on master branch after Koen's patch [2] for basic
> BBB DT support is applied.
>
> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
> for BBB is intentionally not added due to custom fixes and other patches that are
> in Koen's tree and which will be separately submitted by him.
Correct, but your patches for MMC support on BBW are missing the card detect entries to make it hotplug work.
Hi Joel,
Thanks for the repost.
I'll applied that one now.
Regards,
Benoit
On 10/09/2013 21:24, Joel Fernandes wrote:
> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>
> Now that all dependent DMA patches and fixes are in linux next or mainline, except
> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
> and this patch series enables it. These are originally Matt Porter's patches with
> changes to make it work with recent kernels, addition of irq, memory resources and
> enable other extra properties.
>
> These patches should cleanly apply on master branch after Koen's patch [2] for basic
> BBB DT support is applied.
>
> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
> for BBB is intentionally not added due to custom fixes and other patches that are
> in Koen's tree and which will be separately submitted by him.
>
> [1] http://marc.info/?l=linux-omap&m=137883926226451&w=2
> [2] http://comments.gmane.org/gmane.linux.kernel.stable/63648
>
> Matt Porter (3):
> ARM: dts: add AM33XX EDMA support
> ARM: dts: add AM33XX SPI DMA support
> ARM: dts: add AM33XX MMC support and documentation
>
> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 +++++++++-
> arch/arm/boot/dts/am335x-bone.dts | 11 ++++
> arch/arm/boot/dts/am335x-evm.dts | 7 +++
> arch/arm/boot/dts/am335x-evmsk.dts | 7 +++
> arch/arm/boot/dts/am33xx.dtsi | 60 ++++++++++++++++++++++
> 5 files changed, 110 insertions(+), 1 deletion(-)
>
On 09/10/2013 02:39 PM, Koen Kooi wrote:
>
> Op 10 sep. 2013, om 21:24 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>
>> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>>
>> Now that all dependent DMA patches and fixes are in linux next or mainline, except
>> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
>> and this patch series enables it. These are originally Matt Porter's patches with
>> changes to make it work with recent kernels, addition of irq, memory resources and
>> enable other extra properties.
>>
>> These patches should cleanly apply on master branch after Koen's patch [2] for basic
>> BBB DT support is applied.
>>
>> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
>> for BBB is intentionally not added due to custom fixes and other patches that are
>> in Koen's tree and which will be separately submitted by him.
>
> Correct, but your patches for MMC support on BBW are missing the card detect entries to make it hotplug work.
I thought it was determined that this would be submitted by you separately after
rebasing as we discussed [1] and [2].
[1] https://lkml.org/lkml/2013/9/6/183
[2] http://marc.info/?l=linux-omap&m=137879246709612&w=2
Regards,
-Joel
Op 10 sep. 2013, om 22:14 heeft Joel Fernandes <[email protected]> het volgende geschreven:
> On 09/10/2013 02:39 PM, Koen Kooi wrote:
>>
>> Op 10 sep. 2013, om 21:24 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>>
>>> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>>>
>>> Now that all dependent DMA patches and fixes are in linux next or mainline, except
>>> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
>>> and this patch series enables it. These are originally Matt Porter's patches with
>>> changes to make it work with recent kernels, addition of irq, memory resources and
>>> enable other extra properties.
>>>
>>> These patches should cleanly apply on master branch after Koen's patch [2] for basic
>>> BBB DT support is applied.
>>>
>>> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
>>> for BBB is intentionally not added due to custom fixes and other patches that are
>>> in Koen's tree and which will be separately submitted by him.
>>
>> Correct, but your patches for MMC support on BBW are missing the card detect entries to make it hotplug work.
>
> I thought it was determined that this would be submitted by you separately after
> rebasing as we discussed [1] and [2].
I have no problem submitting that, I just think it's weird that the patch you submitted contains a known broken version for BBW.
>
> [1] https://lkml.org/lkml/2013/9/6/183
> [2] http://marc.info/?l=linux-omap&m=137879246709612&w=2
>
>
> Regards,
>
> -Joel
On 09/11/2013 12:18 AM, Koen Kooi wrote:
>
> Op 10 sep. 2013, om 22:14 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>
>> On 09/10/2013 02:39 PM, Koen Kooi wrote:
>>>
>>> Op 10 sep. 2013, om 21:24 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>>>
>>>> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>>>>
>>>> Now that all dependent DMA patches and fixes are in linux next or mainline, except
>>>> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
>>>> and this patch series enables it. These are originally Matt Porter's patches with
>>>> changes to make it work with recent kernels, addition of irq, memory resources and
>>>> enable other extra properties.
>>>>
>>>> These patches should cleanly apply on master branch after Koen's patch [2] for basic
>>>> BBB DT support is applied.
>>>>
>>>> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
>>>> for BBB is intentionally not added due to custom fixes and other patches that are
>>>> in Koen's tree and which will be separately submitted by him.
>>>
>>> Correct, but your patches for MMC support on BBW are missing the card detect entries to make it hotplug work.
>>
>> I thought it was determined that this would be submitted by you separately after
>> rebasing as we discussed [1] and [2].
>
> I have no problem submitting that, I just think it's weird that the patch you submitted contains a known broken version for BBW.
There's nothing "broken" about $subject series. Please don't confuse maintainers
by using wrong words like that. This series is perfectly OK as such to be merged.
Further, I am puzzled by all this noise because card-detect additions were
initially agreed to be posted separately by you along with other custom DTS for
BBW MMC. Its obvious I wouldn't squash patches that we _agreed_ you would send
out- and that are especially additions than any real fixes. Hopefully this makes
it clear, if you need any help please let me know.
Thanks!
-Joel
>>
>> [1] https://lkml.org/lkml/2013/9/6/183
>> [2] http://marc.info/?l=linux-omap&m=137879246709612&w=2
>>
>>
>> Regards,
>>
>> -Joel
>
Op 11 sep. 2013, om 08:00 heeft Joel Fernandes <[email protected]> het volgende geschreven:
> On 09/11/2013 12:18 AM, Koen Kooi wrote:
>>
>> Op 10 sep. 2013, om 22:14 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>>
>>> On 09/10/2013 02:39 PM, Koen Kooi wrote:
>>>>
>>>> Op 10 sep. 2013, om 21:24 heeft Joel Fernandes <[email protected]> het volgende geschreven:
>>>>
>>>>> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>>>>>
>>>>> Now that all dependent DMA patches and fixes are in linux next or mainline, except
>>>>> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
>>>>> and this patch series enables it. These are originally Matt Porter's patches with
>>>>> changes to make it work with recent kernels, addition of irq, memory resources and
>>>>> enable other extra properties.
>>>>>
>>>>> These patches should cleanly apply on master branch after Koen's patch [2] for basic
>>>>> BBB DT support is applied.
>>>>>
>>>>> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
>>>>> for BBB is intentionally not added due to custom fixes and other patches that are
>>>>> in Koen's tree and which will be separately submitted by him.
>>>>
>>>> Correct, but your patches for MMC support on BBW are missing the card detect entries to make it hotplug work.
>>>
>>> I thought it was determined that this would be submitted by you separately after
>>> rebasing as we discussed [1] and [2].
>>
>> I have no problem submitting that, I just think it's weird that the patch you submitted contains a known broken version for BBW.
>
> There's nothing "broken" about $subject series. Please don't confuse maintainers
> by using wrong words like that. This series is perfectly OK as such to be merged.
But plugging in an SD card doesn't work in this series, I'd call that broken.
> Further, I am puzzled by all this noise because card-detect additions were
> initially agreed to be posted separately by you along with other custom DTS for
> BBW MMC.
I agreed to post the mmc fixes needed for BBW and BBB, so I assumed you'd drop all beaglebone entries from your series.
> Its obvious I wouldn't squash patches that we _agreed_ you would send
> out- and that are especially additions than any real fixes. Hopefully this makes
> it clear, if you need any help please let me know.
Right, so now your patch series will add a half-assed DT entry which only works if the uSD card is present at boot. Anyway, fixup series underway already
>
> Thanks!
>
> -Joel
>
>
>>>
>>> [1] https://lkml.org/lkml/2013/9/6/183
>>> [2] http://marc.info/?l=linux-omap&m=137879246709612&w=2
>>>
>>>
>>> Regards,
>>>
>>> -Joel
>>
>
On 10/09/13 20:24, Joel Fernandes wrote:
> Here are last few patches required to add EDMA and MMC/SPI support for AM33xx.
>
> Now that all dependent DMA patches and fixes are in linux next or mainline, except
> for [1] which should go in for 3.12 -rc cycle, it is safe to enable MMC and SPI support
> and this patch series enables it. These are originally Matt Porter's patches with
> changes to make it work with recent kernels, addition of irq, memory resources and
> enable other extra properties.
>
> These patches should cleanly apply on master branch after Koen's patch [2] for basic
> BBB DT support is applied.
>
> MMC support is enabled for: Beaglebone, AM335x EVM and EVM-SK boards. MMC support
> for BBB is intentionally not added due to custom fixes and other patches that are
> in Koen's tree and which will be separately submitted by him.
>
> [1] http://marc.info/?l=linux-omap&m=137883926226451&w=2
> [2] http://comments.gmane.org/gmane.linux.kernel.stable/63648
>
> Matt Porter (3):
> ARM: dts: add AM33XX EDMA support
> ARM: dts: add AM33XX SPI DMA support
> ARM: dts: add AM33XX MMC support and documentation
>
> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 +++++++++-
> arch/arm/boot/dts/am335x-bone.dts | 11 ++++
> arch/arm/boot/dts/am335x-evm.dts | 7 +++
> arch/arm/boot/dts/am335x-evmsk.dts | 7 +++
> arch/arm/boot/dts/am33xx.dtsi | 60 ++++++++++++++++++++++
> 5 files changed, 110 insertions(+), 1 deletion(-)
This is not (quite) working for me on our custom AM335x board.
Everything compiles fine, but I get the following in the boot log:-
[ 1.339805] omap_hsmmc 48060000.mmc: vmmc regulator missing
I can see that the regulator *does* get enabled, but later on in the boot process !!
[ 1.568731] DCDC1: at 1500 mV
[ 1.574454] vdd_mpu: 925 <--> 1325 mV at 1100 mV
[ 1.581754] vdd_core: 925 <--> 1150 mV at 1100 mV
[ 1.589093] LDO1: at 1800 mV
[ 1.594515] LDO2: at 3300 mV
[ 1.599820] LDO3: 1800 <--> 3300 mV at 1800 mV
[ 1.606872] LDO4: at 3300 mV
[ 1.611901] tps65217 0-0024: TPS65217 ID 0xe version 1.2
I can only think this is the cause of the issue.
However ... cards plugged into the sd card slot are seen and are mount-able.
I've attached my board dts and .config if that helps.
Any clues ?
Cheers
Mark J.