diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2016-01-19 11:30:03 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2016-01-19 16:38:25 +0800 |
| commit | 12fa5a541f12dc8166d75ce154f5567a924b6248 (patch) | |
| tree | 2078d6523ee32bc4a467fadef1e192b6dbdb7c97 | |
| parent | 7352201745e8793b045d63deb5a3329fef4898ab (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.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d.dtsi | 3 |
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 7a6622b10c43..63a840bf1763 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 = <®_sd2_vmmc>; status = "okay"; }; @@ -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 = "okay"; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index f0e3c7eb3066..3270267ab17a 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -1138,7 +1138,6 @@ pinctrl-2 = <&pinctrl_usdhc1_200mhz>, <&pinctrl_usdhc1_gpio>; cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; - fsl,tuning-step = <2>; vmmc-supply = <®_sd1_vmmc>; enable-sdio-wakeup; keep-power-in-suspend; @@ -1152,7 +1151,6 @@ pinctrl-2 = <&pinctrl_usdhc2_200mhz>; enable-sdio-wakeup; keep-power-in-suspend; - fsl,tuning-step = <2>; wifi-host; status = "okay"; }; @@ -1165,7 +1163,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/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index be5fc9f38581..a6fc3f0bcabe 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -1287,6 +1287,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"; }; @@ -1300,6 +1301,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"; }; @@ -1313,6 +1315,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"; }; |