Skip to contentSkip to conversation

ARM: dts: vf610: add SD node to cosmic dts

PATCH New Olof Johansson 3 participants 4 messages Nov 5, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: vf610: add SD node to cosmic dts

Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now.

---

Shawn, Stefan: This probably has some small conflicts with Stefan's patchsets that refactors some of the dts contents for 3.19. I'd like to pick this patch up as a fix for 3.18 though, since it makes my Cosmic+ board usable for the boot farm.

If that'd be OK (i.e. to apply Stefan's patches on top of this), please ack so I can include it with the next set of fixes. :)

Thanks,

-Olof

 arch/arm/boot/dts/vf610-cosmic.dts |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm/boot/dts/vf610-cosmic.dts +20 -0
index 3fd1b74..c1b8355 100644
@@ -56,6 +56,19 @@
 			>;
 		};
 
+		pinctrl_esdhc1: esdhc1grp {
+			fsl,pins = <
+				VF610_PAD_PTA24__ESDHC1_CLK	0x31ef
+				VF610_PAD_PTA25__ESDHC1_CMD	0x31ef
+				VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef
+				VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef
+				VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef
+				VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef
+				VF610_PAD_PTB28__GPIO_98	0x219d
+			>;
+		};
+
+
 		pinctrl_uart1: uart1grp {
 			fsl,pins = <
 				VF610_PAD_PTB4__UART1_TX		0x21a2
@@ -70,3 +83,10 @@
 	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";
 };
+
+&esdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_esdhc1>;
+	bus-width = <4>;
+	status = "okay";
+};
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: dts: vf610: add SD node to cosmic dts

Quoted 7 lines · Olof Johansson

Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now.

---

Quoted 7 lines

Shawn, Stefan: This probably has some small conflicts with Stefan's patchsets that refactors some of the dts contents for 3.19. I'd like to pick this patch up as a fix for 3.18 though, since it makes my Cosmic+ board usable for the boot farm.

If that'd be OK (i.e. to apply Stefan's patches on top of this), please ack so I can include it with the next set of fixes. :)

But please move esdhc1grp before fec1grp, and &esdhc1 before &fec1, so that they are sorted alphabetically.

Shawn

Quoted 46 lines

Thanks,

(quoted diff) +0 -1
-Olof
 
 arch/arm/boot/dts/vf610-cosmic.dts |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm/boot/dts/vf610-cosmic.dts +20 -0
index 3fd1b74..c1b8355 100644
@@ -56,6 +56,19 @@
 			>;
 		};
 
+		pinctrl_esdhc1: esdhc1grp {
+			fsl,pins = <
+				VF610_PAD_PTA24__ESDHC1_CLK	0x31ef
+				VF610_PAD_PTA25__ESDHC1_CMD	0x31ef
+				VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef
+				VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef
+				VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef
+				VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef
+				VF610_PAD_PTB28__GPIO_98	0x219d
+			>;
+		};
+
+
 		pinctrl_uart1: uart1grp {
 			fsl,pins = <
 				VF610_PAD_PTB4__UART1_TX		0x21a2
@@ -70,3 +83,10 @@
 	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";
 };
+
+&esdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_esdhc1>;
+	bus-width = <4>;
+	status = "okay";
+};
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/1 ARM: dts: vf610: add SD node to cosmic dts

In reply to Olof Johansson

Am 2014-11-05 07:59, schrieb Olof Johansson:

Quoted 12 lines

Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now.

---

Shawn, Stefan: This probably has some small conflicts with Stefan's patchsets that refactors some of the dts contents for 3.19. I'd like to pick this patch up as a fix for 3.18 though, since it makes my Cosmic+ board usable for the boot farm.

Quoted 6 lines

If that'd be OK (i.e. to apply Stefan's patches on top of this), please ack so I can include it with the next set of fixes. :)

Thanks,

-Olof

Same reordering complains as Shawn.

Also note that starting with 3.19, it would be possible to use card detect GPIO. However, SD-card works also fairly well without card detection.

Quoted 40 lines
 arch/arm/boot/dts/vf610-cosmic.dts |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm/boot/dts/vf610-cosmic.dts +20 -0
index 3fd1b74..c1b8355 100644
@@ -56,6 +56,19 @@
 			>;
 		};
 
+		pinctrl_esdhc1: esdhc1grp {
+			fsl,pins = <
+				VF610_PAD_PTA24__ESDHC1_CLK	0x31ef
+				VF610_PAD_PTA25__ESDHC1_CMD	0x31ef
+				VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef
+				VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef
+				VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef
+				VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef
+				VF610_PAD_PTB28__GPIO_98	0x219d
+			>;
+		};
+
+
 		pinctrl_uart1: uart1grp {
 			fsl,pins = <
 				VF610_PAD_PTB4__UART1_TX		0x21a2
@@ -70,3 +83,10 @@
 	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";
 };
+
+&esdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_esdhc1>;
+	bus-width = <4>;
+	status = "okay";
+};
#3 lore raw

PATCH 1/1 ARM: dts: vf610: add SD node to cosmic dts

Quoted 20 lines · Stefan Agner

Am 2014-11-05 07:59, schrieb Olof Johansson:

Quoted 12 lines

Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now.

---

Shawn, Stefan: This probably has some small conflicts with Stefan's patchsets that refactors some of the dts contents for 3.19. I'd like to pick this patch up as a fix for 3.18 though, since it makes my Cosmic+ board usable for the boot farm.

Quoted 6 lines

If that'd be OK (i.e. to apply Stefan's patches on top of this), please ack so I can include it with the next set of fixes. :)

Thanks,

-Olof

Quoted 7 lines

Same reordering complains as Shawn.

Also note that starting with 3.19, it would be possible to use card detect GPIO. However, SD-card works also fairly well without card detection.

Thanks, reordered entries (d'oh!) and applied to fixes with your acks.

CD gpio would be useful, in my case I always have the card attached though. I'll try to remember revisiting for that. :-)

-Olof