* [PATCH v2 1/8] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 2/8] ARM: dts: dra72-evm: Add vqmmc supply to mmc1 Kishon Vijay Abraham I
` (7 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: devicetree, Ulf Hansson, kishon, linux-mmc, Russell King,
linux-kernel, Ravikumar Kattekola, linux-omap, linux-arm-kernel
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] 18+ messages in thread* [PATCH v2 2/8] ARM: dts: dra72-evm: Add vqmmc supply to mmc1
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 1/8] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 3/8] ARM: dts: dra72-evm-revc: " Kishon Vijay Abraham I
` (6 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Ulf Hansson, Russell King, linux-omap, devicetree,
linux-arm-kernel, linux-kernel, linux-mmc, kishon
Add vqmmc-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..99fdb3d8445b 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 {
+ vqmmc-supply = <&ldo1_reg>;
+};
+
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 3/8] ARM: dts: dra72-evm-revc: Add vqmmc supply to mmc1
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 1/8] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 2/8] ARM: dts: dra72-evm: Add vqmmc supply to mmc1 Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 4/8] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Kishon Vijay Abraham I
` (5 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: devicetree, Ulf Hansson, kishon, linux-mmc, Russell King,
linux-kernel, linux-omap, linux-arm-kernel
Add vqmmc-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..5532309971ae 100644
--- a/arch/arm/boot/dts/dra72-evm-revc.dts
+++ b/arch/arm/boot/dts/dra72-evm-revc.dts
@@ -93,6 +93,10 @@
};
};
+&mmc1 {
+ vqmmc-supply = <&ldo1_reg>;
+};
+
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 4/8] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (2 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 3/8] ARM: dts: dra72-evm-revc: " Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 5/8] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2 Kishon Vijay Abraham I
` (4 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: devicetree, Ulf Hansson, kishon, linux-mmc, Russell King,
linux-kernel, linux-omap, linux-arm-kernel
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". Now that anyways it
needs to be fixed, use the generic "vqmmc" binding instead of
the deprecated "vmmc_aux".
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..578398c781b1 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>;
+ vqmmc-supply = <&ldo1_reg>;
};
/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 5/8] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (3 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 4/8] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 6/8] ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes Kishon Vijay Abraham I
` (3 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: devicetree, Ulf Hansson, kishon, linux-mmc, Russell King,
linux-kernel, Ravikumar Kattekola, linux-omap, linux-arm-kernel
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] 18+ messages in thread* [PATCH v2 6/8] ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (4 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 5/8] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2 Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 7/8] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM Kishon Vijay Abraham I
` (2 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Ulf Hansson, Russell King, linux-omap, devicetree,
linux-arm-kernel, linux-kernel, linux-mmc, kishon
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@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
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
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 7/8] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (5 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 6/8] ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-07 9:37 ` [PATCH v2 8/8] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" Kishon Vijay Abraham I
2017-06-08 7:20 ` [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Ulf Hansson
8 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Ulf Hansson, 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] 18+ messages in thread* [PATCH v2 8/8] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (6 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 7/8] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM Kishon Vijay Abraham I
@ 2017-06-07 9:37 ` Kishon Vijay Abraham I
2017-06-09 12:08 ` [PATCH v3] " Kishon Vijay Abraham I
2017-06-08 7:20 ` [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Ulf Hansson
8 siblings, 1 reply; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-07 9:37 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, nsekhar
Cc: Ulf Hansson, Russell King, linux-omap, devicetree,
linux-arm-kernel, linux-kernel, linux-mmc, kishon
Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for
MMC IO supply.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am572x-idk.dts | 2 +-
arch/arm/boot/dts/dra7-evm.dts | 2 +-
arch/arm/boot/dts/dra71-evm.dts | 2 +-
arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
arch/arm/boot/dts/omap3-beagle.dts | 2 +-
arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +-
arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +-
arch/arm/boot/dts/omap3-n900.dts | 2 +-
arch/arm/boot/dts/omap3-overo-base.dtsi | 3 +--
arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
15 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 8350b4b34b08..8d538f5d9a5f 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -79,7 +79,7 @@
&mmc1 {
status = "okay";
vmmc-supply = <&v3_3d>;
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
bus-width = <4>;
cd-gpios = <&gpio6 27 0>; /* gpio 219 */
};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e5d7e7f5f645..e4c4037e6314 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -446,7 +446,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&evm_3v3_sd>;
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
bus-width = <4>;
/*
* SDCD signal is not being used here - using the fact that GPIO mode
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index c7a56b6263a6..02c11e658810 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -172,7 +172,7 @@
};
&mmc1 {
- vmmc_aux-supply = <&vpo_sd_1v8_3v3>;
+ vqmmc-supply = <&vpo_sd_1v8_3v3>;
};
&mmc2 {
diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
index e6df676886c0..57bfe5caf5e4 100644
--- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
@@ -146,5 +146,5 @@
};
&mmc1 {
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
};
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 673cee2234b2..683b96a8f73e 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -299,7 +299,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 4be85ce59dd1..4d2eaf843fa9 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -283,7 +283,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts
index 53ae04f9104d..3d293b345e99 100644
--- a/arch/arm/boot/dts/omap3-cm-t3517.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3517.dts
@@ -129,7 +129,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>;
- vmmc_aux-supply = <&wl12xx_vaux2>;
+ vqmmc-supply = <&wl12xx_vaux2>;
non-removable;
bus-width = <4>;
cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts
index 2294f5b0aa10..bdf4b7fdda39 100644
--- a/arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3730.dts
@@ -69,7 +69,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>;
- vmmc_aux-supply = <&wl12xx_vaux2>;
+ vqmmc-supply = <&wl12xx_vaux2>;
non-removable;
bus-width = <4>;
cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index f330c69cc683..4036cef4f9fc 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -149,7 +149,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index 090475083c2f..b831f2ed1abc 100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -98,7 +98,7 @@
&mmc1 {
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 49f37084e435..92c1f4ac4040 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -741,7 +741,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&vaux3>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
non-removable;
no-sdio;
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index 401fae838fe9..c11c86f9e09d 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -191,8 +191,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&w3cbw003c_npoweron>;
- vqmmc-supply = <&w3cbw003c_bt_nreset>;
- vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
+ vqmmc-supply = <&w3cbw003c_wifi_nreset>;
bus-width = <4>;
cap-sdio-irq;
non-removable;
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi
index dc80886b5329..ac6ff9b4db94 100644
--- a/arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/arch/arm/boot/dts/omap3-tao3530.dtsi
@@ -224,7 +224,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index 45e2ce0803de..96d0301a336a 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -174,7 +174,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index abd6921143be..908951eb5943 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -33,7 +33,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
/*
* S6-3 must be in ON position for 8 bit mode to function
* Else, use 4 bit mode
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v3] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
2017-06-07 9:37 ` [PATCH v2 8/8] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" Kishon Vijay Abraham I
@ 2017-06-09 12:08 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-09 12:08 UTC (permalink / raw)
To: Tony Lindgren, Ulf Hansson
Cc: linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-mmc,
Rob Herring, Russell King, nsekhar, kishon
Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for
MMC IO supply.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
Changes from v2:
Rebased on [1].
[1] -> https://www.spinics.net/lists/arm-kernel/msg586977.html
arch/arm/boot/dts/am572x-idk.dts | 2 +-
arch/arm/boot/dts/dra7-evm.dts | 2 +-
arch/arm/boot/dts/dra71-evm.dts | 2 +-
arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
arch/arm/boot/dts/omap3-beagle.dts | 2 +-
arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +-
arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +-
arch/arm/boot/dts/omap3-n900.dts | 2 +-
arch/arm/boot/dts/omap3-overo-base.dtsi | 2 +-
arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 8350b4b34b08..8d538f5d9a5f 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -79,7 +79,7 @@
&mmc1 {
status = "okay";
vmmc-supply = <&v3_3d>;
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
bus-width = <4>;
cd-gpios = <&gpio6 27 0>; /* gpio 219 */
};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e5d7e7f5f645..e4c4037e6314 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -446,7 +446,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&evm_3v3_sd>;
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
bus-width = <4>;
/*
* SDCD signal is not being used here - using the fact that GPIO mode
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index c7a56b6263a6..02c11e658810 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -172,7 +172,7 @@
};
&mmc1 {
- vmmc_aux-supply = <&vpo_sd_1v8_3v3>;
+ vqmmc-supply = <&vpo_sd_1v8_3v3>;
};
&mmc2 {
diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
index e6df676886c0..57bfe5caf5e4 100644
--- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
@@ -146,5 +146,5 @@
};
&mmc1 {
- vmmc_aux-supply = <&ldo1_reg>;
+ vqmmc-supply = <&ldo1_reg>;
};
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 673cee2234b2..683b96a8f73e 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -299,7 +299,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 4be85ce59dd1..4d2eaf843fa9 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -283,7 +283,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts
index 53ae04f9104d..3d293b345e99 100644
--- a/arch/arm/boot/dts/omap3-cm-t3517.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3517.dts
@@ -129,7 +129,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>;
- vmmc_aux-supply = <&wl12xx_vaux2>;
+ vqmmc-supply = <&wl12xx_vaux2>;
non-removable;
bus-width = <4>;
cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts
index 2294f5b0aa10..bdf4b7fdda39 100644
--- a/arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3730.dts
@@ -69,7 +69,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>;
- vmmc_aux-supply = <&wl12xx_vaux2>;
+ vqmmc-supply = <&wl12xx_vaux2>;
non-removable;
bus-width = <4>;
cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index f330c69cc683..4036cef4f9fc 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -149,7 +149,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index 090475083c2f..b831f2ed1abc 100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -98,7 +98,7 @@
&mmc1 {
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 49f37084e435..92c1f4ac4040 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -741,7 +741,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&vaux3>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <8>;
non-removable;
no-sdio;
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index cd220342a805..f25e158e7163 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -181,7 +181,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&w3cbw003c_npoweron>;
- vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
+ vqmmc-supply = <&w3cbw003c_wifi_nreset>;
bus-width = <4>;
cap-sdio-irq;
non-removable;
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi
index dc80886b5329..ac6ff9b4db94 100644
--- a/arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/arch/arm/boot/dts/omap3-tao3530.dtsi
@@ -224,7 +224,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>;
};
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index 45e2ce0803de..96d0301a336a 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -174,7 +174,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index abd6921143be..908951eb5943 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -33,7 +33,7 @@
&mmc1 {
vmmc-supply = <&vmmc1>;
- vmmc_aux-supply = <&vsim>;
+ vqmmc-supply = <&vsim>;
/*
* S6-3 must be in ON position for 8 bit mode to function
* Else, use 4 bit mode
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-06-07 9:37 [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Kishon Vijay Abraham I
` (7 preceding siblings ...)
2017-06-07 9:37 ` [PATCH v2 8/8] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" Kishon Vijay Abraham I
@ 2017-06-08 7:20 ` Ulf Hansson
2017-06-08 8:46 ` Tony Lindgren
` (2 more replies)
8 siblings, 3 replies; 18+ messages in thread
From: Ulf Hansson @ 2017-06-08 7:20 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 7 June 2017 at 11:37, 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.
>
> It also includes a patch to replace all vmmc_aux-supply
> with vqmmc-supply (In omap3-overo-base.dtsi remove the existing
> vqmmc-supply and then replace vmmc_aux-supply with vqmmc-supply).
> This will break old dt compatibility but not sure how better
> to handle this.
>
> Performed enumeration testing on dra72-evm-revc, dra72-evm,
> dra7-evm, am572x-evm, am571x-idk, am572x-idk, omap5-evm,
> pandaboard-es, am43xx-evm, am335x-evm, beagleboard etc.,
>
> This is a preparation series for adding UHS mode support in
> the above mentioned platforms.
>
> Changes from v1:
> *) Included a patch to replace deprecated "vmmc_aux" with
> "vqmmc"
>
> [1] -> https://lkml.org/lkml/2017/5/19/196
>
> Kishon Vijay Abraham I (6):
> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
> ARM: dts: dra72-evm: Add vqmmc supply to mmc1
> ARM: dts: dra72-evm-revc: Add vqmmc 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
> ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
>
> 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/am572x-idk.dts | 2 +-
> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
> arch/arm/boot/dts/dra7-evm.dts | 12 ++++++++--
> arch/arm/boot/dts/dra7.dtsi | 5 +++++
> arch/arm/boot/dts/dra71-evm.dts | 16 ++++++++++++-
> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
> arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++++++++++++
> arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +-
> arch/arm/boot/dts/dra72-evm.dts | 18 +++++++++++++++
> arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
> arch/arm/boot/dts/omap3-beagle.dts | 2 +-
> arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +-
> arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
> arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
> arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +-
> arch/arm/boot/dts/omap3-n900.dts | 2 +-
> arch/arm/boot/dts/omap3-overo-base.dtsi | 3 +--
> arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
> arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
> arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
> arch/arm/mach-omap2/pdata-quirks.c | 31 ++++++++++++++++++++++++++
> include/linux/platform_data/hsmmc-omap.h | 3 +++
> 22 files changed, 114 insertions(+), 20 deletions(-)
>
> --
> 2.11.0
>
If it helps, I can host a branch with the updates on the omap_hsmmc
driver, such it can be pulled in from arm soc?
I guess you need that as, the DT changes relies on the new vqmmc
binding. Or you thing it doesn't matter, because for the current
changes that regulator is always an always on regulator?
Br
Uffe
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-06-08 7:20 ` [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Ulf Hansson
@ 2017-06-08 8:46 ` Tony Lindgren
2017-06-09 12:21 ` Kishon Vijay Abraham I
2017-06-09 8:05 ` Kishon Vijay Abraham I
2017-08-03 11:18 ` Kishon Vijay Abraham I
2 siblings, 1 reply; 18+ messages in thread
From: Tony Lindgren @ 2017-06-08 8:46 UTC (permalink / raw)
To: Ulf Hansson
Cc: Kishon Vijay Abraham I, 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
* Ulf Hansson <ulf.hansson@linaro.org> [170608 00:24]:
> If it helps, I can host a branch with the updates on the omap_hsmmc
> driver, such it can be pulled in from arm soc?
Great that works for me. Let's just make sure git bisect
keeps working.
> I guess you need that as, the DT changes relies on the new vqmmc
> binding. Or you thing it doesn't matter, because for the current
> changes that regulator is always an always on regulator?
Or maybe we can just add the new regulator, then do a
follow-up series to remove the old ones?
Regards,
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-06-08 8:46 ` Tony Lindgren
@ 2017-06-09 12:21 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-09 12:21 UTC (permalink / raw)
To: Tony Lindgren, Ulf Hansson
Cc: 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 Tony,
On Thursday 08 June 2017 02:16 PM, Tony Lindgren wrote:
> * Ulf Hansson <ulf.hansson@linaro.org> [170608 00:24]:
>> If it helps, I can host a branch with the updates on the omap_hsmmc
>> driver, such it can be pulled in from arm soc?
>
> Great that works for me. Let's just make sure git bisect
> keeps working.
>
>> I guess you need that as, the DT changes relies on the new vqmmc
>> binding. Or you thing it doesn't matter, because for the current
>> changes that regulator is always an always on regulator?
>
> Or maybe we can just add the new regulator, then do a
> follow-up series to remove the old ones?
Since the driver has a fallback mechanism wherein if it's not able to find
vqmmc, it'll fallback to vmmc_aux, I don't think that's required.
Thanks
Kishon
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-06-08 7:20 ` [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Ulf Hansson
2017-06-08 8:46 ` Tony Lindgren
@ 2017-06-09 8:05 ` Kishon Vijay Abraham I
[not found] ` <4a4c4eb2-d865-25e6-cd53-a74d4f7b1f62-l0cyMroinI0@public.gmane.org>
2017-08-03 11:18 ` Kishon Vijay Abraham I
2 siblings, 1 reply; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-06-09 8:05 UTC (permalink / raw)
To: Ulf Hansson
Cc: devicetree@vger.kernel.org, Tony Lindgren,
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,
On Thursday 08 June 2017 12:50 PM, Ulf Hansson wrote:
> On 7 June 2017 at 11:37, 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.
>>
>> It also includes a patch to replace all vmmc_aux-supply
>> with vqmmc-supply (In omap3-overo-base.dtsi remove the existing
>> vqmmc-supply and then replace vmmc_aux-supply with vqmmc-supply).
>> This will break old dt compatibility but not sure how better
>> to handle this.
>>
>> Performed enumeration testing on dra72-evm-revc, dra72-evm,
>> dra7-evm, am572x-evm, am571x-idk, am572x-idk, omap5-evm,
>> pandaboard-es, am43xx-evm, am335x-evm, beagleboard etc.,
>>
>> This is a preparation series for adding UHS mode support in
>> the above mentioned platforms.
>>
>> Changes from v1:
>> *) Included a patch to replace deprecated "vmmc_aux" with
>> "vqmmc"
>>
>> [1] -> https://lkml.org/lkml/2017/5/19/196
>>
>> Kishon Vijay Abraham I (6):
>> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
>> ARM: dts: dra72-evm: Add vqmmc supply to mmc1
>> ARM: dts: dra72-evm-revc: Add vqmmc 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
>> ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
>>
>> 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/am572x-idk.dts | 2 +-
>> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
>> arch/arm/boot/dts/dra7-evm.dts | 12 ++++++++--
>> arch/arm/boot/dts/dra7.dtsi | 5 +++++
>> arch/arm/boot/dts/dra71-evm.dts | 16 ++++++++++++-
>> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
>> arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++++++++++++
>> arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +-
>> arch/arm/boot/dts/dra72-evm.dts | 18 +++++++++++++++
>> arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
>> arch/arm/boot/dts/omap3-beagle.dts | 2 +-
>> arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +-
>> arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
>> arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-n900.dts | 2 +-
>> arch/arm/boot/dts/omap3-overo-base.dtsi | 3 +--
>> arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
>> arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
>> arch/arm/mach-omap2/pdata-quirks.c | 31 ++++++++++++++++++++++++++
>> include/linux/platform_data/hsmmc-omap.h | 3 +++
>> 22 files changed, 114 insertions(+), 20 deletions(-)
>>
>> --
>> 2.11.0
>>
>
> If it helps, I can host a branch with the updates on the omap_hsmmc
> driver, such it can be pulled in from arm soc?
>
> I guess you need that as, the DT changes relies on the new vqmmc
> binding. Or you thing it doesn't matter, because for the current
> changes that regulator is always an always on regulator?
Since there is fallback mechanism in omap_hsmmc driver (falls back to
vmmc_aux), dt changes shouldn't rely on the omap_hsmmc driver.
However I'll send a fix for omap3-overo-base which used vqmmc incorrectly (that
should be merged before omap_hsmmc driver changes) so that git bisect does not
break.
Thanks
Kishon
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-06-08 7:20 ` [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node Ulf Hansson
2017-06-08 8:46 ` Tony Lindgren
2017-06-09 8:05 ` Kishon Vijay Abraham I
@ 2017-08-03 11:18 ` Kishon Vijay Abraham I
2017-08-07 6:48 ` Tony Lindgren
2 siblings, 1 reply; 18+ messages in thread
From: Kishon Vijay Abraham I @ 2017-08-03 11:18 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 Tony.
On Thursday 08 June 2017 12:50 PM, Ulf Hansson wrote:
> On 7 June 2017 at 11:37, 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.
>>
>> It also includes a patch to replace all vmmc_aux-supply
>> with vqmmc-supply (In omap3-overo-base.dtsi remove the existing
>> vqmmc-supply and then replace vmmc_aux-supply with vqmmc-supply).
>> This will break old dt compatibility but not sure how better
>> to handle this.
>>
>> Performed enumeration testing on dra72-evm-revc, dra72-evm,
>> dra7-evm, am572x-evm, am571x-idk, am572x-idk, omap5-evm,
>> pandaboard-es, am43xx-evm, am335x-evm, beagleboard etc.,
>>
>> This is a preparation series for adding UHS mode support in
>> the above mentioned platforms.
>>
>> Changes from v1:
>> *) Included a patch to replace deprecated "vmmc_aux" with
>> "vqmmc"
Have you already merged this series in your for-next? I could see all the
patches except "ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" in
your for-next.
Do you want me to resend the entire series or only "ARM: dts: omap*: Replace
deprecated "vmmc_aux" with "vqmmc"?
Please note having vqmmc property is required when we move to sdhci driver.
Thanks
Kishon
>>
>> [1] -> https://lkml.org/lkml/2017/5/19/196
>>
>> Kishon Vijay Abraham I (6):
>> ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2
>> ARM: dts: dra72-evm: Add vqmmc supply to mmc1
>> ARM: dts: dra72-evm-revc: Add vqmmc 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
>> ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
>>
>> 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/am572x-idk.dts | 2 +-
>> arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
>> arch/arm/boot/dts/dra7-evm.dts | 12 ++++++++--
>> arch/arm/boot/dts/dra7.dtsi | 5 +++++
>> arch/arm/boot/dts/dra71-evm.dts | 16 ++++++++++++-
>> arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
>> arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++++++++++++
>> arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +-
>> arch/arm/boot/dts/dra72-evm.dts | 18 +++++++++++++++
>> arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
>> arch/arm/boot/dts/omap3-beagle.dts | 2 +-
>> arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +-
>> arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
>> arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-n900.dts | 2 +-
>> arch/arm/boot/dts/omap3-overo-base.dtsi | 3 +--
>> arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
>> arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
>> arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
>> arch/arm/mach-omap2/pdata-quirks.c | 31 ++++++++++++++++++++++++++
>> include/linux/platform_data/hsmmc-omap.h | 3 +++
>> 22 files changed, 114 insertions(+), 20 deletions(-)
>>
>> --
>> 2.11.0
>>
>
> If it helps, I can host a branch with the updates on the omap_hsmmc
> driver, such it can be pulled in from arm soc?
>
> I guess you need that as, the DT changes relies on the new vqmmc
> binding. Or you thing it doesn't matter, because for the current
> changes that regulator is always an always on regulator?
>
> Br
> Uffe
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/8] omap*: Fixes/Cleanups for MMC devicetree node
2017-08-03 11:18 ` Kishon Vijay Abraham I
@ 2017-08-07 6:48 ` Tony Lindgren
[not found] ` <20170807064813.GA5487-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 18+ messages in thread
From: Tony Lindgren @ 2017-08-07 6:48 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: Ulf Hansson, 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
* Kishon Vijay Abraham I <kishon@ti.com> [170803 04:20]:
> Hi Tony.
>
> On Thursday 08 June 2017 12:50 PM, Ulf Hansson wrote:
> > On 7 June 2017 at 11:37, 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.
> >>
> >> It also includes a patch to replace all vmmc_aux-supply
> >> with vqmmc-supply (In omap3-overo-base.dtsi remove the existing
> >> vqmmc-supply and then replace vmmc_aux-supply with vqmmc-supply).
> >> This will break old dt compatibility but not sure how better
> >> to handle this.
> >>
> >> Performed enumeration testing on dra72-evm-revc, dra72-evm,
> >> dra7-evm, am572x-evm, am571x-idk, am572x-idk, omap5-evm,
> >> pandaboard-es, am43xx-evm, am335x-evm, beagleboard etc.,
> >>
> >> This is a preparation series for adding UHS mode support in
> >> the above mentioned platforms.
> >>
> >> Changes from v1:
> >> *) Included a patch to replace deprecated "vmmc_aux" with
> >> "vqmmc"
>
> Have you already merged this series in your for-next? I could see all the
> patches except "ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" in
> your for-next.
Sorry it got delayed, I was planning to send it at -rc1 time but
had a pending pull request for fixes that got delayed, and it's
too late now until next merge window.
> Do you want me to resend the entire series or only "ARM: dts: omap*: Replace
> deprecated "vmmc_aux" with "vqmmc"?
Seems that the missing one is safe to apply now? If so, let me just
take a look at that since I do have a branch already set up that
I can use.
Also, I was offline last week so I'll first have to check for any
pending fixes that might need attention.
> Please note having vqmmc property is required when we move to sdhci driver.
OK
Regards,
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread