diff options
| author | Robin Gong <b38343@freescale.com> | 2015-08-25 14:25:22 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:38 +0800 |
| commit | 91b19696a3cbe27a7241bc7510862e213d7fe60b (patch) | |
| tree | 60f126b11036632882572a9f0c248b371d4a869e /arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | |
| parent | 3b291849f1f9d2967e2b8bb626550cecbcc5d23a (diff) | |
MLK-11415: ARM: dts: fix the pinctrl conflict on i.MX7D 12x12 lpddr3 ARM2 board
Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Han Xu <b45815@freescale.com>
Also squashed the following:
MLK-11409-1: ARM: dts: imx7d-12x12-lpddr3-arm2.dts
Restore pinhogs after exit from lpsr mode.
It otherwise didn't build
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts index c07a113bba97..d1235249de21 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts @@ -423,8 +423,9 @@ }; &iomuxc { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>; + pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>; imx7d-12x12-lpddr3-arm2 { |