Browse Source

ARM: at91: dt: add mmc pinctrl for Atmel reference boards

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD 12 years ago
parent
commit
199e2edec4

+ 15 - 0
arch/arm/boot/dts/at91sam9263ek.dts

@@ -56,6 +56,11 @@
 			};
 
 			mmc0: mmc@fff80000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc0_clk
+					&pinctrl_mmc0_slot0_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -64,6 +69,16 @@
 					wp-gpios = <&pioE 19 0>;
 				};
 			};
+
+			pinctrl@fffff200 {
+				mmc0 {
+					pinctrl_board_mmc0: mmc0-board {
+						atmel,pins =
+							<5 18 0x0 0x5	/* PE18 gpio CD pin pull up and deglitch */
+							 5 19 0x0 0x1>;	/* PE19 gpio WP pin pull up */
+					};
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

+ 14 - 0
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts

@@ -15,12 +15,26 @@
 	ahb {
 		apb{
 			mmc0: mmc@fffa8000 {
+				/* clk already mux wuth slot0 */
+				pinctrl-0 = <
+					&pinctrl_board_mmc0_slot0
+					&pinctrl_mmc0_slot0_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
 				slot@0 {
 					reg = <0>;
 					bus-width = <4>;
 					cd-gpios = <&pioC 2 0>;
 				};
 			};
+
+			pinctrl@fffff400 {
+				mmc0_slot0 {
+					pinctrl_board_mmc0_slot0: mmc0_slot0-board {
+						atmel,pins =
+							<2 2 0x0 0x5>;	/* PC2 gpio CD pin pull up and deglitch */
+					};
+				};
+			};
 		};
 	};
 

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

@@ -60,6 +60,11 @@
 			};
 
 			mmc0: mmc@fffa8000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0_slot1
+					&pinctrl_mmc0_clk
+					&pinctrl_mmc0_slot1_cmd_dat0
+					&pinctrl_mmc0_slot1_dat1_3>;
 				status = "okay";
 				slot@1 {
 					reg = <1>;
@@ -67,6 +72,15 @@
 					cd-gpios = <&pioC 9 0>;
 				};
 			};
+
+			pinctrl@fffff400 {
+				mmc0_slot1 {
+					pinctrl_board_mmc0_slot1: mmc0_slot1-board {
+						atmel,pins =
+							<2 9 0x0 0x5>;	/* PC9 gpio CD pin pull up and deglitch */
+					};
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

+ 25 - 0
arch/arm/boot/dts/at91sam9m10g45ek.dts

@@ -60,6 +60,10 @@
 			};
 
 			mmc0: mmc@fff80000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc0_slot0_clk_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -69,6 +73,10 @@
 			};
 
 			mmc1: mmc@fffd0000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc1
+					&pinctrl_mmc1_slot0_clk_cmd_dat0
+					&pinctrl_mmc1_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -77,6 +85,23 @@
 					wp-gpios = <&pioD 29 0>;
 				};
 			};
+
+			pinctrl@fffff200 {
+				mmc0 {
+					pinctrl_board_mmc0: mmc0-board {
+						atmel,pins =
+							<3 10 0x0 0x5>;	/* PD10 gpio CD pin pull up and deglitch */
+					};
+				};
+
+				mmc1 {
+					pinctrl_board_mmc1: mmc1-board {
+						atmel,pins =
+							<3 11 0x0 0x5	/* PD11 gpio CD pin pull up and deglitch */
+							 3 29 0x0 0x1>;	/* PD29 gpio WP pin pull up */
+					};
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

+ 13 - 0
arch/arm/boot/dts/at91sam9n12ek.dts

@@ -47,6 +47,10 @@
 			};
 
 			mmc0: mmc@f0008000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc0_slot0_clk_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -54,6 +58,15 @@
 					cd-gpios = <&pioA 7 0>;
 				};
 			};
+
+			pinctrl@fffff400 {
+				mmc0 {
+					pinctrl_board_mmc0: mmc0-board {
+						atmel,pins =
+							<0 7 0x0 0x5>;	/* PA7 gpio CD pin pull up and deglitch */
+					};
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

+ 24 - 0
arch/arm/boot/dts/at91sam9x5ek.dtsi

@@ -19,6 +19,10 @@
 	ahb {
 		apb {
 			mmc0: mmc@f0008000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc0_slot0_clk_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -28,6 +32,10 @@
 			};
 
 			mmc1: mmc@f000c000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc1
+					&pinctrl_mmc1_slot0_clk_cmd_dat0
+					&pinctrl_mmc1_slot0_dat1_3>;
 				status = "okay";
 				slot@0 {
 					reg = <0>;
@@ -60,6 +68,22 @@
 			i2c2: i2c@f8018000 {
 				status = "okay";
 			};
+
+			pinctrl@fffff400 {
+				mmc0 {
+					pinctrl_board_mmc0: mmc0-board {
+						atmel,pins =
+							<3 15 0x0 0x5>;	/* PD15 gpio CD pin pull up and deglitch */
+					};
+				};
+
+				mmc1 {
+					pinctrl_board_mmc1: mmc1-board {
+						atmel,pins =
+							<3 14 0x0 0x5>;	/* PD14 gpio CD pin pull up and deglitch */
+					};
+				};
+			};
 		};
 
 		usb0: ohci@00600000 {