summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/mm.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-06 22:14:13 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-05-08 23:05:17 +0800
commitd1654b803f23a77e01ead7ab50ee3fdea931ae5a (patch)
treeaac5536f257e47ca670aad6a1476021553d764a5 /arch/arm/mach-mxs/mm.c
parenta2aa65a332b46c4e95f1226b567ff5e68bdfceac (diff)
ARM: mxs: enable pinctrl dummy states
The mxs pinctrl driver will only support DT probe. That said, the mxs device drivers can only get pinctrl state from pinctrl subsystem when the drivers get probed from device tree. Before converting the whole mxs platform support over to device tree, we need to enable pinctrl dummy states for those non-DT board files to ensure the pinctrl API adopted by mxs device drivers will work for both DT and non-DT probe. Instead of calling pinctrl_provide_dummies() directly in every board file, the patch introduces soc specific calls mx23_soc_init() and mx28_soc_init() for boards' .init_machine hook to invoke, so that any soc specific setup for non-DT boot only can be added there. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mm.c')
-rw-r--r--arch/arm/mach-mxs/mm.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mm.c b/arch/arm/mach-mxs/mm.c
index 50af5ceebf6d..67a384edcf5b 100644
--- a/arch/arm/mach-mxs/mm.c
+++ b/arch/arm/mach-mxs/mm.c
@@ -13,6 +13,7 @@
#include <linux/mm.h>
#include <linux/init.h>
+#include <linux/pinctrl/machine.h>
#include <asm/mach/map.h>
@@ -61,3 +62,13 @@ void __init mx28_init_irq(void)
{
icoll_init_irq();
}
+
+void __init mx23_soc_init(void)
+{
+ pinctrl_provide_dummies();
+}
+
+void __init mx28_soc_init(void)
+{
+ pinctrl_provide_dummies();
+}