omap hsmmc device tree support

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak <[email protected]>

---
?.../devicetree/bindings/mmc/ti-omap-hsmmc.txt ? ? ?| ? 31 +++++++++ ?drivers/mmc/host/omap_hsmmc.c ? ? ? ? ? ? ? ? ? ? ?| ? 68 ++++++++++++++++++++ ?2 files changed, 99 insertions(+), 0 deletions(-)
?create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +0 -0

new file mode 100644
index 0000000..e4fa8f0

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +23 -0

+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.
+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+ ? ? ? mmc1: mmc at 0x4809c000 {
+ ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? reg = <0x4809c000 0x400>;
+ ? ? ? ? ? ? ? ti,hwmods = "mmc1";
+ ? ? ? ? ? ? ? ti,dual-volt;
+ ? ? ? ? ? ? ? ti,bus-width = <4>;
+ ? ? ? ? ? ? ? vmmc-supply = <&vmmc>; /* phandle to regulator node */
+ ? ? ? ? ? ? ? ti,non-removable;
+ ? ? ? };

Quoted 21 lines · Rajendra Nayak

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak<[email protected]>

---
  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++++
  drivers/mmc/host/omap_hsmmc.c                      |   68 ++++++++++++++++++++
  2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +4 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt line 8

Quoted 4 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +4 -0

+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers

omap_hsmmc is applicable for omap2430 and omap3.
omap2420 has non high speed controller mmci-omap - drivers/mmc/host/omap.c May be omap3-hsmmc compatible with omap2430 ?

Quoted 24 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +23 -0

+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.
+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+       mmc1: mmc at 0x4809c000 {
+               compatible = "ti,omap4-hsmmc";
+               reg =<0x4809c000 0x400>;
+               ti,hwmods = "mmc1";
+               ti,dual-volt;
+               ti,bus-width =<4>;
+               vmmc-supply =<&vmmc>; /* phandle to regulator node */
+               ti,non-removable;
+       };

Quoted 25 lines · Balaji

Quoted 24 lines · Rajendra Nayak

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak<[email protected]>

---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 31 +++++++++ drivers/mmc/host/omap_hsmmc.c | 68 ++++++++++++++++++++

2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +5 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+

Quoted 8 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt line 8

Quoted 3 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +3 -0

+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers

omap_hsmmc is applicable for omap2430 and omap3. omap2420 has non high speed controller mmci-omap - drivers/mmc/host/omap.c
May be omap3-hsmmc compatible with omap2430 ?

Agree. I think its best in that case for me to define a compatible "ti,omap2430-hsmmc" for omap2430 and "ti,omap3-hsmmc" for omap3. Though the IP blocks are same, I cant think of some common compatible string without causing confusion.

Quoted 18 lines

Quoted 18 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +9 -0

+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the

property is missing.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +6 -0

+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+ mmc1: mmc at 0x4809c000 {

Quoted 8 lines

Quoted 8 lines

+ compatible = "ti,omap4-hsmmc";
+ reg =<0x4809c000 0x400>;
+ ti,hwmods = "mmc1";
+ ti,dual-volt;
+ ti,bus-width =<4>;
+ vmmc-supply =<&vmmc>; /* phandle to regulator node */
+ ti,non-removable;
+ };

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Quoted 35 lines · Rajendra Nayak

Quoted 33 lines · Balaji

Quoted 19 lines · Rajendra Nayak

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak<[email protected]>

---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 31 +++++++++ drivers/mmc/host/omap_hsmmc.c | 68 ++++++++++++++++++++

2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +0 -0

new file mode 100644
index 0000000..e4fa8f0

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt line 8

Quoted 8 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +8 -0

@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers

omap_hsmmc is applicable for omap2430 and omap3. omap2420 has non high speed controller mmci-omap - drivers/mmc/host/omap.c
May be omap3-hsmmc compatible with omap2430 ?

Quoted 4 lines

Agree. I think its best in that case for me to define a compatible "ti,omap2430-hsmmc" for omap2430 and "ti,omap3-hsmmc" for omap3. Though the IP blocks are same, I cant think of some common compatible string without causing confusion.

It depends, can we detect that using HW revision?

In that case, there is no need to differentiate again with compatible.

Regards,
Benoit

Quoted 31 lines

Quoted 18 lines

Quoted 18 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +9 -0

+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the

property is missing.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +6 -0

+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+ mmc1: mmc at 0x4809c000 {

Quoted 8 lines

Quoted 8 lines

+ compatible = "ti,omap4-hsmmc";
+ reg =<0x4809c000 0x400>;
+ ti,hwmods = "mmc1";
+ ti,dual-volt;
+ ti,bus-width =<4>;
+ vmmc-supply =<&vmmc>; /* phandle to regulator node */
+ ti,non-removable;
+ };

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Quoted 3 lines · Benoit

Quoted 2 lines · Rajendra Nayak

Quoted 1 line · Balaji

On Thu, Feb 23, 2012 at 5:31 PM, Rajendra Nayak<[email protected]> wrote:

Quoted 14 lines

Quoted 13 lines

Quoted 8 lines

Quoted 3 lines

+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers

omap_hsmmc is applicable for omap2430 and omap3. omap2420 has non high speed controller mmci-omap - drivers/mmc/host/omap.c
May be omap3-hsmmc compatible with omap2430 ?

Agree. I think its best in that case for me to define a compatible "ti,omap2430-hsmmc" for omap2430 and "ti,omap3-hsmmc" for omap3. Though the IP blocks are same, I cant think of some common compatible string without causing confusion.

Quoted 1 line

It depends, can we detect that using HW revision?

We don't need to. The driver does not do anything different for 2430 or omap3.

Quoted 1 line

In that case, there is no need to differentiate again with compatible.

Thats perfectly fine. But what *common* compatible string would you use?

Quoted 4 lines · Rajendra Nayak

Quoted 3 lines · Benoit

Quoted 2 lines · Rajendra Nayak

Quoted 1 line · Balaji

On Thu, Feb 23, 2012 at 5:31 PM, Rajendra Nayak<[email protected]> wrote:

...

Quoted 14 lines

Quoted 14 lines

Quoted 13 lines

Quoted 8 lines

Quoted 3 lines

+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers

omap_hsmmc is applicable for omap2430 and omap3. omap2420 has non high speed controller mmci-omap - drivers/mmc/host/omap.c
May be omap3-hsmmc compatible with omap2430 ?

Agree. I think its best in that case for me to define a compatible "ti,omap2430-hsmmc" for omap2430 and "ti,omap3-hsmmc" for omap3. Though the IP blocks are same, I cant think of some common compatible string without causing confusion.

Quoted 4 lines

Quoted 1 line

It depends, can we detect that using HW revision?

We don't need to. The driver does not do anything different for 2430 or omap3.

I was thinking of OMAP2420 vs OMAP2430. But I'm now wondering if we are using the same driver for the non-HS controller?

Quoted 5 lines

Quoted 2 lines

In that case, there is no need to differentiate again with compatible.

Thats perfectly fine. But what *common* compatible string would you use?

I think that "ti,omap2-hsmmc" is still fine, because OMAP2420 will have "ti,omap2-mmc" and thus we can differentiate the 2 versions.

Does that make sense?

Regards,
Benoit

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak<[email protected]>

---
  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++++
  drivers/mmc/host/omap_hsmmc.c                      |   68 ++++++++++++++++++++
  2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +31 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers
+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.
+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+	mmc1: mmc at 0x4809c000 {
+		compatible = "ti,omap4-hsmmc";
+		reg =<0x4809c000 0x400>;
+		ti,hwmods = "mmc1";
+		ti,dual-volt;
+		ti,bus-width =<4>;
+		vmmc-supply =<&vmmc>; /* phandle to regulator node */
+		ti,non-removable;
+	};

drivers/mmc/host/omap_hsmmc.c +68 -0

index 35f6dc1..0c93d58 100644
@@ -26,6 +26,9 @@
  #include<linux/platform_device.h>
  #include<linux/timer.h>
  #include<linux/clk.h>
+#include<linux/of.h>
+#include<linux/of_gpio.h>
+#include<linux/of_device.h>
  #include<linux/mmc/host.h>
  #include<linux/mmc/core.h>
  #include<linux/mmc/mmc.h>

@@ -1718,6 +1721,46 @@ static void omap_hsmmc_debugfs(struct mmc_host *mmc)
 
  #endif
 
+#ifdef CONFIG_OF
+static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
+{
+	struct omap_mmc_platform_data *pdata;
+	struct device_node *np = dev->of_node;
+	u32 bus_width;
+
+	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return NULL; /* out of memory */
+
+	if (of_find_property(np, "ti,dual-volt", NULL))
+		pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
+
+	/* This driver only supports 1 slot */
+	pdata->nr_slots = 1;
+	pdata->slots[0].switch_pin = of_get_named_gpio(np, "cd-gpios", 0);
+	pdata->slots[0].gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
+
+	if (of_find_property(np, "ti,non-removable", NULL)) {
+		pdata->slots[0].nonremovable = true;
+		pdata->slots[0].no_regulator_off_init = true;
+	}
+	of_property_read_u32(np, "ti,bus-width",&bus_width);
+	if (bus_width == 4)
+		pdata->slots[0].caps |= MMC_CAP_4_BIT_DATA;
+	else if (bus_width == 8)
+		pdata->slots[0].caps |= MMC_CAP_8_BIT_DATA;
+	return pdata;
+}
+#else
+static inline struct omap_mmc_platform_data
+			*of_get_hsmmc_pdata(struct device *dev)
+{
+	return NULL;
+}
+#endif
+
+static const struct of_device_id omap_mmc_of_match[];
+
  static int __init omap_hsmmc_probe(struct platform_device *pdev)
  {
  	struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;

@@ -1725,6 +1768,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
  	struct omap_hsmmc_host *host = NULL;
  	struct resource *res;
  	int ret, irq;
+	const struct of_device_id *match;
+
+	match = of_match_device(omap_mmc_of_match,&pdev->dev);
+	if (match) {
+		pdata = of_get_hsmmc_pdata(&pdev->dev);
+		if (match->data)
+			pdata->reg_offset = *(u16 *)match->data;
+	}
 
  	if (pdata == NULL) {
  		dev_err(&pdev->dev, "Platform Data is missing\n");

@@ -2120,12 +2171,29 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
  	.runtime_resume = omap_hsmmc_runtime_resume,
  };
 
+#if defined(CONFIG_OF)
+static u16 omap4_reg_offset = 0x100;
+
+static const struct of_device_id omap_mmc_of_match[] = {
+	{
+		.compatible = "ti,omap2-hsmmc",
+	},
+	{
+		.compatible = "ti,omap4-hsmmc",
+		.data =&omap4_reg_offset,
+	},
+	{},
+}
+MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
+#endif
+
  static struct platform_driver omap_hsmmc_driver = {
  	.remove		= omap_hsmmc_remove,
  	.driver		= {
  		.name = DRIVER_NAME,
  		.owner = THIS_MODULE,
  		.pm =&omap_hsmmc_dev_pm_ops,
+		.of_match_table = of_match_ptr(omap_mmc_of_match),
  	},
  };
 

Hi Rob/Grant,

Quoted 3 lines · Rajendra Nayak

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Any comments on these bindings for omap hsmmc? All the dependent patches/series on which this series was based have now made it to the respective -next of Mark and Chris.

Quoted 161 lines

Signed-off-by Rajendra Nayak<[email protected]>

---
  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++++
  drivers/mmc/host/omap_hsmmc.c                      |   68
++++++++++++++++++++
  2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +17 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers
+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the

property is missing.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +14 -0

+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+
+Example:
+    mmc1: mmc at 0x4809c000 {
+        compatible = "ti,omap4-hsmmc";
+        reg =<0x4809c000 0x400>;
+        ti,hwmods = "mmc1";
+        ti,dual-volt;
+        ti,bus-width =<4>;
+        vmmc-supply =<&vmmc>; /* phandle to regulator node */
+        ti,non-removable;
+    };

drivers/mmc/host/omap_hsmmc.c +43 -0

index 35f6dc1..0c93d58 100644
@@ -26,6 +26,9 @@
  #include<linux/platform_device.h>
  #include<linux/timer.h>
  #include<linux/clk.h>
+#include<linux/of.h>
+#include<linux/of_gpio.h>
+#include<linux/of_device.h>
  #include<linux/mmc/host.h>
  #include<linux/mmc/core.h>
  #include<linux/mmc/mmc.h>

@@ -1718,6 +1721,46 @@ static void omap_hsmmc_debugfs(struct mmc_host
 *mmc)
 
  #endif
 
+#ifdef CONFIG_OF
+static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct
 device *dev)
+{
+    struct omap_mmc_platform_data *pdata;
+    struct device_node *np = dev->of_node;
+    u32 bus_width;
+
+    pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+    if (!pdata)
+        return NULL; /* out of memory */
+
+    if (of_find_property(np, "ti,dual-volt", NULL))
+        pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
+
+    /* This driver only supports 1 slot */
+    pdata->nr_slots = 1;
+    pdata->slots[0].switch_pin = of_get_named_gpio(np, "cd-gpios", 0);
+    pdata->slots[0].gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
+
+    if (of_find_property(np, "ti,non-removable", NULL)) {
+        pdata->slots[0].nonremovable = true;
+        pdata->slots[0].no_regulator_off_init = true;
+    }
+    of_property_read_u32(np, "ti,bus-width",&bus_width);
+    if (bus_width == 4)
+        pdata->slots[0].caps |= MMC_CAP_4_BIT_DATA;
+    else if (bus_width == 8)
+        pdata->slots[0].caps |= MMC_CAP_8_BIT_DATA;
+    return pdata;
+}
+#else
+static inline struct omap_mmc_platform_data
+            *of_get_hsmmc_pdata(struct device *dev)
+{
+    return NULL;
+}
+#endif
+
+static const struct of_device_id omap_mmc_of_match[];
+
  static int __init omap_hsmmc_probe(struct platform_device *pdev)

  {
      struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;

drivers/mmc/host/omap_hsmmc.c +8 -0

@@ -1725,6 +1768,14 @@ static int __init omap_hsmmc_probe(struct
 platform_device *pdev)
      struct omap_hsmmc_host *host = NULL;
      struct resource *res;
      int ret, irq;
+    const struct of_device_id *match;
+
+    match = of_match_device(omap_mmc_of_match,&pdev->dev);
+    if (match) {
+        pdata = of_get_hsmmc_pdata(&pdev->dev);
+        if (match->data)
+            pdata->reg_offset = *(u16 *)match->data;
+    }
 
      if (pdata == NULL) {

          dev_err(&pdev->dev, "Platform Data is missing\n");

drivers/mmc/host/omap_hsmmc.c +17 -0

@@ -2120,12 +2171,29 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops
 = {
      .runtime_resume = omap_hsmmc_runtime_resume,
  };
 
+#if defined(CONFIG_OF)
+static u16 omap4_reg_offset = 0x100;
+
+static const struct of_device_id omap_mmc_of_match[] = {
+    {
+        .compatible = "ti,omap2-hsmmc",
+    },
+    {
+        .compatible = "ti,omap4-hsmmc",
+        .data =&omap4_reg_offset,
+    },
+    {},
+}
+MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
+#endif
+
  static struct platform_driver omap_hsmmc_driver = {
      .remove        = omap_hsmmc_remove,
      .driver        = {
          .name = DRIVER_NAME,
          .owner = THIS_MODULE,
          .pm =&omap_hsmmc_dev_pm_ops,
+        .of_match_table = of_match_ptr(omap_mmc_of_match),
      },
  };

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak <[email protected]>

---
 .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++++
 drivers/mmc/host/omap_hsmmc.c                      |   68 ++++++++++++++++++++
 2 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +10 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers
+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +1 -0

+
 static int __init omap_hsmmc_probe(struct platform_device *pdev)
 {
 	struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +18 -0

+	}
 
 	if (pdata == NULL) {
 		dev_err(&pdev->dev, "Platform Data is missing\n");

@@ -2120,12 +2171,29 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
 	.runtime_resume = omap_hsmmc_runtime_resume,
 };
 
+#if defined(CONFIG_OF)
+static u16 omap4_reg_offset = 0x100;
+
+static const struct of_device_id omap_mmc_of_match[] = {
+	{
+		.compatible = "ti,omap2-hsmmc",
+	},
+	{
+		.compatible = "ti,omap4-hsmmc",
+		.data = &omap4_reg_offset,
+	},
+	{},
+}
+MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
+#endif
+
 static struct platform_driver omap_hsmmc_driver = {
 	.remove		= omap_hsmmc_remove,
 	.driver		= {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,
 		.pm = &omap_hsmmc_dev_pm_ops,
+		.of_match_table = of_match_ptr(omap_mmc_of_match),
 	},
 };
 

Signature · 7 lines

1.7.1


_______________________________________________
linaro-dev mailing list
linaro-dev at lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

Quoted 27 lines · Rajendra Nayak

Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract data (which was earlier passed as platform_data) from device tree.

Signed-off-by Rajendra Nayak<[email protected]>

---
  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++++
  drivers/mmc/host/omap_hsmmc.c                      |   68 ++++++++++++++++++++
  2 files changed, 99 insertions(+), 0 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +10 -0

new file mode 100644
index 0000000..e4fa8f0
@@ -0,0 +1,31 @@
+* TI Highspeed MMC host controller for OMAP
+
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2/3 controllers
+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt line 20

Quoted 10 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +10 -0

+- reg : should contain hsmmc registers location and length
+
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.
+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)

Binding looks okay. A couple comments below...

[...]

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt line 21

Quoted 1 line

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +1 -0

+static const struct of_device_id omap_mmc_of_match[];

If you move the omap_mmc_of_match[] table up to here then there is no need for the forward declaration.

Quoted 5 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +1 -0

+
  static int __init omap_hsmmc_probe(struct platform_device *pdev)
  {
  	struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt static int __init omap_hsmmc_probe(struct platform_device *pdev) · line 1777

Quoted 10 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +7 -0

@@ -1725,6 +1768,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
  	struct omap_hsmmc_host *host = NULL;
  	struct resource *res;
  	int ret, irq;
+	const struct of_device_id *match;
+
+	match = of_match_device(omap_mmc_of_match,&pdev->dev);
+	if (match) {
+		pdata = of_get_hsmmc_pdata(&pdev->dev);
+		if (match->data)
+			pdata->reg_offset = *(u16 *)match->data;

Blech on the ugly cast. It is slightly safer to do thusly:

	u16 *offsetp = match->data;
	pdata->reg_offset = *offsetp

Quoted 43 lines

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt new file +18 -1

+	}
 
  	if (pdata == NULL) {
  		dev_err(&pdev->dev, "Platform Data is missing\n");

@@ -2120,12 +2171,29 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
  	.runtime_resume = omap_hsmmc_runtime_resume,
  };
 
+#if defined(CONFIG_OF)
+static u16 omap4_reg_offset = 0x100;
+
+static const struct of_device_id omap_mmc_of_match[] = {
+	{
+		.compatible = "ti,omap2-hsmmc",
+	},
+	{
+		.compatible = "ti,omap4-hsmmc",
+		.data =&omap4_reg_offset,
+	},
+	{},
+}
+MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
+#endif
+
  static struct platform_driver omap_hsmmc_driver = {
  	.remove		= omap_hsmmc_remove,
  	.driver		= {
  		.name = DRIVER_NAME,
  		.owner = THIS_MODULE,
  		.pm =&omap_hsmmc_dev_pm_ops,
+		.of_match_table = of_match_ptr(omap_mmc_of_match),
  	},
  };
 
--

1.7.1

_______________________________________________
linaro-dev mailing list
linaro-dev at lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

arch/arm/boot/dts/omap4.dtsi +6 -0

index 29f4589..9204f60 100644
@@ -25,6 +25,11 @@
 ? ? ? ? ? ? ? ?serial1 = &uart2;
 ? ? ? ? ? ? ? ?serial2 = &uart3;
 ? ? ? ? ? ? ? ?serial3 = &uart4;
+ ? ? ? ? ? ? ? mmc1 = &mmc1;
+ ? ? ? ? ? ? ? mmc2 = &mmc2;
+ ? ? ? ? ? ? ? mmc3 = &mmc3;
+ ? ? ? ? ? ? ? mmc4 = &mmc4;
+ ? ? ? ? ? ? ? mmc5 = &mmc5;
 ? ? ? ?};
 
 ? ? ? ?cpus {

@@ -155,5 +160,31 @@
 ? ? ? ? ? ? ? ? ? ? ? ?#size-cells = <0>;
 ? ? ? ? ? ? ? ? ? ? ? ?ti,hwmods = "i2c4";
 ? ? ? ? ? ? ? ?};
+

arch/arm/boot/dts/omap4.dtsi +15 -1

+
+ ? ? ? ? ? ? ? mmc3: mmc at 3 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc3";
+ ? ? ? ? ? ? ? };
+
+ ? ? ? ? ? ? ? mmc4: mmc at 4 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc4";
+ ? ? ? ? ? ? ? };
+
+ ? ? ? ? ? ? ? mmc5: mmc at 5 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc5";
+ ? ? ? ? ? ? ? };
 ? ? ? ?};
 ?};
--

1.7.1

Quoted 29 lines

arch/arm/boot/dts/omap4.dtsi +14 -0

index 29f4589..9204f60 100644
@@ -25,6 +25,11 @@
                serial1 =&uart2;
                serial2 =&uart3;
                serial3 =&uart4;
+               mmc1 =&mmc1;
+               mmc2 =&mmc2;
+               mmc3 =&mmc3;
+               mmc4 =&mmc4;
+               mmc5 =&mmc5;
        };
 
        cpus {

@@ -155,5 +160,31 @@
                        #size-cells =<0>;
                        ti,hwmods = "i2c4";
                };
+
+               mmc1: mmc at 1 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc1";
+                       ti,dual-volt;
+               };
+
+               mmc2: mmc at 2 {
+                       compatible = "ti,omap4-hsmmc";

arch/arm/boot/dts/omap4.dtsi line 173

Quoted 2 lines

arch/arm/boot/dts/omap4.dtsi +2 -0

+                       ti,hwmods = "mmc2";
+               };

Hi Rajendra,
Is there a way to control the device registration order,
eMMC connected to mmc2 needs to be registered as /dev/mmcblk0p ... irrespective of whether SD card is mount or not on mmc1 card slot. So that bootargs would not have to be modified when filesystem is on eMMC.

Quoted 21 lines

arch/arm/boot/dts/omap4.dtsi +15 -1

+
+               mmc3: mmc at 3 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc3";
+               };
+
+               mmc4: mmc at 4 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc4";
+               };
+
+               mmc5: mmc at 5 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc5";
+               };
        };
  };
--

1.7.1

I don't know if we can, but even if we could, we take care of the same bootargs working on two boards (say sdp and panda) *if* on sdp I have my filesystem on eMMC and on panda I have it on external card. What happens if I want to use my filesystem on both boards on external card?

Quoted 31 lines · Balaji

Quoted 31 lines

arch/arm/boot/dts/omap4.dtsi +15 -0

index 29f4589..9204f60 100644
@@ -25,6 +25,11 @@
 ? ? ? ? ? ? ? ?serial1 =&uart2;
 ? ? ? ? ? ? ? ?serial2 =&uart3;
 ? ? ? ? ? ? ? ?serial3 =&uart4;
+ ? ? ? ? ? ? ? mmc1 =&mmc1;
+ ? ? ? ? ? ? ? mmc2 =&mmc2;
+ ? ? ? ? ? ? ? mmc3 =&mmc3;
+ ? ? ? ? ? ? ? mmc4 =&mmc4;
+ ? ? ? ? ? ? ? mmc5 =&mmc5;
 ? ? ? ?};
 
 ? ? ? ?cpus {

@@ -155,5 +160,31 @@
 ? ? ? ? ? ? ? ? ? ? ? ?#size-cells =<0>;
 ? ? ? ? ? ? ? ? ? ? ? ?ti,hwmods = "i2c4";
 ? ? ? ? ? ? ? ?};
+
+ ? ? ? ? ? ? ? mmc1: mmc at 1 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc1";
+ ? ? ? ? ? ? ? ? ? ? ? ti,dual-volt;
+ ? ? ? ? ? ? ? };
+
+ ? ? ? ? ? ? ? mmc2: mmc at 2 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc2";

Quoted 8 lines

arch/arm/boot/dts/omap4.dtsi line 173

Quoted 1 line

arch/arm/boot/dts/omap4.dtsi +1 -0

+ ? ? ? ? ? ? ? };

Hi Rajendra,
Is there a way to control the device registration order,
eMMC connected to mmc2 needs to be registered as /dev/mmcblk0p ... irrespective of whether SD card is mount or not on mmc1 card slot. So that bootargs would not have to be modified when filesystem is on eMMC.

I don't know if we can, but even if we could, we take care of the same bootargs working on two boards (say sdp and panda) *if* on sdp I have my filesystem on eMMC and on panda I have it on external card. What happens if I want to use my filesystem on both boards on external card?

Quoted 23 lines

Quoted 23 lines

arch/arm/boot/dts/omap4.dtsi +15 -1

+
+ ? ? ? ? ? ? ? mmc3: mmc at 3 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc3";
+ ? ? ? ? ? ? ? };
+
+ ? ? ? ? ? ? ? mmc4: mmc at 4 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc4";
+ ? ? ? ? ? ? ? };
+
+ ? ? ? ? ? ? ? mmc5: mmc at 5 {
+ ? ? ? ? ? ? ? ? ? ? ? compatible = "ti,omap4-hsmmc";
+ ? ? ? ? ? ? ? ? ? ? ? ti,hwmods = "mmc5";
+ ? ? ? ? ? ? ? };
 ? ? ? ?};
 ?};
--

1.7.1

Quoted 29 lines · Balaji

Quoted 29 lines

arch/arm/boot/dts/omap4.dtsi +14 -0

index 29f4589..9204f60 100644
@@ -25,6 +25,11 @@
                serial1 =&uart2;
                serial2 =&uart3;
                serial3 =&uart4;
+               mmc1 =&mmc1;
+               mmc2 =&mmc2;
+               mmc3 =&mmc3;
+               mmc4 =&mmc4;
+               mmc5 =&mmc5;
        };
 
        cpus {

@@ -155,5 +160,31 @@
                        #size-cells =<0>;
                        ti,hwmods = "i2c4";
                };
+
+               mmc1: mmc at 1 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc1";
+                       ti,dual-volt;
+               };
+
+               mmc2: mmc at 2 {
+                       compatible = "ti,omap4-hsmmc";

Quoted 8 lines

arch/arm/boot/dts/omap4.dtsi line 173

Quoted 2 lines

arch/arm/boot/dts/omap4.dtsi +2 -0

+                       ti,hwmods = "mmc2";
+               };

Hi Rajendra,
Is there a way to control the device registration order,
eMMC connected to mmc2 needs to be registered as /dev/mmcblk0p ... irrespective of whether SD card is mount or not on mmc1 card slot. So that bootargs would not have to be modified when filesystem is on eMMC.

I don't know if we can, but even if we could, we take care of the same bootargs working on two boards (say sdp and panda) *if* on sdp I have my filesystem on eMMC and on panda I have it on external card. What happens if I want to use my filesystem on both boards on external card?

Quoted 14 lines

Quoted 14 lines

arch/arm/boot/dts/omap4.dtsi +12 -0

+
+               mmc3: mmc at 3 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc3";
+               };
+
+               mmc4: mmc at 4 {
+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc4";
+               };
+
+               mmc5: mmc at 5 {

Quoted 8 lines

Quoted 8 lines

arch/arm/boot/dts/omap4.dtsi +3 -1

+                       compatible = "ti,omap4-hsmmc";
+                       ti,hwmods = "mmc5";
+               };
        };
  };
--

1.7.1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

arch/arm/boot/dts/omap3.dtsi +18 -0

@@ -113,5 +113,31 @@
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
 		};
+
+		mmc1: mmc at 1 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+		};
+
+		mmc2: mmc at 2 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc2";
+		};
+
+		mmc3: mmc at 3 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc3";
+		};
+
+		mmc4: mmc at 4 {

Quoted 28 lines

arch/arm/boot/dts/omap3.dtsi +22 -0

@@ -113,5 +113,31 @@
  			#size-cells =<0>;
  			ti,hwmods = "i2c3";
  		};
+
+		mmc1: mmc at 1 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+		};
+
+		mmc2: mmc at 2 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc2";
+		};
+
+		mmc3: mmc at 3 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc3";
+		};
+
+		mmc4: mmc at 4 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc4";
+		};
+

arch/arm/boot/dts/omap3.dtsi line 143

Quoted 6 lines

arch/arm/boot/dts/omap3.dtsi +4 -0

+		mmc5: mmc at 5 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc5";
+		};
  	};
  };

These all should all be "ti,omap3-hsmmc" I guess?

Tony

Quoted 28 lines · Tony Lindgren

Quoted 28 lines

arch/arm/boot/dts/omap3.dtsi +22 -0

@@ -113,5 +113,31 @@
 #size-cells =<0>;
 ti,hwmods = "i2c3";
 };
+
+ mmc1: mmc at 1 {
+ compatible = "ti,omap2-hsmmc";
+ ti,hwmods = "mmc1";
+ ti,dual-volt;
+ };
+
+ mmc2: mmc at 2 {
+ compatible = "ti,omap2-hsmmc";
+ ti,hwmods = "mmc2";
+ };
+
+ mmc3: mmc at 3 {
+ compatible = "ti,omap2-hsmmc";
+ ti,hwmods = "mmc3";
+ };
+
+ mmc4: mmc at 4 {
+ compatible = "ti,omap2-hsmmc";
+ ti,hwmods = "mmc4";
+ };
+

Quoted 8 lines

arch/arm/boot/dts/omap3.dtsi line 143

Quoted 6 lines

arch/arm/boot/dts/omap3.dtsi +4 -0

+ mmc5: mmc at 5 {
+ compatible = "ti,omap2-hsmmc";
+ ti,hwmods = "mmc5";
+ };
 };
 };

These all should all be "ti,omap3-hsmmc" I guess?

Well, I defined the binding such that both omap2 and omap3 can use the same compatible "ti,omap2-hsmmc" since there is no difference in the way they are defined or handled. If thats confusing, I can have separate compatibles.
Btw, I guess we do the same with a few other re-used IPs as well, I just checked and mcpsi does the same.

Quoted 28 lines · Tony Lindgren

Quoted 28 lines

arch/arm/boot/dts/omap3.dtsi +22 -0

@@ -113,5 +113,31 @@
 			#size-cells =<0>;
 			ti,hwmods = "i2c3";
 		};
+
+		mmc1: mmc at 1 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+		};
+
+		mmc2: mmc at 2 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc2";
+		};
+
+		mmc3: mmc at 3 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc3";
+		};
+
+		mmc4: mmc at 4 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc4";
+		};
+

Quoted 8 lines

arch/arm/boot/dts/omap3.dtsi line 143

Quoted 6 lines

arch/arm/boot/dts/omap3.dtsi +4 -0

+		mmc5: mmc at 5 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc5";
+		};
 	};
 };

These all should all be "ti,omap3-hsmmc" I guess?

Well, I defined the binding such that both omap2 and omap3 can use the same compatible "ti,omap2-hsmmc" since there is no difference in the way they are defined or handled. If thats confusing, I can have separate compatibles.
Btw, I guess we do the same with a few other re-used IPs as well, I just checked and mcpsi does the same.

Quoted 38 lines · Rajendra Nayak

Quoted 28 lines · Tony Lindgren

Quoted 28 lines

arch/arm/boot/dts/omap3.dtsi +22 -0

@@ -113,5 +113,31 @@
 			#size-cells =<0>;
 			ti,hwmods = "i2c3";
 		};
+
+		mmc1: mmc at 1 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+		};
+
+		mmc2: mmc at 2 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc2";
+		};
+
+		mmc3: mmc at 3 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc3";
+		};
+
+		mmc4: mmc at 4 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc4";
+		};
+

Quoted 8 lines

arch/arm/boot/dts/omap3.dtsi line 143

Quoted 6 lines

arch/arm/boot/dts/omap3.dtsi +4 -0

+		mmc5: mmc at 5 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc5";
+		};
 	};
 };

These all should all be "ti,omap3-hsmmc" I guess?

Quoted 6 lines

Well, I defined the binding such that both omap2 and omap3 can use the same compatible "ti,omap2-hsmmc" since there is no difference in the way they are defined or handled. If thats confusing, I can have separate compatibles.
Btw, I guess we do the same with a few other re-used IPs as well, I just checked and mcpsi does the same.

Yeah let's use separate compatibles to avoid confusion. For omap2 we also have the ti,omap2-mmc in addition to ti,omap2-hsmmc..

Yes, absolutely use separate compatible values. It is always important to be specific as to the silicon implementing the IP.

Quoted 2 lines · Grant Likely

Yes, absolutely use separate compatible values. It is always important to be specific as to the silicon implementing the IP.

In that case, it is probably best to use the full chip name in the compatible string, e.g., omap2420 or omap2430 rather than just "omap2".

Particularly in the case of "OMAP3," which is a largely meaningless group these days with AM33xx, OMAP34xx, OMAP36xx, and AM3517, many of which are quite different from each other...

- Paul

Quoted 46 lines · Tony Lindgren

Quoted 38 lines · Rajendra Nayak

Quoted 28 lines · Tony Lindgren

Quoted 28 lines

arch/arm/boot/dts/omap3.dtsi +22 -0

@@ -113,5 +113,31 @@
  			#size-cells =<0>;
  			ti,hwmods = "i2c3";
  		};
+
+		mmc1: mmc at 1 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+		};
+
+		mmc2: mmc at 2 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc2";
+		};
+
+		mmc3: mmc at 3 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc3";
+		};
+
+		mmc4: mmc at 4 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc4";
+		};
+

Quoted 8 lines

arch/arm/boot/dts/omap3.dtsi line 143

Quoted 6 lines

arch/arm/boot/dts/omap3.dtsi +4 -0

+		mmc5: mmc at 5 {
+			compatible = "ti,omap2-hsmmc";
+			ti,hwmods = "mmc5";
+		};
  	};
  };

These all should all be "ti,omap3-hsmmc" I guess?

Quoted 6 lines

Well, I defined the binding such that both omap2 and omap3 can use the same compatible "ti,omap2-hsmmc" since there is no difference in the way they are defined or handled. If thats confusing, I can have separate compatibles.
Btw, I guess we do the same with a few other re-used IPs as well, I just checked and mcpsi does the same.

Quoted 3 lines

Yeah let's use separate compatibles to avoid confusion. For omap2 we also have the ti,omap2-mmc in addition to ti,omap2-hsmmc..

Yes, absolutely use separate compatible values. It is always important to be specific as to the silicon implementing the IP. The omap3 instance can also carry the omap2 string in its compatible list:

	compatible = "ti,omap3-hsmmc", "ti,omap2-hsmmc";

g.

This series adds device tree support for OMAP hsmmc driver. The series is dependent on a couple other series, to add TWL regulator DT support[1] and another to clean the pdev->id usage within the hsmmc driver[2]

all patches including the dependent series can be found here
git://gitorious.org/omap-pm/linux.git for-dt/regulator

The series is tested on omap4sdp (both external and emmc), omap4panda amd omap3beagle boards.

Things to do:
-1- Card detect isn't functional and needs twl4030 gpio to be DT converted.
-2- pbias cell programming is missing and needs an OMAP control module driver.

[1] http://marc.info/?l=linux-omap&m=132999699905180&w=2
[2] http://marc.info/?l=linux-omap&m=132999646604985&w=2

Rajendra Nayak (4):
mmc: omap_hsmmc: Convert hsmmc driver to use device tree
mmc: omap_hsmmc: Avoid a regulator voltage change with dt arm/dts: OMAP4: Add mmc controller nodes and board data arm/dts: OMAP3: Add mmc controller nodes and board data

  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   31 +++++++
  arch/arm/boot/dts/omap3-beagle.dts                 |    6 ++
  arch/arm/boot/dts/omap3.dtsi                       |   26 ++++++
  arch/arm/boot/dts/omap4-panda.dts                  |   10 +++
  arch/arm/boot/dts/omap4-sdp.dts                    |   16 ++++
  arch/arm/boot/dts/omap4.dtsi                       |   31 +++++++
  drivers/mmc/host/omap_hsmmc.c                      |   83 +++++++++++++++++++-
  7 files changed, 202 insertions(+), 1 deletions(-)

create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt