Commit 199e2ede authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

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



Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent d4fe9ac7

arch/arm/boot/dts/at91sam9263ek.dts

+15 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ usb1: gadget@fff78000 { 
			};



			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 @@ slot@0 { 
					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 {

arch/arm/boot/dts/at91sam9g20ek_2mmc.dts

+14 −0
Original line number Diff line number Diff line
@@ -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 */

					};

				};

			};

		};

	};

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ usb1: gadget@fffa4000 { 
			};



			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 @@ slot@1 { 
					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 {

arch/arm/boot/dts/at91sam9m10g45ek.dts

+25 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ i2c1: i2c@fff88000 { 
			};



			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 @@ slot@0 { 
			};



			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 @@ slot@0 { 
					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 {

arch/arm/boot/dts/at91sam9n12ek.dts

+13 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ i2c1: i2c@f8014000 { 
			};



			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 @@ slot@0 { 
					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 {