summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@nxp.com>2016-01-19 11:30:03 +0800
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit58fc0e8eb25cdc17283272b3863c903091737066 (patch)
tree268628e5ab40907f78933225d56c0bef22332ea3
parent67a22ba638c84759f5cfc8f51538d697633abffc (diff)
MLK-12170-3 dts: imx7d: move uSDHC fsl,tuning-step property into SoC.dtsi
Moving fsl,tuning-step property into SoC.dtsi due to it's mainly SoC dependant. User could also overwrite it in board.dts for special board requirment. Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts3
-rw-r--r--arch/arm/boot/dts/imx7s.dtsi3
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index fa96b843e189..fe5cde308bfb 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -971,7 +971,6 @@
wp-gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend;
enable-sdio-wakeup;
- fsl,tuning-step = <2>;
vmmc-supply = <&reg_sd2_vmmc>;
status = "disabled";
};
@@ -985,7 +984,6 @@
assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
assigned-clock-rates = <400000000>;
bus-width = <8>;
- fsl,tuning-step = <2>;
non-removable;
keep-power-in-suspend;
status = "disabled";
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index d9dcc2bd6f92..e0d881875883 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -761,7 +761,6 @@
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
wakeup-source;
- fsl,tuning-step = <2>;
vmmc-supply = <&reg_sd1_vmmc>;
enable-sdio-wakeup;
keep-power-in-suspend;
@@ -775,7 +774,6 @@
pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
enable-sdio-wakeup;
keep-power-in-suspend;
- fsl,tuning-step = <2>;
wifi-host;
status = "okay";
};
@@ -788,7 +786,6 @@
assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
assigned-clock-rates = <400000000>;
bus-width = <8>;
- fsl,tuning-step = <2>;
non-removable;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index b565aa19cdb5..be7d5b037fff 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -932,6 +932,7 @@
<&clks IMX7D_USDHC1_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
fsl,tuning-start-tap = <20>;
+ fsl,tuning-step= <2>;
bus-width = <4>;
status = "disabled";
};
@@ -945,6 +946,7 @@
<&clks IMX7D_USDHC2_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
fsl,tuning-start-tap = <20>;
+ fsl,tuning-step= <2>;
bus-width = <4>;
status = "disabled";
};
@@ -958,6 +960,7 @@
<&clks IMX7D_USDHC3_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
fsl,tuning-start-tap = <20>;
+ fsl,tuning-step= <2>;
bus-width = <4>;
status = "disabled";
};