Commit b43033b1 authored by Jerome Brunet's avatar Jerome Brunet Committed by Kevin Hilman
Browse files

arm64: dts: meson: fix mmc pin bias



Clk pin does not require bias, data strobe should be pulled low.
The rest of the pin (data and cmd) are pulled up.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent ffab3fd6
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -482,8 +482,8 @@

/* emmc storage */
&sd_emmc_c {
	status = "disabled";
	pinctrl-0 = <&emmc_pins>;
	status = "okay";
	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
	pinctrl-1 = <&emmc_clk_gate_pins>;
	pinctrl-names = "default", "clk-gate";

+24 −7
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@
				};

				emmc_pins: emmc {
					mux {
					mux-0 {
						groups = "emmc_nand_d0",
							 "emmc_nand_d1",
							 "emmc_nand_d2",
@@ -308,14 +308,26 @@
							 "emmc_nand_d5",
							 "emmc_nand_d6",
							 "emmc_nand_d7",
							 "emmc_clk",
							 "emmc_cmd",
							 "emmc_ds";
							 "emmc_cmd";
						function = "emmc";
						bias-pull-up;
					};

					mux-1 {
						groups = "emmc_clk";
						function = "emmc";
						bias-disable;
					};
				};

				emmc_ds_pins: emmc_ds {
					mux {
						groups = "emmc_ds";
						function = "emmc";
						bias-pull-down;
					};
				};

				emmc_clk_gate_pins: emmc_clk_gate {
					mux {
						groups = "BOOT_8";
@@ -559,13 +571,18 @@
				};

				sdio_pins: sdio {
					mux {
					mux-0 {
						groups = "sdio_d0",
							 "sdio_d1",
							 "sdio_d2",
							 "sdio_d3",
							 "sdio_cmd",
							 "sdio_clk";
							 "sdio_cmd";
						function = "sdio";
						bias-pull-up;
					};

					mux-1 {
						groups = "sdio_clk";
						function = "sdio";
						bias-disable;
					};
+25 −10
Original line number Diff line number Diff line
@@ -381,10 +381,15 @@
		};

		emmc_pins: emmc {
			mux {
			mux-0 {
				groups = "emmc_nand_d07",
				       "emmc_cmd",
				       "emmc_clk";
				       "emmc_cmd";
				function = "emmc";
				bias-pull-up;
			};

			mux-1 {
				groups = "emmc_clk";
				function = "emmc";
				bias-disable;
			};
@@ -394,7 +399,7 @@
			mux {
				groups = "emmc_ds";
				function = "emmc";
				bias-disable;
				bias-pull-down;
			};
		};

@@ -436,13 +441,18 @@
		};

		sdcard_pins: sdcard {
			mux {
			mux-0 {
				groups = "sdcard_d0",
				       "sdcard_d1",
				       "sdcard_d2",
				       "sdcard_d3",
				       "sdcard_cmd",
				       "sdcard_clk";
				       "sdcard_cmd";
				function = "sdcard";
				bias-pull-up;
			};

			mux-1 {
				groups = "sdcard_clk";
				function = "sdcard";
				bias-disable;
			};
@@ -457,13 +467,18 @@
		};

		sdio_pins: sdio {
			mux {
			mux-0 {
				groups = "sdio_d0",
				       "sdio_d1",
				       "sdio_d2",
				       "sdio_d3",
				       "sdio_cmd",
				       "sdio_clk";
				       "sdio_cmd";
				function = "sdio";
				bias-pull-up;
			};

			mux-1 {
				groups = "sdio_clk";
				function = "sdio";
				bias-disable;
			};
+25 −10
Original line number Diff line number Diff line
@@ -326,10 +326,15 @@
		};

		emmc_pins: emmc {
			mux {
			mux-0 {
				groups = "emmc_nand_d07",
				       "emmc_cmd",
				       "emmc_clk";
				       "emmc_cmd";
				function = "emmc";
				bias-pull-up;
			};

			mux-1 {
				groups = "emmc_clk";
				function = "emmc";
				bias-disable;
			};
@@ -339,7 +344,7 @@
			mux {
				groups = "emmc_ds";
				function = "emmc";
				bias-disable;
				bias-pull-down;
			};
		};

@@ -381,13 +386,18 @@
		};

		sdcard_pins: sdcard {
			mux {
			mux-0 {
				groups = "sdcard_d0",
				       "sdcard_d1",
				       "sdcard_d2",
				       "sdcard_d3",
				       "sdcard_cmd",
				       "sdcard_clk";
				       "sdcard_cmd";
				function = "sdcard";
				bias-pull-up;
			};

			mux-1 {
				groups = "sdcard_clk";
				function = "sdcard";
				bias-disable;
			};
@@ -402,13 +412,18 @@
		};

		sdio_pins: sdio {
			mux {
			mux-0 {
				groups = "sdio_d0",
				       "sdio_d1",
				       "sdio_d2",
				       "sdio_d3",
				       "sdio_cmd",
				       "sdio_clk";
				       "sdio_cmd";
				function = "sdio";
				bias-pull-up;
			};

			mux-1 {
				groups = "sdio_clk";
				function = "sdio";
				bias-disable;
			};