diff options
| author | Anson Huang <Anson.Huang@nxp.com> | 2016-11-29 21:45:48 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:25:18 +0800 |
| commit | e33e9ed420b8999b8cf1bdc88347e98cae84d4bb (patch) | |
| tree | 2a693a402428ac1260f1ffde0d764871fa691f28 /arch | |
| parent | 8a990bd07b50c780ca25cb058756fb642c6e2e33 (diff) | |
MLK-13534-1 ARM: dts: imx7ulp: add usdhc1 node
There are 2 usdhc instances on i.MX7ULP, previous
usdhc1 should be usdhc0, now add the correct usdhc1 node.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk-emmc.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 10 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp.dtsi | 14 |
3 files changed, 21 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx7ulp-evk-emmc.dts b/arch/arm/boot/dts/imx7ulp-evk-emmc.dts index 4f667b83a978..e58616e71b17 100644 --- a/arch/arm/boot/dts/imx7ulp-evk-emmc.dts +++ b/arch/arm/boot/dts/imx7ulp-evk-emmc.dts @@ -8,10 +8,10 @@ #include "imx7ulp-evk.dts" -&usdhc1 { +&usdhc0 { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1_8bit>; - pinctrl-1 = <&pinctrl_usdhc1_8bit>; + pinctrl-0 = <&pinctrl_usdhc0_8bit>; + pinctrl-1 = <&pinctrl_usdhc0_8bit>; non-removable; bus-width = <8>; status = "okay"; diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts index 710bc35b4ece..cdd25bacd486 100644 --- a/arch/arm/boot/dts/imx7ulp-evk.dts +++ b/arch/arm/boot/dts/imx7ulp-evk.dts @@ -37,7 +37,7 @@ >; }; - pinctrl_usdhc1: usdhc1grp { + pinctrl_usdhc0: usdhc0grp { fsl,pins = < IMX7ULP_PAD_PTD1__SDHC0_CMD 0x843 IMX7ULP_PAD_PTD2__SDHC0_CLK 0x843 @@ -48,7 +48,7 @@ >; }; - pinctrl_usdhc1_8bit: usdhc1grp_8bit { + pinctrl_usdhc0_8bit: usdhc0grp_8bit { fsl,pins = < IMX7ULP_PAD_PTD1__SDHC0_CMD 0x843 IMX7ULP_PAD_PTD2__SDHC0_CLK 0x843 @@ -101,10 +101,10 @@ }; }; -&usdhc1 { +&usdhc0 { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1>; + pinctrl-0 = <&pinctrl_usdhc0>; + pinctrl-1 = <&pinctrl_usdhc0>; non-removable; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi index 39526a1bedaf..840295b998da 100644 --- a/arch/arm/boot/dts/imx7ulp.dtsi +++ b/arch/arm/boot/dts/imx7ulp.dtsi @@ -292,7 +292,7 @@ nxp,sim = <&sim>; }; - usdhc1: usdhc@40370000 { + usdhc0: usdhc@40370000 { compatible = "fsl,imx7ulp-usdhc"; reg = <0x40370000 0x10000>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; @@ -304,6 +304,18 @@ status = "disabled"; }; + usdhc1: usdhc@40380000 { + compatible = "fsl,imx7ulp-usdhc"; + reg = <0x40380000 0x10000>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX7ULP_CLK_NIC1_BUS_DIV>, + <&clks IMX7ULP_CLK_NIC1_DIV>, + <&clks IMX7ULP_CLK_USDHC1>; + clock-names ="ipg", "ahb", "per"; + bus-width = <4>; + status = "disabled"; + }; + wdog1: wdog@403D0000 { compatible = "fsl,imx7ulp-wdt"; reg = <0x403D0000 0x10000>; |