Commit ab36be66 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman

ARM64: dts: meson-gxl: Take eMMC data strobe out of eMMC pins

Since the Data Strobe pin is optional, take it out of the default
eMMC pins and add a separate entry.
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Tested-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 1d70eaad
...@@ -213,7 +213,7 @@ &sd_emmc_b { ...@@ -213,7 +213,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -302,7 +302,7 @@ &sd_emmc_b { ...@@ -302,7 +302,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "disabled"; status = "disabled";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -272,7 +272,7 @@ &sd_emmc_b { ...@@ -272,7 +272,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -271,7 +271,7 @@ &sd_emmc_b { ...@@ -271,7 +271,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -242,7 +242,7 @@ &sd_emmc_b { ...@@ -242,7 +242,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -199,7 +199,7 @@ &sd_emmc_b { ...@@ -199,7 +199,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -386,8 +386,14 @@ emmc_pins: emmc { ...@@ -386,8 +386,14 @@ emmc_pins: emmc {
mux { mux {
groups = "emmc_nand_d07", groups = "emmc_nand_d07",
"emmc_cmd", "emmc_cmd",
"emmc_clk", "emmc_clk";
"emmc_ds"; function = "emmc";
};
};
emmc_ds_pins: emmc-ds {
mux {
groups = "emmc_ds";
function = "emmc"; function = "emmc";
}; };
}; };
......
...@@ -141,7 +141,7 @@ &sd_emmc_b { ...@@ -141,7 +141,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -238,7 +238,7 @@ &sd_emmc_b { ...@@ -238,7 +238,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -229,7 +229,7 @@ &sd_emmc_b { ...@@ -229,7 +229,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -135,7 +135,7 @@ &sd_emmc_b { ...@@ -135,7 +135,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -275,8 +275,14 @@ emmc_pins: emmc { ...@@ -275,8 +275,14 @@ emmc_pins: emmc {
mux { mux {
groups = "emmc_nand_d07", groups = "emmc_nand_d07",
"emmc_cmd", "emmc_cmd",
"emmc_clk", "emmc_clk";
"emmc_ds"; function = "emmc";
};
};
emmc_ds_pins: emmc-ds {
mux {
groups = "emmc_ds";
function = "emmc"; function = "emmc";
}; };
}; };
......
...@@ -193,7 +193,7 @@ &sd_emmc_b { ...@@ -193,7 +193,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate"; pinctrl-names = "default", "clk-gate";
......
...@@ -216,7 +216,7 @@ &sd_emmc_b { ...@@ -216,7 +216,7 @@ &sd_emmc_b {
/* eMMC */ /* eMMC */
&sd_emmc_c { &sd_emmc_c {
status = "okay"; status = "okay";
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
bus-width = <8>; bus-width = <8>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment