From 577a7e81d8ef52824c9fc781f92135cba5696545 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 (cherry picked from commit 48d236e07b708f9cf9332d568f4ef02b8bbd31d6) --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/imx6ull-colibri.dtsi') diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 17a28fdfd5d2..d4a388645278 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -651,7 +651,7 @@ >; }; - pinctrl_snvs_cd_usdhc1_sleep: snvs-usdhc1-cd-grp-slp { + pinctrl_snvs_usdhc1_cd_sleep: snvs-usdhc1-cd-slp-grp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0 >; -- cgit v1.2.3