* [PATCH 1/7] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
@ 2017-06-01 14:33 ` Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 2/7] ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1 Kishon Vijay Abraham I
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:33 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Russell King, linux-omap, devicetree, linux-arm-kernel,
linux-kernel, linux-mmc, kishon, Ravikumar Kattekola
On dra72/dra71 evms, mmc2 vdd/ios are connected to a common 1.8V supply
not 3.3V. Also the regulator that supplies 1.8V is different on dra71-evm
so move the supply property from common dtsi to evm specific dts files.
Fixes: a4240d3af677 ("ARM: dts: Add support for dra72-evm rev C (SR2.0)")
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra71-evm.dts | 14 ++++++++++++++
arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
arch/arm/boot/dts/dra72-evm-revc.dts | 14 ++++++++++++++
arch/arm/boot/dts/dra72-evm.dts | 14 ++++++++++++++
4 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index 4d57a55473af..c7a56b6263a6 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -32,6 +32,16 @@
3000000 0x1>;
};
+ evm_1v8_sw: fixedregulator-evm_1v8 {
+ compatible = "regulator-fixed";
+ regulator-name = "evm_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ vin-supply = <&lp8732_buck0_reg>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
poweroff: gpio-poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
@@ -165,6 +175,10 @@
vmmc_aux-supply = <&vpo_sd_1v8_3v3>;
};
+&mmc2 {
+ vmmc-supply = <&evm_1v8_sw>;
+};
+
&mac {
mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>,
<&pcf_hdmi 9 GPIO_ACTIVE_LOW>, /* P11 */
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index ad24544adf0f..d97370217eff 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -418,8 +418,6 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>;
-
- vmmc-supply = <&evm_3v3_sw>;
bus-width = <8>;
ti,non-removable;
max-frequency = <192000000>;
diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts
index 3ecac56bf504..47dcd527ec58 100644
--- a/arch/arm/boot/dts/dra72-evm-revc.dts
+++ b/arch/arm/boot/dts/dra72-evm-revc.dts
@@ -15,6 +15,16 @@
device_type = "memory";
reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
};
+
+ evm_1v8_sw: fixedregulator-evm_1v8 {
+ compatible = "regulator-fixed";
+ regulator-name = "evm_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ vin-supply = <&smps4_reg>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
};
&i2c1 {
@@ -82,3 +92,7 @@
interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
};
};
+
+&mmc2 {
+ vmmc-supply = <&evm_1v8_sw>;
+};
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index cd9c4ff12654..adbcc570eba9 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -13,6 +13,16 @@
device_type = "memory";
reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
};
+
+ evm_1v8_sw: fixedregulator-evm_1v8 {
+ compatible = "regulator-fixed";
+ regulator-name = "evm_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ vin-supply = <&smps4_reg>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
};
&i2c1 {
@@ -43,3 +53,7 @@
phy_id = <&davinci_mdio>, <3>;
phy-mode = "rgmii";
};
+
+&mmc2 {
+ vmmc-supply = <&evm_1v8_sw>;
+};
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/7] ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 1/7] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 Kishon Vijay Abraham I
@ 2017-06-01 14:33 ` Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 3/7] ARM: dts: dra72-evm-revc: " Kishon Vijay Abraham I
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:33 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Russell King, linux-omap, devicetree, linux-arm-kernel,
linux-kernel, linux-mmc, kishon
Add vmmc_aux-supply property to mmc1 dt node and populate
it with ldo1_reg to reflect ldo1_out is connected to mmc1 IO lines.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra72-evm.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index adbcc570eba9..b25e7c67badf 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -54,6 +54,10 @@
phy-mode = "rgmii";
};
+&mmc1 {
+ vmmc_aux-supply = <&ldo1_reg>;
+};
+
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/7] ARM: dts: dra72-evm-revc: Add vmmc_aux supply to mmc1
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 1/7] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 2/7] ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1 Kishon Vijay Abraham I
@ 2017-06-01 14:33 ` Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 4/7] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Kishon Vijay Abraham I
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:33 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: devicetree, kishon, linux-mmc, Russell King, linux-kernel,
linux-omap, linux-arm-kernel
Add vmmc_aux-supply property to mmc1 dt node and populate
it with ldo1_reg to reflect ldo1_out is connected to mmc1 IO lines.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra72-evm-revc.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts
index 47dcd527ec58..40a399735533 100644
--- a/arch/arm/boot/dts/dra72-evm-revc.dts
+++ b/arch/arm/boot/dts/dra72-evm-revc.dts
@@ -93,6 +93,10 @@
};
};
+&mmc1 {
+ vmmc_aux-supply = <&ldo1_reg>;
+};
+
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/7] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
` (2 preceding siblings ...)
2017-06-01 14:33 ` [PATCH 3/7] ARM: dts: dra72-evm-revc: " Kishon Vijay Abraham I
@ 2017-06-01 14:33 ` Kishon Vijay Abraham I
2017-06-01 14:33 ` [PATCH 5/7] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2 Kishon Vijay Abraham I
` (3 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:33 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Russell King, linux-omap, devicetree, linux-arm-kernel,
linux-kernel, linux-mmc, kishon
The dt binding documentation of omap-hsmmc recommends using
"vmmc_aux" for IO supply lines. However
commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support
for rev B1") added it as "vmmc-aux". Fix it here.
Fixes: commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add
support for rev B1")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
index 39a92aff0a0d..6ae94ab52b7b 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
@@ -20,7 +20,7 @@
&mmc1 {
vmmc-supply = <&vdd_3v3>;
- vmmc-aux-supply = <&ldo1_reg>;
+ vmmc_aux-supply = <&ldo1_reg>;
};
/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/7] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
` (3 preceding siblings ...)
2017-06-01 14:33 ` [PATCH 4/7] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Kishon Vijay Abraham I
@ 2017-06-01 14:33 ` Kishon Vijay Abraham I
[not found] ` <20170601143401.16852-1-kishon-l0cyMroinI0@public.gmane.org>
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:33 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Russell King, linux-omap, devicetree, linux-arm-kernel,
linux-kernel, linux-mmc, kishon, Ravikumar Kattekola
From: Ravikumar Kattekola <rk@ti.com>
On DRA75x EVM, MMC2 vdd/ios are connected to a common supply fixed at 1.8V
not 3.3V
Fixes: 6cf02dbb4b71 ("ARM: dts: dra7-evm: Add mmc2 node for eMMC support")
Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7-evm.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 31a9e061ddd0..e5d7e7f5f645 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -25,6 +25,14 @@
stdout-path = &uart1;
};
+ evm_1v8_sw: fixedregulator-evm_1v8 {
+ compatible = "regulator-fixed";
+ regulator-name = "evm_1v8";
+ vin-supply = <&smps9_reg>;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
evm_3v3_sd: fixedregulator-sd {
compatible = "regulator-fixed";
regulator-name = "evm_3v3_sd";
@@ -451,7 +459,7 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>;
- vmmc-supply = <&evm_3v3_sw>;
+ vmmc-supply = <&evm_1v8_sw>;
bus-width = <8>;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread[parent not found: <20170601143401.16852-1-kishon-l0cyMroinI0@public.gmane.org>]
* [PATCH 6/7] ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
[not found] ` <20170601143401.16852-1-kishon-l0cyMroinI0@public.gmane.org>
@ 2017-06-01 14:34 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:34 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar-l0cyMroinI0
Cc: Russell King, linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mmc-u79uwXL29TY76Z2rM5mHXA, kishon-l0cyMroinI0
Add "max-frequency" property to MMC dt nodes and set the
maximum frequency to 192MHz for MMC1/MMC2, 64MHz for MMC3
and 192MHz for MMC4. pdata quirks must be utilized to
detect presence of rev 1.1/1.0 of silicon and adjust
maximum frequencies as per restrictions documented in i843.
Signed-off-by: Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org>
Signed-off-by: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>
---
arch/arm/boot/dts/dra7.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e7144662af45..c09a91e77f53 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1037,6 +1037,7 @@
dma-names = "tx", "rx";
status = "disabled";
pbias-supply = <&pbias_mmc_reg>;
+ max-frequency = <192000000>;
};
mmc2: mmc@480b4000 {
@@ -1048,6 +1049,7 @@
dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
dma-names = "tx", "rx";
status = "disabled";
+ max-frequency = <192000000>;
};
mmc3: mmc@480ad000 {
@@ -1059,6 +1061,8 @@
dmas = <&sdma_xbar 77>, <&sdma_xbar 78>;
dma-names = "tx", "rx";
status = "disabled";
+ /* Errata i887 limits max-frequency of MMC3 to 64 MHz */
+ max-frequency = <64000000>;
};
mmc4: mmc@480d1000 {
@@ -1070,6 +1074,7 @@
dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;
dma-names = "tx", "rx";
status = "disabled";
+ max-frequency = <192000000>;
};
mmu0_dsp1: mmu@40d01000 {
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/7] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
` (5 preceding siblings ...)
[not found] ` <20170601143401.16852-1-kishon-l0cyMroinI0@public.gmane.org>
@ 2017-06-01 14:34 ` Kishon Vijay Abraham I
2017-06-02 10:50 ` [PATCH 0/7] dra7: Fixes for MMC devicetree node Ulf Hansson
7 siblings, 0 replies; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-01 14:34 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Russell King, linux-omap, devicetree, linux-arm-kernel,
linux-kernel, linux-mmc, kishon
From: Sekhar Nori <nsekhar@ti.com>
DRA74x EVM Rev H EVM comes with revision 2.0 silicon.
However, earlier versions of EVM can come with either
revision 1.1 or revision 1.0 of silicon.
The device-tree file is written to support rev 2.0 of
silicon. pdata quirks are used to then override the
settings needed for PG 1.1 silicon.
PG 1.1 silicon has limitations w.r.t frequencies at
which MMC1/2/3 can operate as well as different IOdelay
numbers.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++++++++++++++++++
include/linux/platform_data/hsmmc-omap.h | 3 +++
2 files changed, 34 insertions(+)
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 9700a8ef0f16..6b433fce65a5 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -434,6 +434,26 @@ static void __init omap5_uevm_legacy_init(void)
}
#endif
+#ifdef CONFIG_SOC_DRA7XX
+static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc1;
+static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc2;
+static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc3;
+
+static void __init dra7x_evm_mmc_quirk(void)
+{
+ if (omap_rev() == DRA752_REV_ES1_1 || omap_rev() == DRA752_REV_ES1_0) {
+ dra7_hsmmc_data_mmc1.version = "rev11";
+ dra7_hsmmc_data_mmc1.max_freq = 96000000;
+
+ dra7_hsmmc_data_mmc2.version = "rev11";
+ dra7_hsmmc_data_mmc2.max_freq = 48000000;
+
+ dra7_hsmmc_data_mmc3.version = "rev11";
+ dra7_hsmmc_data_mmc3.max_freq = 48000000;
+ }
+}
+#endif
+
static struct pcs_pdata pcs_pdata;
void omap_pcs_legacy_init(int irq, void (*rearm)(void))
@@ -561,6 +581,14 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("ti,omap4-iommu", 0x55082000, "55082000.mmu",
&omap4_iommu_pdata),
#endif
+#ifdef CONFIG_SOC_DRA7XX
+ OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x4809c000, "4809c000.mmc",
+ &dra7_hsmmc_data_mmc1),
+ OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x480b4000, "480b4000.mmc",
+ &dra7_hsmmc_data_mmc2),
+ OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x480ad000, "480ad000.mmc",
+ &dra7_hsmmc_data_mmc3),
+#endif
/* Common auxdata */
OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata),
{ /* sentinel */ },
@@ -590,6 +618,9 @@ static struct pdata_init pdata_quirks[] __initdata = {
#ifdef CONFIG_SOC_OMAP5
{ "ti,omap5-uevm", omap5_uevm_legacy_init, },
#endif
+#ifdef CONFIG_SOC_DRA7XX
+ { "ti,dra7-evm", dra7x_evm_mmc_quirk, },
+#endif
{ /* sentinel */ },
};
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index 8e981be2e2c2..67bded22eae4 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -70,6 +70,9 @@ struct omap_hsmmc_platform_data {
#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)
unsigned features;
+ /* string specifying a particular variant of hardware */
+ char *version;
+
int gpio_cd; /* gpio (card detect) */
int gpio_cod; /* gpio (cover detect) */
int gpio_wp; /* gpio (write protect) */
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 0/7] dra7: Fixes for MMC devicetree node
2017-06-01 14:33 [PATCH 0/7] dra7: Fixes for MMC devicetree node Kishon Vijay Abraham I
` (6 preceding siblings ...)
2017-06-01 14:34 ` [PATCH 7/7] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM Kishon Vijay Abraham I
@ 2017-06-02 10:50 ` Ulf Hansson
2017-06-06 4:17 ` Kishon Vijay Abraham I
7 siblings, 1 reply; 13+ messages in thread
From: Ulf Hansson @ 2017-06-02 10:50 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: Tony Lindgren, Rob Herring, Sekhar Nori, Russell King, linux-omap,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org
On 1 June 2017 at 16:33, Kishon Vijay Abraham I <kishon@ti.com> wrote:
> There are the set of fixes that were sent initially as part
> of [1].
>
> These are mostly fixes w.r.t populating regulators in
> mmc dt node. It was working before because the regulators
> connecting to the IO lines are always on regulators. This will
> break once we add UHS support where voltage has to be changed
> dynamically.
>
> Performed enumeration testing on dra72-evm-revc, dra72-evm,
> dra7-evm, am572x-evm, am571x-idk and am572x-idk.
>
> This is a preparation series for adding UHS mode support in
> the above mentioned platforms.
>
> [1] -> https://lkml.org/lkml/2017/5/19/196
>
> Kishon Vijay Abraham I (5):
> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
> ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1
> ARM: dts: dra72-evm-revc: Add vmmc_aux supply to mmc1
> ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO
> lines
> ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
>
> Ravikumar Kattekola (1):
> ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2
>
> Sekhar Nori (1):
> ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM
>
> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
> arch/arm/boot/dts/dra7-evm.dts | 10 ++++++++-
> arch/arm/boot/dts/dra7.dtsi | 5 +++++
> arch/arm/boot/dts/dra71-evm.dts | 14 ++++++++++++
> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
> arch/arm/boot/dts/dra72-evm-revc.dts | 18 ++++++++++++++++
> arch/arm/boot/dts/dra72-evm.dts | 18 ++++++++++++++++
> arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++++++++++++++
> include/linux/platform_data/hsmmc-omap.h | 3 +++
> 9 files changed, 99 insertions(+), 4 deletions(-)
This series add a bunch of new vmmc_aux regulators for the mmc
controller nodes. I would rather see that omap_hsmmc also converts to
use the generic mmc binding for this regulator, which is "vqmmc".
To accomplish that, omap_hsmmc needs to convert to use
mmc_regulator_get_supply(). If the "vqmmc" regulator isn't found, it
should fallback to try the "vmmc_aux".
Can you do that?
Kind regards
Uffe
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 0/7] dra7: Fixes for MMC devicetree node
2017-06-02 10:50 ` [PATCH 0/7] dra7: Fixes for MMC devicetree node Ulf Hansson
@ 2017-06-06 4:17 ` Kishon Vijay Abraham I
2017-06-06 10:36 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-06 4:17 UTC (permalink / raw)
To: Ulf Hansson
Cc: Tony Lindgren, Rob Herring, Sekhar Nori, Russell King, linux-omap,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org
Hi,
On Friday 02 June 2017 04:20 PM, Ulf Hansson wrote:
> On 1 June 2017 at 16:33, Kishon Vijay Abraham I <kishon@ti.com> wrote:
>> There are the set of fixes that were sent initially as part
>> of [1].
>>
>> These are mostly fixes w.r.t populating regulators in
>> mmc dt node. It was working before because the regulators
>> connecting to the IO lines are always on regulators. This will
>> break once we add UHS support where voltage has to be changed
>> dynamically.
>>
>> Performed enumeration testing on dra72-evm-revc, dra72-evm,
>> dra7-evm, am572x-evm, am571x-idk and am572x-idk.
>>
>> This is a preparation series for adding UHS mode support in
>> the above mentioned platforms.
>>
>> [1] -> https://lkml.org/lkml/2017/5/19/196
>>
>> Kishon Vijay Abraham I (5):
>> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
>> ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1
>> ARM: dts: dra72-evm-revc: Add vmmc_aux supply to mmc1
>> ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO
>> lines
>> ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
>>
>> Ravikumar Kattekola (1):
>> ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2
>>
>> Sekhar Nori (1):
>> ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM
>>
>> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
>> arch/arm/boot/dts/dra7-evm.dts | 10 ++++++++-
>> arch/arm/boot/dts/dra7.dtsi | 5 +++++
>> arch/arm/boot/dts/dra71-evm.dts | 14 ++++++++++++
>> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
>> arch/arm/boot/dts/dra72-evm-revc.dts | 18 ++++++++++++++++
>> arch/arm/boot/dts/dra72-evm.dts | 18 ++++++++++++++++
>> arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++++++++++++++
>> include/linux/platform_data/hsmmc-omap.h | 3 +++
>> 9 files changed, 99 insertions(+), 4 deletions(-)
>
> This series add a bunch of new vmmc_aux regulators for the mmc
> controller nodes. I would rather see that omap_hsmmc also converts to
> use the generic mmc binding for this regulator, which is "vqmmc".
>
> To accomplish that, omap_hsmmc needs to convert to use
> mmc_regulator_get_supply(). If the "vqmmc" regulator isn't found, it
> should fallback to try the "vmmc_aux".
>
> Can you do that?
sure, I'll prepare that change.
Thanks
Kishon
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/7] dra7: Fixes for MMC devicetree node
2017-06-06 4:17 ` Kishon Vijay Abraham I
@ 2017-06-06 10:36 ` Kishon Vijay Abraham I
[not found] ` <1d15c9e9-f257-fd97-a9a2-055ee90d7e84-l0cyMroinI0@public.gmane.org>
0 siblings, 1 reply; 13+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-06 10:36 UTC (permalink / raw)
To: Tony Lindgren
Cc: devicetree@vger.kernel.org, Ulf Hansson,
linux-mmc@vger.kernel.org, Sekhar Nori, Russell King,
linux-kernel@vger.kernel.org, Rob Herring, linux-omap,
linux-arm-kernel@lists.infradead.org
Hi Tony,
On Tuesday 06 June 2017 09:47 AM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Friday 02 June 2017 04:20 PM, Ulf Hansson wrote:
>> On 1 June 2017 at 16:33, Kishon Vijay Abraham I <kishon@ti.com> wrote:
>>> There are the set of fixes that were sent initially as part
>>> of [1].
>>>
>>> These are mostly fixes w.r.t populating regulators in
>>> mmc dt node. It was working before because the regulators
>>> connecting to the IO lines are always on regulators. This will
>>> break once we add UHS support where voltage has to be changed
>>> dynamically.
>>>
>>> Performed enumeration testing on dra72-evm-revc, dra72-evm,
>>> dra7-evm, am572x-evm, am571x-idk and am572x-idk.
>>>
>>> This is a preparation series for adding UHS mode support in
>>> the above mentioned platforms.
>>>
>>> [1] -> https://lkml.org/lkml/2017/5/19/196
>>>
>>> Kishon Vijay Abraham I (5):
>>> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
>>> ARM: dts: dra72-evm: Add vmmc_aux supply to mmc1
>>> ARM: dts: dra72-evm-revc: Add vmmc_aux supply to mmc1
>>> ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO
>>> lines
>>> ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
>>>
>>> Ravikumar Kattekola (1):
>>> ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2
>>>
>>> Sekhar Nori (1):
>>> ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM
>>>
>>> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
>>> arch/arm/boot/dts/dra7-evm.dts | 10 ++++++++-
>>> arch/arm/boot/dts/dra7.dtsi | 5 +++++
>>> arch/arm/boot/dts/dra71-evm.dts | 14 ++++++++++++
>>> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
>>> arch/arm/boot/dts/dra72-evm-revc.dts | 18 ++++++++++++++++
>>> arch/arm/boot/dts/dra72-evm.dts | 18 ++++++++++++++++
>>> arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++++++++++++++
>>> include/linux/platform_data/hsmmc-omap.h | 3 +++
>>> 9 files changed, 99 insertions(+), 4 deletions(-)
>>
>> This series add a bunch of new vmmc_aux regulators for the mmc
>> controller nodes. I would rather see that omap_hsmmc also converts to
>> use the generic mmc binding for this regulator, which is "vqmmc".
>>
>> To accomplish that, omap_hsmmc needs to convert to use
>> mmc_regulator_get_supply(). If the "vqmmc" regulator isn't found, it
>> should fallback to try the "vmmc_aux".
>>
>> Can you do that?
>
> sure, I'll prepare that change.
omap3-overo-base.dtsi has the following dt node for mmc.
/* optional on board WiFi */
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&w3cbw003c_npoweron>;
vqmmc-supply = <&w3cbw003c_bt_nreset>;
vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
bus-width = <4>;
cap-sdio-irq;
non-removable;
};
It has both "vqmmc-supply" and "vmmc_aux-supply". However omap-hsmmc driver has
never parsed vqmmc so far. So I'd assume bt was never functional and it's used
only for wifi.
So for the change suggested by Ulf, Can I do something like below, so that we
can keep wifi functional (ignoring bt since that was never functional)?
- vqmmc-supply = <&w3cbw003c_bt_nreset>;
- vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
+ vqmmc-supply = <&w3cbw003c_wifi_nreset>;
Thanks
Kishon
^ permalink raw reply [flat|nested] 13+ messages in thread