* [PATCH 1/4] mmc: atmel-mci: add device tree support
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
@ 2012-07-24 13:30 ` ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 2/4] ARM: at91: add clocks for DT entries ludovic.desroches at atmel.com
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: ludovic.desroches at atmel.com @ 2012-07-24 13:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
.../devicetree/bindings/mmc/atmel-hsmci.txt | 68 ++++++++++++++++
drivers/mmc/host/atmel-mci.c | 85 +++++++++++++++++++-
2 files changed, 151 insertions(+), 2 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
diff --git a/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt b/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
new file mode 100644
index 0000000..0a85c70
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
@@ -0,0 +1,68 @@
+* Atmel High Speed MultiMedia Card Interface
+
+This controller on atmel products provides an interface for MMC, SD and SDIO
+types of memory cards.
+
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the atmel-mci driver.
+
+1) MCI node
+
+Required properties:
+- compatible: should be "atmel,hsmci"
+- #address-cells: should be one. The cell is the slot id.
+- #size-cells: should be zero.
+- at least one slot node
+
+The node contains child nodes for each slot that the platform uses
+
+Example MCI node:
+
+mmc0: mmc at f0008000 {
+ compatible = "atmel,hsmci";
+ reg = <0xf0008000 0x600>;
+ interrupts = <12 4>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ [ child node definitions...]
+};
+
+2) slot nodes
+
+Required properties:
+- reg: should contain the slot id.
+- bus-width: number of data lines connected to the controller
+
+Optional properties:
+- cd-gpios: specify GPIOs for card detection
+- cd-inverted: invert the value of external card detect gpio line
+- wp-gpios: specify GPIOs for write protection
+
+Example slot node:
+
+slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 15 0>
+ cd-inverted;
+};
+
+Example full MCI node:
+mmc0: mmc at f0008000 {
+ compatible = "atmel,hsmci";
+ reg = <0xf0008000 0x600>;
+ interrupts = <12 4>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 15 0>
+ cd-inverted;
+ };
+ slot at 1 {
+ reg = <1>;
+ bus-width = <4>;
+ };
+};
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index f2c115e..47421fc 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -19,6 +19,9 @@
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/scatterlist.h>
#include <linux/seq_file.h>
@@ -493,6 +496,70 @@ err:
dev_err(&mmc->class_dev, "failed to initialize debugfs for slot\n");
}
+#if defined(CONFIG_OF)
+static const struct of_device_id atmci_dt_ids[] = {
+ { .compatible = "atmel,hsmci" },
+ { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmci_dt_ids);
+
+static struct mci_platform_data __devinit*
+atmci_of_init(struct platform_device *pdev)
+{
+ struct device_node *np = pdev->dev.of_node;
+ struct device_node *cnp;
+ struct mci_platform_data *pdata;
+ u32 slot_id;
+
+ if (!np) {
+ dev_err(&pdev->dev, "device node not found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(&pdev->dev, "could not allocate memory for pdata\n");
+ return ERR_PTR(-ENOMEM);
+ }
+
+ for_each_child_of_node(np, cnp) {
+ if (of_property_read_u32(cnp, "reg", &slot_id)) {
+ dev_warn(&pdev->dev, "reg property is missing for %s\n",
+ cnp->full_name);
+ continue;
+ }
+
+ if (slot_id >= ATMCI_MAX_NR_SLOTS) {
+ dev_warn(&pdev->dev, "can't have more than %d slots\n",
+ ATMCI_MAX_NR_SLOTS);
+ break;
+ }
+
+ if (of_property_read_u32(cnp, "bus-width",
+ &pdata->slot[slot_id].bus_width))
+ pdata->slot[slot_id].bus_width = 1;
+
+ pdata->slot[slot_id].detect_pin =
+ of_get_named_gpio(cnp, "cd-gpios", 0);
+
+ pdata->slot[slot_id].detect_is_active_high =
+ of_property_read_bool(cnp, "cd-inverted");
+
+ pdata->slot[slot_id].wp_pin =
+ of_get_named_gpio(cnp, "wp-gpios", 0);
+ }
+
+ return pdata;
+}
+#else /* CONFIG_OF */
+static inline struct mci_platform_data*
+atmci_of_init(struct platform_device *dev)
+{
+ return ERR_PTR(-EINVAL);
+}
+#endif
+
static inline unsigned int atmci_get_version(struct atmel_mci *host)
{
return atmci_readl(host, ATMCI_VERSION) & 0x00000fff;
@@ -2038,6 +2105,13 @@ static int __init atmci_init_slot(struct atmel_mci *host,
slot->sdc_reg = sdc_reg;
slot->sdio_irq = sdio_irq;
+ dev_dbg(&mmc->class_dev,
+ "slot[%u]: bus_width=%u, detect_pin=%d, "
+ "detect_is_active_high=%s, wp_pin=%d\n",
+ id, slot_data->bus_width, slot_data->detect_pin,
+ slot_data->detect_is_active_high ? "true" : "false",
+ slot_data->wp_pin);
+
mmc->ops = &atmci_ops;
mmc->f_min = DIV_ROUND_UP(host->bus_hz, 512);
mmc->f_max = host->bus_hz / 2;
@@ -2258,8 +2332,14 @@ static int __init atmci_probe(struct platform_device *pdev)
if (!regs)
return -ENXIO;
pdata = pdev->dev.platform_data;
- if (!pdata)
- return -ENXIO;
+ if (!pdata) {
+ pdata = atmci_of_init(pdev);
+ if (IS_ERR(pdata)) {
+ dev_err(&pdev->dev, "platform data not available\n");
+ return PTR_ERR(pdata);
+ }
+ }
+
irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;
@@ -2477,6 +2557,7 @@ static struct platform_driver atmci_driver = {
.driver = {
.name = "atmel_mci",
.pm = ATMCI_PM_OPS,
+ .of_match_table = of_match_ptr(atmci_dt_ids),
},
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] ARM: at91: add clocks for DT entries
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 1/4] mmc: atmel-mci: add " ludovic.desroches at atmel.com
@ 2012-07-24 13:30 ` ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 3/4] ARM: dts: add nodes for atmel hsmci controllers for atmel SOCs ludovic.desroches at atmel.com
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: ludovic.desroches at atmel.com @ 2012-07-24 13:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Add clocks to clock lookup table for DT entries.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9263.c | 2 ++
arch/arm/mach-at91/at91sam9g45.c | 2 ++
arch/arm/mach-at91/at91sam9n12.c | 1 +
arch/arm/mach-at91/at91sam9x5.c | 2 ++
5 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 2b1e438..ddba004 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -226,6 +226,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t1_clk", "fffdc000.timer", &tc4_clk),
CLKDEV_CON_DEV_ID("t2_clk", "fffdc000.timer", &tc5_clk),
CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk),
/* fake hclk clock */
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
CLKDEV_CON_ID("pioA", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index ed91c7e..d7ba530 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -209,6 +209,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk),
CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "fff80000.mmc", &mmc0_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "fff84000.mmc", &mmc1_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 4792682..aa24e82 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -242,6 +242,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk),
CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "fff80000.mmc", &mmc0_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "fffd0000.mmc", &mmc1_clk),
/* fake hclk clock */
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
CLKDEV_CON_ID("pioA", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 0849466..cce4e0f 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -168,6 +168,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("usart", "f8028000.serial", &usart3_clk),
CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk),
CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc_clk),
CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
CLKDEV_CON_ID("pioA", &pioAB_clk),
CLKDEV_CON_ID("pioB", &pioAB_clk),
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 1b144b4..de86e37 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -231,6 +231,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),
CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),
CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc0_clk),
+ CLKDEV_CON_DEV_ID("mci_clk", "f000c000.mmc", &mmc1_clk),
CLKDEV_CON_ID("pioA", &pioAB_clk),
CLKDEV_CON_ID("pioB", &pioAB_clk),
CLKDEV_CON_ID("pioC", &pioCD_clk),
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] ARM: dts: add nodes for atmel hsmci controllers for atmel SOCs
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 1/4] mmc: atmel-mci: add " ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 2/4] ARM: at91: add clocks for DT entries ludovic.desroches at atmel.com
@ 2012-07-24 13:30 ` ludovic.desroches at atmel.com
2012-07-24 13:30 ` [PATCH 4/4] ARM: dts: add nodes for atmel hsmci controllers for atmel boards ludovic.desroches at atmel.com
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: ludovic.desroches at atmel.com @ 2012-07-24 13:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Add mci controller nodes to atmel SOCs.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/boot/dts/at91sam9260.dtsi | 9 +++++++++
arch/arm/boot/dts/at91sam9263.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/at91sam9g45.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/at91sam9n12.dtsi | 9 +++++++++
arch/arm/boot/dts/at91sam9x5.dtsi | 18 ++++++++++++++++++
5 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f449efc..ae54bf3 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -198,6 +198,15 @@
status = "disabled";
};
+ mmc0: mmc at fffa8000 {
+ compatible = "atmel,hsmci";
+ reg = <0xfffa800 0x600>;
+ interrupts = <9 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
adc0: adc at fffe0000 {
compatible = "atmel,at91sam9260-adc";
reg = <0xfffe0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 0209913..a327ebe 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -179,6 +179,24 @@
interrupts = <24 4>;
status = "disabled";
};
+
+ mmc0: mmc at fff80000 {
+ compatible = "atmel,hsmci";
+ reg = <0xfff80000 0x600>;
+ interrupts = <10 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
+ mmc1: mmc at fff84000 {
+ compatible = "atmel,hsmci";
+ reg = <0xfff84000 0x600>;
+ interrupts = <11 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
nand0: nand at 40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 7dbccaf..0360bf8 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -236,6 +236,24 @@
trigger-value = <0x6>;
};
};
+
+ mmc0: mmc at fff80000 {
+ compatible = "atmel,hsmci";
+ reg = <0xfff80000 0x600>;
+ interrupts = <11 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
+ mmc1: mmc at fffd0000 {
+ compatible = "atmel,hsmci";
+ reg = <0xfffd0000 0x600>;
+ interrupts = <29 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
nand0: nand at 40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index cb84de7..f3e03fb 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -82,6 +82,15 @@
reg = <0xfffffe10 0x10>;
};
+ mmc0: mmc at f0008000 {
+ compatible = "atmel,hsmci";
+ reg = <0xf0008000 0x600>;
+ interrupts = <12 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
tcb0: timer at f8008000 {
compatible = "atmel,at91sam9x5-tcb";
reg = <0xf8008000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 6b3ef43..4e8125b 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -228,6 +228,24 @@
trigger-value = <0x6>;
};
};
+
+ mmc0: mmc at f0008000 {
+ compatible = "atmel,hsmci";
+ reg = <0xf0008000 0x600>;
+ interrupts = <12 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
+ mmc1: mmc at f000c000 {
+ compatible = "atmel,hsmci";
+ reg = <0xf000c000 0x600>;
+ interrupts = <26 4>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
nand0: nand at 40000000 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] ARM: dts: add nodes for atmel hsmci controllers for atmel boards
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
` (2 preceding siblings ...)
2012-07-24 13:30 ` [PATCH 3/4] ARM: dts: add nodes for atmel hsmci controllers for atmel SOCs ludovic.desroches at atmel.com
@ 2012-07-24 13:30 ` ludovic.desroches at atmel.com
2012-07-24 16:23 ` [PATCH RESEND v5 0/4] atmel-mci device tree support Arnd Bergmann
2012-08-08 3:14 ` Chris Ball
5 siblings, 0 replies; 8+ messages in thread
From: ludovic.desroches at atmel.com @ 2012-07-24 13:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Add mci controller nodes to atmel boards.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/boot/dts/at91sam9263ek.dts | 10 ++++++++++
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | 12 ++++++++++++
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 9 +++++++++
arch/arm/boot/dts/at91sam9g25ek.dts | 18 ++++++++++++++++++
arch/arm/boot/dts/at91sam9m10g45ek.dts | 19 +++++++++++++++++++
arch/arm/boot/dts/at91sam9n12ek.dts | 9 +++++++++
6 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index f86ac4b..05028ed 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -50,6 +50,16 @@
atmel,vbus-gpio = <&pioA 25 0>;
status = "okay";
};
+
+ mmc0: mmc at fff80000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioE 18 0>;
+ wp-gpios = <&pioE 19 0>;
+ };
+ };
};
nand0: nand at 40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
index f1b2e14..684b229 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
+++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
@@ -12,6 +12,18 @@
model = "Atmel at91sam9g20ek 2 mmc";
compatible = "atmel,at91sam9g20ek_2mmc", "atmel,at91sam9g20", "atmel,at91sam9";
+ ahb {
+ apb{
+ mmc0: mmc at fffa8000 {
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioC 2 0>;
+ };
+ };
+ };
+ };
+
leds {
compatible = "gpio-leds";
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index b06c0db..7da326a 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -51,6 +51,15 @@
atmel,vbus-gpio = <&pioC 5 0>;
status = "okay";
};
+
+ mmc0: mmc at fffa8000 {
+ status = "okay";
+ slot at 1 {
+ reg = <1>;
+ bus-width = <4>;
+ cd-gpios = <&pioC 9 0>;
+ };
+ };
};
nand0: nand at 40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index 7829a4d..422a9fb 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -32,6 +32,24 @@
phy-mode = "rmii";
status = "okay";
};
+
+ mmc0: mmc at f0008000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 15 0>;
+ };
+ };
+
+ mmc1: mmc at f000c000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 14 0>;
+ };
+ };
};
usb0: ohci at 00600000 {
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index a3633bd..7a7b571 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -46,6 +46,25 @@
phy-mode = "rmii";
status = "okay";
};
+
+ mmc0: mmc at fff80000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 10 0>;
+ };
+ };
+
+ mmc1: mmc at fffd0000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioD 11 0>;
+ wp-gpios = <&pioD 29 0>;
+ };
+ };
};
nand0: nand at 40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index f4e43e3..44b42d9 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -37,6 +37,15 @@
dbgu: serial at fffff200 {
status = "okay";
};
+
+ mmc0: mmc at f0008000 {
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioA 7 0>;
+ };
+ };
};
nand0: nand at 40000000 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH RESEND v5 0/4] atmel-mci device tree support
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
` (3 preceding siblings ...)
2012-07-24 13:30 ` [PATCH 4/4] ARM: dts: add nodes for atmel hsmci controllers for atmel boards ludovic.desroches at atmel.com
@ 2012-07-24 16:23 ` Arnd Bergmann
2012-08-08 3:14 ` Chris Ball
5 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2012-07-24 16:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 24 July 2012, ludovic.desroches at atmel.com wrote:
> I resend this set of patches because patches 2, 3 and 4 were acked by
> Jean-Christophe. Patch 1 was also acked by Jean-Christophe excepted for
> cd-inverted property since it was redundant with gpio bindings.
>
> I thought we were agree to go ahead since it was a common binding already
> documented and it will concern all drivers.
I just looked at the patches for the first time, but it looks all great, so
Acked-by: Arnd Bergmann <arnd@arndb.de>
> Chris are you agree to take patch 1/4? Others patches may go to at91 tree,
> isn't it?
> By the way, I have updated documentation in patch 1/4 in the same way as you
> did with the patch 'mmc: dt: Deduplicate binding docs by referencing mmc.txt'.
> I didn't remove common properties from slot part because I think it is not
> obvious to use these properties into the slot node.
If you want to take it all through the mmc tree, that's also fine with me.
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH RESEND v5 0/4] atmel-mci device tree support
2012-07-24 13:30 [PATCH RESEND v5 0/4] atmel-mci device tree support ludovic.desroches at atmel.com
` (4 preceding siblings ...)
2012-07-24 16:23 ` [PATCH RESEND v5 0/4] atmel-mci device tree support Arnd Bergmann
@ 2012-08-08 3:14 ` Chris Ball
2012-08-09 6:32 ` ludovic.desroches
5 siblings, 1 reply; 8+ messages in thread
From: Chris Ball @ 2012-08-08 3:14 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Tue, Jul 24 2012, ludovic.desroches at atmel.com wrote:
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> Hello,
>
> I resend this set of patches because patches 2, 3 and 4 were acked by
> Jean-Christophe. Patch 1 was also acked by Jean-Christophe excepted for
> cd-inverted property since it was redundant with gpio bindings.
In future, it's helpful for me if you can add the Acked-by lines you
receive into the patches when you resend them. Thanks!
> I thought we were agree to go ahead since it was a common binding already
> documented and it will concern all drivers.
Agreed. It's a documented core MMC binding, it's fine to use it.
> Chris are you agree to take patch 1/4? Others patches may go to at91 tree,
> isn't it?
Yes, let's do that. I've applied patch 1/4 to mmc-next for 3.7, and you
can send the others via the at91 tree with the ACK that Arnd gave.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH RESEND v5 0/4] atmel-mci device tree support
2012-08-08 3:14 ` Chris Ball
@ 2012-08-09 6:32 ` ludovic.desroches
0 siblings, 0 replies; 8+ messages in thread
From: ludovic.desroches @ 2012-08-09 6:32 UTC (permalink / raw)
To: linux-arm-kernel
Le 08/08/2012 05:14 AM, Chris Ball a ?crit :
> Hi,
>
> On Tue, Jul 24 2012, ludovic.desroches at atmel.com wrote:
>> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>>
>> Hello,
>>
>> I resend this set of patches because patches 2, 3 and 4 were acked by
>> Jean-Christophe. Patch 1 was also acked by Jean-Christophe excepted for
>> cd-inverted property since it was redundant with gpio bindings.
>
> In future, it's helpful for me if you can add the Acked-by lines you
> receive into the patches when you resend them. Thanks!
>
Ok.
>> I thought we were agree to go ahead since it was a common binding already
>> documented and it will concern all drivers.
>
> Agreed. It's a documented core MMC binding, it's fine to use it.
>
>> Chris are you agree to take patch 1/4? Others patches may go to at91 tree,
>> isn't it?
>
> Yes, let's do that. I've applied patch 1/4 to mmc-next for 3.7, and you
> can send the others via the at91 tree with the ACK that Arnd gave.
Thanks Chris.
Ludovic
>
> Thanks,
>
> - Chris.
>
^ permalink raw reply [flat|nested] 8+ messages in thread