From b837d7a5b1debc506273d235f83540d3e7fa0ec8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 26 Sep 2018 17:12:08 +0200 Subject: ARM: dts: imx6ull-colibri-aster: Follow pinctrl naming from mainline While at it, add the dtbs for Aster Carrier Board to the Makefile. Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi') diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 5b9c8a77899c..9e4ab529c0f5 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -322,10 +322,10 @@ &usdhc1 { #ifdef SD_1_8 pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_cd_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_cd_usdhc1>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_cd_usdhc1>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_cd_usdhc1_sleep>; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; vqmmc-supply = <®_sd1_vmmc>; #else pinctrl-names = "default"; -- cgit v1.2.3