ARM: mach-shmobile: kzm9g: Reference DT implementation

Use MMC_VDD_165_195 as the allowed voltages in the absence of platform data. This should allow device tree to initialise MMCIF for a number of boards.

A more complete solution would be to provide either MMCIF or MMC device try bindings to set the allowed voltages.

Tested on the KZM-A9-GT board

Cc Guennadi Liakhovetski <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/mmc/host/sh_mmcif.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

drivers/mmc/host/sh_mmcif.c +0 -0

index 11d2bc3..88d6866 100644
@@ -1293,12 +1293,9 @@ static void sh_mmcif_init_ocr(struct sh_mmcif_host *host)
 
        mmc_regulator_get_supply(mmc);
 

Hi Simon,

Quoted 7 lines · Simon Horman

Use MMC_VDD_165_195 as the allowed voltages in the absence of platform data. This should allow device tree to initialise MMCIF for a number of boards.

A more complete solution would be to provide either MMCIF or MMC device try bindings to set the allowed voltages.

Quoted 7 lines

Tested on the KZM-A9-GT board

Cc Guennadi Liakhovetski <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/mmc/host/sh_mmcif.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Thanks for your patch!

Quoted 8 lines

drivers/mmc/host/sh_mmcif.c +0 -0

index 11d2bc3..88d6866 100644
@@ -1293,12 +1293,9 @@ static void sh_mmcif_init_ocr(struct sh_mmcif_host *host)
 
        mmc_regulator_get_supply(mmc);
 

drivers/mmc/host/sh_mmcif.c static void sh_mmcif_init_ocr(struct sh_mmcif_host *host) · line 1300

Quoted 10 lines

drivers/mmc/host/sh_mmcif.c +2 -5

-       if (!pd)
-               return;
-
        if (!mmc->ocr_avail)
-               mmc->ocr_avail = pd->ocr;
-       else if (pd->ocr)
+               mmc->ocr_avail = pd ? pd->ocr : MMC_VDD_165_195;
+       else if (pd && pd->ocr)
                dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");
 }

I may be mistaken, but I somehow thought that the code in mmc_regulator_get_supply() would take care of this automatically for us already. So this kind of patch isn't really needed as long as you tie in regulators via DT as expected.

Enhance the OF support for SDHI by adding the following bindings:

* renesas,shmobile-sdhi-has-idle-wait:
Equivalent to setting TMIO_MMC_HAS_IDLE_WAIT in the flags of platform data

* renesas,shmobile-sdhi-use-gpio-cd:
Equivalent to setting TMIO_MMC_USE_GPIO_CD in
the flags of platform data

* renesas,shmobile-sdhi-wrprotect-disable:
Equivalent to setting TMIO_MMC_WRPROTECT_DISABLE in the flags of platform data

* cd-gpios:
Equivalent to setting cd_gpio in platform data

This patch also requests the clock based on the device tree node name if the platform data is absent.

The motivation for this is to allow registration of the SDHI device of the KZM-A9-GT board through device tree.

The following device tree snippet illustrates the use of the bindings described above.

	sdhi0 at 0xee100000 {
		compatible = "renesas,shmobile-sdhi";
		reg = <0xee100000 0x100>;
		interrupt-parent = <&gic>;
		interrupts = <0 83 0x4
			      0 84 0x4
			      0 85 0x4>;
		interrupt-names = "card_detect", "sdcard", "sdio";
		reg-io-width = <2>;
		vmmc-supply = <&fixedregulator2v8>;
		vqmmc-supply = <&fixedregulator2v8>;
		renesas,shmobile-sdhi-has-idle-wait;
	};

	sdhi2 at 0xee140000 {
		compatible = "renesas,shmobile-sdhi";
		reg = <0xee140000 0x100>;
		interrupt-parent = <&gic>;
		interrupts = <0 103 0x4
			      0 104 0x4
			      0 105 0x4>;
		interrupt-names = "card_detect", "sdcard", "sdio";
		reg-io-width = <2>;
		vmmc-supply = <&fixedregulator2v8>;
		vqmmc-supply = <&fixedregulator2v8>;
		renesas,shmobile-sdhi-has-idle-wait;
		renesas,shmobile-sdhi-use-gpio-cd;
		renesas,shmobile-sdhi-wrprotect-disable;
		cd-gpios = <&gpio 13 1>;
	};

Cc Guennadi Liakhovetski <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/mmc/host/sh_mobile_sdhi.c |   76 +++++++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 11 deletions(-)

drivers/mmc/host/sh_mobile_sdhi.c +1 -0

index 0bdc146..8c7e658 100644
@@ -29,6 +29,7 @@
 #include <linux/mfd/tmio.h>
 #include <linux/sh_dma.h>
 #include <linux/delay.h>
+#include <linux/of_gpio.h>
 
 #include "tmio_mmc.h"
 

drivers/mmc/host/sh_mobile_sdhi.c +9 -0

+	priv->clk = clk_get(&pdev->dev, clk_name);
+	if (IS_ERR(priv->clk)) {
+		dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+		return PTR_ERR(priv->clk);
+	}
+
+	return 0;
+}
+

drivers/mmc/host/sh_mobile_sdhi.c +28 -9

+
+	ret = sh_mobile_sdhi_probe_clk(pdev, priv, np->name);
+	if (ret)
+		return ret;
+
+	ret = of_get_named_gpio(np, "cd-gpios", 0);
+	if (gpio_is_valid(ret))
+		mmc_data->cd_gpio = ret;
+
+	if (of_get_property(np, "renesas,shmobile-sdhi-has-idle-wait", NULL))
+		mmc_data->flags |= TMIO_MMC_HAS_IDLE_WAIT;
+	if (of_get_property(np, "renesas,shmobile-sdhi-use-gpio-cd", NULL))
+		mmc_data->flags |= TMIO_MMC_USE_GPIO_CD;
+	if (of_get_property(np, "renesas,shmobile-sdhi-wrprotect-disable",
+			    NULL))
+		mmc_data->flags |= TMIO_MMC_WRPROTECT_DISABLE;
+
+	return 0;
+}
+#else
+static int __devinit
+sh_mobile_sdhi_probe_config_dt(struct platform_device *pdev,
+			       struct sh_mobile_sdhi *priv)
+{
+	return 0;
+}
+#endif
+
 static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
 	struct sh_mobile_sdhi *priv;
 	struct tmio_mmc_data *mmc_data;
 	struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
 	struct tmio_mmc_host *host;
-	char clk_name[8];
 	int irq, ret, i = 0;
 	bool multiplexed_isr = true;
 

@@ -144,21 +196,17 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 		}
 	}
 
-	snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
-	priv->clk = clk_get(&pdev->dev, clk_name);
-	if (IS_ERR(priv->clk)) {
-		dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
-		ret = PTR_ERR(priv->clk);
-		goto eclkget;
-	}
-

drivers/mmc/host/sh_mobile_sdhi.c +5 -0

+		ret = sh_mobile_sdhi_probe_config_dt(pdev, priv);
+		if (ret)
+			goto eclkget;
 	}
+	if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
+		mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
 
 	/*
 	 * All SDHI blocks support 2-byte and larger block sizes in 4-bit

Signature · 1 line

1.7.10.4

Enhance the OF support for SDHI by adding the following bindings:

* renesas,shmobile-sdhi-has-idle-wait:
Equivalent to setting TMIO_MMC_HAS_IDLE_WAIT in the flags of platform data

* renesas,shmobile-sdhi-use-gpio-cd:
Equivalent to setting TMIO_MMC_USE_GPIO_CD in
the flags of platform data

* renesas,shmobile-sdhi-wrprotect-disable:
Equivalent to setting TMIO_MMC_WRPROTECT_DISABLE in the flags of platform data

* cd-gpios:
Equivalent to setting cd_gpio in platform data

This patch also requests the clock based on the device tree node name if the platform data is absent.

The motivation for this is to allow registration of the SDHI device of the KZM-A9-GT board through device tree.

The following device tree snippet illustrates the use of the bindings described above.

	sdhi0 at 0xee100000 {
		compatible = "renesas,shmobile-sdhi";
		reg = <0xee100000 0x100>;
		interrupt-parent = <&gic>;
		interrupts = <0 83 0x4
			      0 84 0x4
			      0 85 0x4>;
		interrupt-names = "card_detect", "sdcard", "sdio";
		reg-io-width = <2>;
		vmmc-supply = <&fixedregulator2v8>;
		vqmmc-supply = <&fixedregulator2v8>;
		renesas,shmobile-sdhi-has-idle-wait;
	};

	sdhi2 at 0xee140000 {
		compatible = "renesas,shmobile-sdhi";
		reg = <0xee140000 0x100>;
		interrupt-parent = <&gic>;
		interrupts = <0 103 0x4
			      0 104 0x4
			      0 105 0x4>;
		interrupt-names = "card_detect", "sdcard", "sdio";
		reg-io-width = <2>;
		vmmc-supply = <&fixedregulator2v8>;
		vqmmc-supply = <&fixedregulator2v8>;
		renesas,shmobile-sdhi-has-idle-wait;
		renesas,shmobile-sdhi-use-gpio-cd;
		renesas,shmobile-sdhi-wrprotect-disable;
		cd-gpios = <&gpio 13 1>;
	};

Cc Guennadi Liakhovetski <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/mmc/host/sh_mobile_sdhi.c |   76 +++++++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 11 deletions(-)

drivers/mmc/host/sh_mobile_sdhi.c +65 -11

index 0bdc146..8c7e658 100644
@@ -29,6 +29,7 @@
 #include <linux/mfd/tmio.h>
 #include <linux/sh_dma.h>
 #include <linux/delay.h>
+#include <linux/of_gpio.h>
 
 #include "tmio_mmc.h"
 

@@ -117,13 +118,64 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = {
 	.cd_wakeup = sh_mobile_sdhi_cd_wakeup,
 };
 
+static int __devinit
+sh_mobile_sdhi_probe_clk(struct platform_device *pdev,
+			 struct sh_mobile_sdhi *priv,
+			 const char *clk_name)
+{
+	priv->clk = clk_get(&pdev->dev, clk_name);
+	if (IS_ERR(priv->clk)) {
+		dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+		return PTR_ERR(priv->clk);
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static int __devinit
+sh_mobile_sdhi_probe_config_dt(struct platform_device *pdev,
+			       struct sh_mobile_sdhi *priv)
+{
+	struct tmio_mmc_data *mmc_data = &priv->mmc_data;
+	struct device_node *np = pdev->dev.of_node;
+	int ret;
+
+	BUG_ON(!np);
+
+	ret = sh_mobile_sdhi_probe_clk(pdev, priv, np->name);
+	if (ret)
+		return ret;
+
+	ret = of_get_named_gpio(np, "cd-gpios", 0);
+	if (gpio_is_valid(ret))
+		mmc_data->cd_gpio = ret;
+
+	if (of_get_property(np, "renesas,shmobile-sdhi-has-idle-wait", NULL))
+		mmc_data->flags |= TMIO_MMC_HAS_IDLE_WAIT;
+	if (of_get_property(np, "renesas,shmobile-sdhi-use-gpio-cd", NULL))
+		mmc_data->flags |= TMIO_MMC_USE_GPIO_CD;
+	if (of_get_property(np, "renesas,shmobile-sdhi-wrprotect-disable",
+			    NULL))
+		mmc_data->flags |= TMIO_MMC_WRPROTECT_DISABLE;
+
+	return 0;
+}
+#else
+static int __devinit
+sh_mobile_sdhi_probe_config_dt(struct platform_device *pdev,
+			       struct sh_mobile_sdhi *priv)
+{
+	return 0;
+}
+#endif
+
 static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
 	struct sh_mobile_sdhi *priv;
 	struct tmio_mmc_data *mmc_data;
 	struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
 	struct tmio_mmc_host *host;
-	char clk_name[8];
 	int irq, ret, i = 0;
 	bool multiplexed_isr = true;
 

@@ -144,21 +196,17 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 		}
 	}
 
-	snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
-	priv->clk = clk_get(&pdev->dev, clk_name);
-	if (IS_ERR(priv->clk)) {
-		dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
-		ret = PTR_ERR(priv->clk);
-		goto eclkget;
-	}
-
 	mmc_data->clk_enable = sh_mobile_sdhi_clk_enable;
 	mmc_data->clk_disable = sh_mobile_sdhi_clk_disable;
 	mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
 	if (p) {
+		char clk_name[8];
+		snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
+		ret = sh_mobile_sdhi_probe_clk(pdev, priv, clk_name);
+		if (ret)
+			goto eclkget;
+
 		mmc_data->flags = p->tmio_flags;
-		if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
-			mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
 		mmc_data->ocr_mask = p->tmio_ocr_mask;
 		mmc_data->capabilities |= p->tmio_caps;
 		mmc_data->capabilities2 |= p->tmio_caps2;

@@ -176,7 +224,13 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 			priv->dma_priv.alignment_shift = 1; /* 2-byte alignment */
 			mmc_data->dma = &priv->dma_priv;
 		}
+	} else {
+		ret = sh_mobile_sdhi_probe_config_dt(pdev, priv);
+		if (ret)
+			goto eclkget;
 	}
+	if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
+		mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
 
 	/*
 	 * All SDHI blocks support 2-byte and larger block sizes in 4-bit

Signature · 1 line

1.7.10.4

This is a crude mechanism to allow the pfc driver to be registered through device tree. The mofication of this is to provide a way for pfc gpios to be looked up by device tree for devices which use pfc gpios.

More specifically, the motivation is to allow the registration of the card-detect gpio for the Micro-SD SDHI slot of the KZM9G board.

Cc Paul Mundt <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/sh/pfc/gpio.c  |   15 +++++++++++++++
 include/linux/sh_pfc.h |    7 +++++++
 2 files changed, 22 insertions(+)

drivers/sh/pfc/gpio.c +15 -0

index 038fa07..322b927 100644
@@ -136,6 +136,19 @@ static void sh_pfc_gpio_setup(struct sh_pfc_chip *chip)
 gc->ngpio = (pfc->last_gpio - pfc->first_gpio) + 1;
 }
 
+#ifdef CONFIG_OF_GPIO
+static void
+sh_pfc_register_gpiochip_dt(struct sh_pfc *pfc, struct gpio_chip *chip)
+{
+	chip->of_node = pfc->of_node;
+	chip->of_gpio_n_cells = pfc->of_gpio_n_cells;
+	chip->of_xlate = pfc->of_xlate;
+}
+#else
+static void sh_pfc_register_gpiochip_dt(struct sh_pfc *pfc,
+					struct gpio_chip *chip) {}
+#endif
+
 int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 {
 	struct sh_pfc_chip *chip;

@@ -153,6 +166,8 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 	if (unlikely(ret < 0))
 		kfree(chip);
 
+	sh_pfc_register_gpiochip_dt(pfc, &chip->gpio_chip);
+
 	pr_info("%s handling gpio %d -> %d\n",
 		pfc->name, pfc->first_gpio, pfc->last_gpio);
 

include/linux/sh_pfc.h +7 -0

index c19a092..9963370 100644
@@ -124,6 +124,13 @@ struct sh_pfc {
 	struct pfc_window *window;
 
 	unsigned long unlock_reg;
+
+#ifdef CONFIG_OF_GPIO
+	struct device_node *of_node;
+	int of_gpio_n_cells;
+	int (*of_xlate)(struct gpio_chip *gc,
+		        const struct of_phandle_args *gpiospec, u32 *flags);
+#endif
 };
 
 /* XXX compat for now */

This is a crude mechanism to allow the pfc driver to be registered through device tree. The mofication of this is to provide a way for pfc gpios to be looked up by device tree for devices which use pfc gpios.

More specifically, the motivation is to allow the registration of the card-detect gpio for the Micro-SD SDHI slot of the KZM9G board.

Cc Paul Mundt <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---
 drivers/sh/pfc/gpio.c  |   15 +++++++++++++++
 include/linux/sh_pfc.h |    7 +++++++
 2 files changed, 22 insertions(+)

drivers/sh/pfc/gpio.c +15 -0

index 038fa07..322b927 100644
@@ -136,6 +136,19 @@ static void sh_pfc_gpio_setup(struct sh_pfc_chip *chip)
 gc->ngpio = (pfc->last_gpio - pfc->first_gpio) + 1;
 }
 
+#ifdef CONFIG_OF_GPIO
+static void
+sh_pfc_register_gpiochip_dt(struct sh_pfc *pfc, struct gpio_chip *chip)
+{
+	chip->of_node = pfc->of_node;
+	chip->of_gpio_n_cells = pfc->of_gpio_n_cells;
+	chip->of_xlate = pfc->of_xlate;
+}
+#else
+static void sh_pfc_register_gpiochip_dt(struct sh_pfc *pfc,
+					struct gpio_chip *chip) {}
+#endif
+
 int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 {
 	struct sh_pfc_chip *chip;

@@ -153,6 +166,8 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 	if (unlikely(ret < 0))
 		kfree(chip);
 
+	sh_pfc_register_gpiochip_dt(pfc, &chip->gpio_chip);
+
 	pr_info("%s handling gpio %d -> %d\n",
 		pfc->name, pfc->first_gpio, pfc->last_gpio);
 

include/linux/sh_pfc.h +7 -0

index c19a092..9963370 100644
@@ -124,6 +124,13 @@ struct sh_pfc {
 	struct pfc_window *window;
 
 	unsigned long unlock_reg;
+
+#ifdef CONFIG_OF_GPIO
+	struct device_node *of_node;
+	int of_gpio_n_cells;
+	int (*of_xlate)(struct gpio_chip *gc,
+		        const struct of_phandle_args *gpiospec, u32 *flags);
+#endif
 };
 
 /* XXX compat for now */

Hi Simon,

Quoted 5 lines · On Monday 26 November 2012 09:16:50 Simon Horman wrote:

This is a crude mechanism to allow the pfc driver to be registered through device tree. The mofication of this is to provide a way for pfc gpios to be looked up by device tree for devices which use pfc gpios.

Quoted 2 lines

More specifically, the motivation is to allow the registration of the card-detect gpio for the Micro-SD SDHI slot of the KZM9G board.

I've just posted v2 of my PCF patches ("SH pin control and GPIO rework with OF support") that include OF support for GPIOs. This patch as well as patch 4/7 and the gpio node in patch 7/7 and shouldn't be required anymore.

Register the pfc with sh73a0_init_gpio_dt() to allow gpios provided by pfc to be accessed by devices which are registered using device tree.

The motivation of this is to allow the gpio used for carrier detect but the Micro SD SDHI port of the KZM-9A-GT board to be accessed using device tree. Thus, allowing the SDHI device of the KZM-9A-GT board to be registered using device tree.

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/pfc-sh73a0.c |   45 ++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(quoted diff) +0 -0

b/arch/arm/mach-shmobile/pfc-sh73a0.c index b442f9d..d1a04c0b 100644

arch/arm/mach-shmobile/pfc-sh73a0.c +9 -0

@@ -2797,7 +2797,52 @@ static struct pinmux_info sh73a0_pinmux_info = {
 	.gpio_irq_size = ARRAY_SIZE(pinmux_irqs),
 };
 
+#ifdef CONFIG_OF_GPIO
+static int sh73a0_gpio_xlate(struct gpio_chip *gc,
+			     const struct of_phandle_args *gpiospec,
+			     u32 *flags)
+{
+	if (WARN_ON(gc->of_gpio_n_cells < 2))
+		return -EINVAL;
+
+	if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))

arch/arm/mach-shmobile/pfc-sh73a0.c +25 -0

+static const struct of_device_id sh73a0_gpio_dt_match[] __initdata = {
+	{ .compatible = "renesas,sh_pfc-sh73a0", },
+	{}
+};
+
+static inline void sh73a0_init_gpio_dt(void)
+{
+	struct device_node *of_node;
+
+	if (!of_have_populated_dt())
+		return;
+
+	of_node = of_find_matching_node(NULL, sh73a0_gpio_dt_match);
+	sh73a0_pinmux_info.of_node = of_node;
+	sh73a0_pinmux_info.of_gpio_n_cells = 2;
+	sh73a0_pinmux_info.of_xlate = sh73a0_gpio_xlate;
+}
+
+#else
+
+static inline void sh73a0_init_gpio_dt(void) {}
+
+#endif
+
 void sh73a0_pinmux_init(void)
 {
+	sh73a0_init_gpio_dt();
 	register_pinmux(&sh73a0_pinmux_info);
 }

Hi Simon,

Quoted 37 lines · On Monday 26 November 2012 09:16:51 Simon Horman wrote:

Register the pfc with sh73a0_init_gpio_dt() to allow gpios provided by pfc to be accessed by devices which are registered using device tree.

The motivation of this is to allow the gpio used for carrier detect but the Micro SD SDHI port of the KZM-9A-GT board to be accessed using device tree. Thus, allowing the SDHI device of the KZM-9A-GT board to be registered using device tree.

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/pfc-sh73a0.c |   45 ++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(quoted diff) +0 -0

b/arch/arm/mach-shmobile/pfc-sh73a0.c index b442f9d..d1a04c0b 100644

arch/arm/mach-shmobile/pfc-sh73a0.c +15 -0

@@ -2797,7 +2797,52 @@ static struct pinmux_info sh73a0_pinmux_info = {
 	.gpio_irq_size = ARRAY_SIZE(pinmux_irqs),
 };
 
+#ifdef CONFIG_OF_GPIO
+static int sh73a0_gpio_xlate(struct gpio_chip *gc,
+			     const struct of_phandle_args *gpiospec,
+			     u32 *flags)
+{
+	if (WARN_ON(gc->of_gpio_n_cells < 2))
+		return -EINVAL;
+
+	if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
+		return -EINVAL;
+
+	if (gpiospec->args[0] > gc->ngpio)
+		return -EINVAL;
+
+	if (flags)

arch/arm/mach-shmobile/pfc-sh73a0.c static struct pinmux_info sh73a0_pinmux_info = { · line 2818

Quoted 4 lines

arch/arm/mach-shmobile/pfc-sh73a0.c +4 -0

+		*flags = gpiospec->args[1];
+
+	return gpiospec->args[0];
+}

Is there any reason not to use of_gpio_simple_xlate here ? If there isn't, of_xlate and of_gpio_n_cells default to of_gpio_simple_xlate and 2 respectively when of_xlate isn't specified, so you could omit both.

Allow a minimal setup of the sh73a0 SoC using a flattened device tree.

* Allow configuration of the i2c controllers using a flattened device tree.

* SCI serial controller and CMT clock source, whose drivers do not yet support configuration using a flattened device tree, are still configured using C code in order to allow booting of a board with this SoC.

An example dts snuppet follows:

        i2c0: i2c at 0xe6820000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6820000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 167 0x4
                              0 170 0x4>;
        };

        i2c1: i2c at 0xe6822000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6822000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 51 0x4
                              0 44 0x4>;

                touchscreen at 55 {
                        compatible = "sitronix,st1232";
                        reg = <0x55>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 9 0x4>;
                };
        };

        i2c2: i2c at 0xe6824000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6824000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 171 0x4
                              0 174 0x4>;
        };

        i2c3: i2c at 0xe6826000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6826000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 183 0x4
                              0 186 0x4>;
        };

        i2c4: i2c at 0xe6828000 {

                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6828000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 187 0x4
                              0 190 0x4>;
        };

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/include/mach/common.h |    2 ++
 arch/arm/mach-shmobile/setup-sh73a0.c        |   41 ++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

arch/arm/mach-shmobile/include/mach/common.h +2 -0

index b50447e..06b905e 100644
@@ -52,7 +52,9 @@ extern void sh73a0_init_irq(void);
 extern void sh73a0_init_irq_dt(void);
 extern void sh73a0_map_io(void);
 extern void sh73a0_add_early_devices(void);
+extern void sh73a0_add_early_devices_dt(void);
 extern void sh73a0_add_standard_devices(void);
+extern void sh73a0_add_standard_devices_dt(void);
 extern void sh73a0_clock_init(void);
 extern void sh73a0_pinmux_init(void);
 extern struct clk sh73a0_extal1_clk;

arch/arm/mach-shmobile/setup-sh73a0.c +21 -5

index db99a4a..9096caa 100644
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>

@@ -754,7 +755,7 @@ static struct platform_device pmu_device = {
        .resource       = pmu_resources,
 };
 
-static struct platform_device *sh73a0_early_devices[] __initdata = {
+static struct platform_device *sh73a0_early_devices_dt[] __initdata = {
        &scif0_device,
        &scif1_device,
        &scif2_device,

@@ -765,6 +766,9 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
        &scif7_device,
        &scif8_device,
        &cmt10_device,
+};
+
+static struct platform_device *sh73a0_early_devices[] __initdata = {
        &tmu00_device,
        &tmu01_device,
 };

@@ -782,11 +786,18 @@ static struct platform_device *sh73a0_late_devices[] __initdata = {
 
 #define SRCR2          IOMEM(0xe61580b0)
 
-void __init sh73a0_add_standard_devices(void)
+void __init sh73a0_add_standard_devices_dt(void)
 {
        /* Clear software reset bit on SY-DMAC module */
        __raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);
 
+       platform_add_devices(sh73a0_early_devices_dt,
+                            ARRAY_SIZE(sh73a0_early_devices_dt));
+}
+
+void __init sh73a0_add_standard_devices(void)
+{
+       sh73a0_add_standard_devices_dt();
        platform_add_devices(sh73a0_early_devices,
                            ARRAY_SIZE(sh73a0_early_devices));
        platform_add_devices(sh73a0_late_devices,

@@ -803,14 +814,34 @@ static void __init sh73a0_earlytimer_init(void)
        sh73a0_register_twd();
 }
 
-void __init sh73a0_add_early_devices(void)
+static void __init
+sh73a0_add_early_devices_start(void)
 {
-       early_platform_add_devices(sh73a0_early_devices,
-                                  ARRAY_SIZE(sh73a0_early_devices));
+       early_platform_add_devices(sh73a0_early_devices_dt,
+                                  ARRAY_SIZE(sh73a0_early_devices_dt));
+}
 
+static void __init
+sh73a0_add_early_devices_finish(void)
+{
        /* setup early console here as well */
        shmobile_setup_console();

Hi Simon,

Thanks for your efforts.

Quoted 58 lines · Simon Horman

Allow a minimal setup of the sh73a0 SoC using a flattened device tree.

* Allow configuration of the i2c controllers using a flattened device tree.

* SCI serial controller and CMT clock source, whose drivers do not yet support configuration using a flattened device tree, are still configured using C code in order to allow booting of a board with this SoC.

An example dts snuppet follows:

        i2c0: i2c at 0xe6820000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6820000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 167 0x4
                              0 170 0x4>;
        };

        i2c1: i2c at 0xe6822000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6822000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 51 0x4
                              0 44 0x4>;

                touchscreen at 55 {
                        compatible = "sitronix,st1232";
                        reg = <0x55>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 9 0x4>;
                };
        };

        i2c2: i2c at 0xe6824000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6824000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 171 0x4
                              0 174 0x4>;
        };

        i2c3: i2c at 0xe6826000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6826000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 183 0x4
                              0 186 0x4>;
        };

        i2c4: i2c at 0xe6828000 {

Quoted 8 lines

                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6828000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 187 0x4
                              0 190 0x4>;
        };

Uhm, doesn't the above want to go into sh73a0.dtsi?

Quoted 91 lines

Signed-off-by Simon Horman <[email protected]>

---
 arch/arm/mach-shmobile/include/mach/common.h |    2 ++
 arch/arm/mach-shmobile/setup-sh73a0.c        |   41 ++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

arch/arm/mach-shmobile/include/mach/common.h +2 -0

index b50447e..06b905e 100644
@@ -52,7 +52,9 @@ extern void sh73a0_init_irq(void);
 extern void sh73a0_init_irq_dt(void);
 extern void sh73a0_map_io(void);
 extern void sh73a0_add_early_devices(void);
+extern void sh73a0_add_early_devices_dt(void);
 extern void sh73a0_add_standard_devices(void);
+extern void sh73a0_add_standard_devices_dt(void);
 extern void sh73a0_clock_init(void);
 extern void sh73a0_pinmux_init(void);
 extern struct clk sh73a0_extal1_clk;

arch/arm/mach-shmobile/setup-sh73a0.c +21 -5

index db99a4a..9096caa 100644
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>

@@ -754,7 +755,7 @@ static struct platform_device pmu_device = {
        .resource       = pmu_resources,
 };
 
-static struct platform_device *sh73a0_early_devices[] __initdata = {
+static struct platform_device *sh73a0_early_devices_dt[] __initdata = {
        &scif0_device,
        &scif1_device,
        &scif2_device,

@@ -765,6 +766,9 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
        &scif7_device,
        &scif8_device,
        &cmt10_device,
+};
+
+static struct platform_device *sh73a0_early_devices[] __initdata = {
        &tmu00_device,
        &tmu01_device,
 };

@@ -782,11 +786,18 @@ static struct platform_device *sh73a0_late_devices[] __initdata = {
 
 #define SRCR2          IOMEM(0xe61580b0)
 
-void __init sh73a0_add_standard_devices(void)
+void __init sh73a0_add_standard_devices_dt(void)
 {
        /* Clear software reset bit on SY-DMAC module */
        __raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);
 
+       platform_add_devices(sh73a0_early_devices_dt,
+                            ARRAY_SIZE(sh73a0_early_devices_dt));
+}
+
+void __init sh73a0_add_standard_devices(void)
+{
+       sh73a0_add_standard_devices_dt();
        platform_add_devices(sh73a0_early_devices,
                            ARRAY_SIZE(sh73a0_early_devices));
        platform_add_devices(sh73a0_late_devices,

@@ -803,14 +814,34 @@ static void __init sh73a0_earlytimer_init(void)
        sh73a0_register_twd();
 }
 
-void __init sh73a0_add_early_devices(void)
+static void __init
+sh73a0_add_early_devices_start(void)
 {
-       early_platform_add_devices(sh73a0_early_devices,
-                                  ARRAY_SIZE(sh73a0_early_devices));
+       early_platform_add_devices(sh73a0_early_devices_dt,
+                                  ARRAY_SIZE(sh73a0_early_devices_dt));
+}
 
+static void __init
+sh73a0_add_early_devices_finish(void)
+{
        /* setup early console here as well */
        shmobile_setup_console();
 

arch/arm/mach-shmobile/setup-sh73a0.c static void __init sh73a0_earlytimer_init(void) · line 838

Quoted 9 lines

arch/arm/mach-shmobile/setup-sh73a0.c +6 -0

        /* override timer setup with soc-specific code */
        shmobile_timer.init = sh73a0_earlytimer_init;
 }
+
+void __init sh73a0_add_early_devices_dt(void)
+{
+       sh73a0_add_early_devices_start();
+       sh73a0_add_early_devices_finish();
+}

What's the reason behind using sh73a0_earlytimer_init() for the sh73a0 DT case instead of using shmobile_setup_delay() as the DT code for sh7372 does?

For the DT case on sh7372 we don't really use early platform driver timers at all, instead we use timers as regular platform devices. For this to work as expected we need to setup a worst case udelay calculation via shmobile_setup_delay(). I suggest using the same style for sh73a0.

Quoted 4 lines

arch/arm/mach-shmobile/setup-sh73a0.c +4 -0

+void __init sh73a0_add_early_devices(void)
+{
+       sh73a0_add_early_devices_start();
+       early_platform_add_devices(sh73a0_early_devices,

arch/arm/mach-shmobile/setup-sh73a0.c static void __init sh73a0_earlytimer_init(void) · line 847

Quoted 4 lines

arch/arm/mach-shmobile/setup-sh73a0.c +4 -0

+                                  ARRAY_SIZE(sh73a0_early_devices));
+       sh73a0_add_early_devices_finish();
+}
+

Hm, without sh73a0_earlytimer_init() the functions sh73a0_add_early_devices_start() and sh73a0_add_early_devices_finish() look overly complicated compared to the sh7372 DT implementation.

However, I have not checked your code in detail but if your DT code for sh73a0 happens to be shorter than the DT code for sh7372 then please adjust the sh7372 code to be as short and simple as possible.

Quoted 82 lines · Magnus Damm

Quoted 81 lines · Simon Horman

Allow a minimal setup of the sh73a0 SoC using a flattened device tree.

* Allow configuration of the i2c controllers using a flattened device tree.

* SCI serial controller and CMT clock source, whose drivers do not yet support configuration using a flattened device tree, are still configured
using C code in order to allow booting of a board with this SoC.

An example dts snuppet follows:

        i2c0: i2c at 0xe6820000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6820000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 167 0x4
                
                              0 170 0x4>;
        
        };
        
        i2c1: i2c at 0xe6822000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6822000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 51 0x4
                
                              0 44 0x4>;
                
                touchscreen at 55 {
                
                        compatible = "sitronix,st1232";
                        reg = <0x55>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 9 0x4>;
                
                };
        
        };
        
        i2c2: i2c at 0xe6824000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6824000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 171 0x4
                
                              0 174 0x4>;
        
        };
        
        i2c3: i2c at 0xe6826000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6826000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 183 0x4
                
                              0 186 0x4>;
        
        };
        
        i2c4: i2c at 0xe6828000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6828000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 187 0x4

Quoted 5 lines

Quoted 3 lines

                              0 190 0x4>;
        
        };

Uhm, doesn't the above want to go into sh73a0.dtsi?

There are two things that I am unsure of:

* What should go into sh73a0.dtsi and what should go into sh73a0-kzm9g-refere3nce.dts.

The i2c seems like it should go into sh73a0.dtsi as it is part of the soc. Likewise the interrupt controllers.

But when it comes to mmcif and sdhi I am less sure. Both of these make use of regulators. Are the regulators part of the board or the SoC?

If the are part of the board then it makes it more difficult to put mmcif and sdhi into sh73a0.dtsi as they need to reference the regulators somehow.

* What to do the of_dev_auxdata.

Currently I add this in patch 4 to the board-kzm9g.c. It is used to force the name of the i2c, mmcif and sdhi devices in order to allow their clock lookup to work (though come to think of it it may not be necessary for mmcif and sdhi).

In any case, the location of the of_dev_auxdata might be come a bit tricky if it covers devices in both the board and SoC dts files.

Hi Simon,

Quoted 91 lines · On Monday 26 November 2012 13:58:06 Simon Horman wrote:

Quoted 82 lines · Magnus Damm

Quoted 81 lines · Simon Horman

Allow a minimal setup of the sh73a0 SoC using a flattened device tree.

* Allow configuration of the i2c controllers using a flattened device tree.

* SCI serial controller and CMT clock source, whose drivers do not yet support configuration using a flattened device tree, are still configured
using C code in order to allow booting of a board with this SoC.

An example dts snuppet follows:

        i2c0: i2c at 0xe6820000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6820000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 167 0x4
                
                              0 170 0x4>;
        
        };
        
        i2c1: i2c at 0xe6822000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6822000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 51 0x4
                
                              0 44 0x4>;
                
                touchscreen at 55 {
                
                        compatible = "sitronix,st1232";
                        reg = <0x55>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 9 0x4>;
                
                };
        
        };
        
        i2c2: i2c at 0xe6824000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6824000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 171 0x4
                
                              0 174 0x4>;
        
        };
        
        i2c3: i2c at 0xe6826000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6826000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 183 0x4
                
                              0 186 0x4>;
        
        };
        
        i2c4: i2c at 0xe6828000 {
        
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "renesas,rmobile-iic";
                reg = <0xe6828000 0x425>;
                interrupt-parent = <&gic>;
                interrupts = <0 187 0x4

Quoted 5 lines

Quoted 3 lines

                              0 190 0x4>;
        
        };

Uhm, doesn't the above want to go into sh73a0.dtsi?

There are two things that I am unsure of:

Quoted 8 lines

* What should go into sh73a0.dtsi and what should go into sh73a0-kzm9g-refere3nce.dts.

The i2c seems like it should go into sh73a0.dtsi as it is part of the soc. Likewise the interrupt controllers.

But when it comes to mmcif and sdhi I am less sure. Both of these make use of regulators. Are the regulators part of the board or the SoC?

It depends on the regulators. In theory you could have on-SoC regulators that would thus be part of the SoC. In practice I'm not sure how often that happens.

Most of the regulators are provided by the PMIC, so we can create PMIC- specific .dtsi files that would be included by boards. See twl4030.dtsi for an example. Other board-specific regulators, including fixed regulators, should be provided by the board.

Quoted 3 lines

If the are part of the board then it makes it more difficult to put mmcif and sdhi into sh73a0.dtsi as they need to reference the regulators somehow.

I think you can split a node across several files. You could have

        mmcif: mmcif at 0x10010000 {
                compatible = "renesas,sh-mmcif";
                reg = <0xe6bd0000 0x100>;
                interrupt-parent = <&gic>;
                interrupts = <0 140 0x4
                              0 141 0x4>;
                reg-io-width = <4>;
        };

in the SoC .dtsi, and

        &mmcif {
                vmmc-supply = <&fixedregulator1v8>;
                vqmmc-supply = <&fixedregulator1v8>;
        };

in the board .dts.

Quoted 6 lines

* What to do the of_dev_auxdata.

Currently I add this in patch 4 to the board-kzm9g.c. It is used to force the name of the i2c, mmcif and sdhi devices in order to allow their clock lookup to work (though come to think of it it may not be necessary for mmcif and sdhi).

Shouldn't clocks be specified as an attribute in DT nodes that reference the clock node ?

Quoted 2 lines

In any case, the location of the of_dev_auxdata might be come a bit tricky if it covers devices in both the board and SoC dts files.

Provide alternate board code for the kzm9g to demonstrate how DT may be used given the current state of driver device tree support. This is intended to act as a reference for mach-shmobile developers.

Some notes:

* Brings up the GIC interrupt handler using device tree
* Brings up the following devices using device tree
- ST1232 (Touchscreen)
- MMCIF (MMC)
- SDHI (MMC)
* Does not bring up the INTC interrupt controller at all, thus external devices may not be used
* Uses existing C code and not device tree to initialise the following, which are needed for a working board:
- SCIF (Serial)
- CMT (Clock)
- PFC (GPIO)

To use this alternate board code instead of the normal board code, CONFIG_MACH_KZM9G_REFERENCE should be selected in the kernel config. And the sh73a0-kzm9g-reference.dtb flattened device tree blob should be used.

Signed-off-by Simon Horman <[email protected]>

---
  arch/arm/boot/dts/Makefile                     |    3 +-
  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts   |  153 ++++++++++++++++++++++++
  arch/arm/mach-shmobile/Kconfig                 |   10 ++
  arch/arm/mach-shmobile/Makefile                |    8 +-
  arch/arm/mach-shmobile/board-kzm9g-reference.c |  142 ++++++++++++++++++++++
  5 files changed, 314 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c

arch/arm/boot/dts/Makefile +2 -1

index c1ce813..b6c4fa2 100644
@@ -75,7 +75,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
  	r8a7740-armadillo800eva.dtb \
-	sh73a0-kzm9g.dtb
+	sh73a0-kzm9g.dtb \
+	sh73a0-kzm9g-reference.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
  	spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts new file +33 -0

new file mode 100644
index 0000000..978892a
@@ -0,0 +1,153 @@
+/*
+ * Device Tree Source for the KZM-A9-GT board
+ *
+ * Copyright (C) 2012 Horms Solutions Ltd.
+ *
+ * Based on sh73a0-kzm9g.dts
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "skeleton.dtsi"
+
+/ {
+	model = "KZM-A9-GT";
+	compatible = "renesas,kzm9g-reference", "renesas,sh73a0";
+
+	memory {
+		device_type = "memory";
+		reg = <0x41000000 0x1e800000>;
+	};
+
+	gic: interrupt-controller at f0001000 {
+		compatible = "arm,cortex-a9-gic";
+		#interrupt-cells = <3>;
+		#address-cells = <1>;
+		interrupt-controller;
+		reg = <0xf0001000 0x1000>,
+		      <0xf0000100 0x100>;
+	};

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts new file +6 -0

+
+		touchscreen at 55 {
+			compatible = "sitronix,st1232";
+			reg = <0x55>;
+			interrupt-parent = <&gic>;
+			interrupts = <0 9 0x4>;

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts new file +2 -0

+			      0 190 0x4>;
+	};

Hello Simon-san,

Quoted 88 lines · Simon Horman

Provide alternate board code for the kzm9g to demonstrate how DT may be used given the current state of driver device tree support. This is intended to act as a reference for mach-shmobile developers.

Some notes:

* Brings up the GIC interrupt handler using device tree
* Brings up the following devices using device tree
- ST1232 (Touchscreen)
- MMCIF (MMC)
- SDHI (MMC)
* Does not bring up the INTC interrupt controller at all, thus external devices may not be used
* Uses existing C code and not device tree to initialise the following, which are needed for a working board:
- SCIF (Serial)
- CMT (Clock)
- PFC (GPIO)

To use this alternate board code instead of the normal board code, CONFIG_MACH_KZM9G_REFERENCE should be selected in the kernel config. And the sh73a0-kzm9g-reference.dtb flattened device tree blob should be used.

Signed-off-by Simon Horman <[email protected]>

---
  arch/arm/boot/dts/Makefile                     |    3 +-
  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts   |  153 ++++++++++++++++++++++++
  arch/arm/mach-shmobile/Kconfig                 |   10 ++
  arch/arm/mach-shmobile/Makefile                |    8 +-
  arch/arm/mach-shmobile/board-kzm9g-reference.c |  142 ++++++++++++++++++++++
  5 files changed, 314 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c

arch/arm/boot/dts/Makefile +2 -1

index c1ce813..b6c4fa2 100644
@@ -75,7 +75,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
  	r8a7740-armadillo800eva.dtb \
-	sh73a0-kzm9g.dtb
+	sh73a0-kzm9g.dtb \
+	sh73a0-kzm9g-reference.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
  	spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts new file +33 -0

new file mode 100644
index 0000000..978892a
@@ -0,0 +1,153 @@
+/*
+ * Device Tree Source for the KZM-A9-GT board
+ *
+ * Copyright (C) 2012 Horms Solutions Ltd.
+ *
+ * Based on sh73a0-kzm9g.dts
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "skeleton.dtsi"
+
+/ {
+	model = "KZM-A9-GT";
+	compatible = "renesas,kzm9g-reference", "renesas,sh73a0";
+
+	memory {
+		device_type = "memory";
+		reg = <0x41000000 0x1e800000>;
+	};
+
+	gic: interrupt-controller at f0001000 {
+		compatible = "arm,cortex-a9-gic";
+		#interrupt-cells = <3>;
+		#address-cells = <1>;
+		interrupt-controller;
+		reg = <0xf0001000 0x1000>,
+		      <0xf0000100 0x100>;
+	};

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts line 43

Quoted 10 lines

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts new file +10 -0

+
+	i2c0: i2c at 0xe6820000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,rmobile-iic";
+		reg = <0xe6820000 0x425>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 167 0x4
+			      0 170 0x4>;
+	};

I reported /dev/i2c-0 seems not working. I found the reason. About i2c0 interrupt, it should be:

interrupts = <0 167 0x4

			      0 168 0x4
			      0 169 0x4

0 170 0x4>;

The same as i2c1 - ic24. There are 4 interrupts each.

this series is a first pass at providing a refernce DT implementation for the kzm9g baord which is intended to act as a guide for mach-shmobile developers.

Hello Simon-san,

Quoted 4 lines · Simon Horman

this series is a first pass at providing a refernce DT implementation for the kzm9g baord which is intended to act as a guide for mach-shmobile developers.

I tried this patch series on v3.7-rc7 with CONFIG_MACH_KZM9G_REFERENCE=y. It boot up correctly with rootfs on SD card. It works good for following devices
- serial port on /dev/ttySC4
- SD card on /dev/mmcblk0
- micro SD card on /dev/mmcblk1
- eMMC on /dev/mmcblk2

I found /dev/i2c-0 seems not to work correctly. "i2cdump" command fails like this.

# i2cdump 0 0x40
No size specified (using byte-data access)
WARNING! This program can confuse your I2C bus, cause data loss and worse!
I will probe file /dev/i2c-0, address 0x40, mode byte
Continue? [Y/n]
     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f    0123456789abcdef
00: [  180.171875] i2c-sh_mobile i2c-sh_mobile.0: Transfer request timed out
[  180.187500] i2c-sh_mobile i2c-sh_mobile.0: Polling timed out
XX [  185.187500] i2c-sh_mobile i2c-sh_mobile.0: Transfer request timed out
[  185.203125] i2c-sh_mobile i2c-sh_mobile.0: Polling timed out
XX ^C[  190.203125] i2c-sh_mobile i2c-sh_mobile.0: Transfer request timed out
[  190.218750] i2c-sh_mobile i2c-sh_mobile.0: Polling timed out

I quited the command by ^C.
When I try the same on v3.7-rc7 without CONFIG_MACH_KZM9G_REFERENCE=y "i2cdump" command does not time out and shows some data.