diff --git a/[refs] b/[refs] index a6efcaebb08f..72177aefe43f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 072480426ba9b5a0d68d91006fdb07fd568ef6ad +refs/heads/master: 1a60a4de8be4f8cf17f5d36c2642153b9a95184a diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index e4aa08217260..1afdc67a5f22 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -108,6 +108,8 @@ config SOC_IMX53 select ARCH_MX5 select ARCH_MX53 select HAVE_CAN_FLEXCAN if CAN + select PINCTRL + select PINCTRL_IMX53 if ARCH_IMX_V4_V5 diff --git a/trunk/arch/arm/mach-imx/imx53-dt.c b/trunk/arch/arm/mach-imx/imx53-dt.c index d193d8f1334f..21fcbd0e3081 100644 --- a/trunk/arch/arm/mach-imx/imx53-dt.c +++ b/trunk/arch/arm/mach-imx/imx53-dt.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -78,8 +77,6 @@ static void __init imx53_dt_init(void) const struct of_device_id *of_id; void (*func)(void); - pinctrl_provide_dummies(); - node = of_find_matching_node(NULL, imx53_iomuxc_of_match); if (node) { of_id = of_match_node(imx53_iomuxc_of_match, node);