From 91b19696a3cbe27a7241bc7510862e213d7fe60b Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Tue, 25 Aug 2015 14:25:22 +0800 Subject: MLK-11415: ARM: dts: fix the pinctrl conflict on i.MX7D 12x12 lpddr3 ARM2 board Signed-off-by: Robin Gong Signed-off-by: Han Xu 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 --- arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts') diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts index f1d36ce65119..9b0d6350b0ea 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts @@ -21,9 +21,7 @@ }; &iomuxc { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_headphone_det>; - pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect>; + pinctrl-0 = <&pinctrl_hog_1>; }; &sai1 { -- cgit v1.2.3