---

yaml --- r: 355390 b: refs/heads/master c: d5d9a81 h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 125f3a0 · 125f3a0
1 parent e9e9258
commit 125f3a0
Show file tree

Hide file tree

Showing 6 changed files with 593 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2a31bddbdae8c3ac43c48a865f935fcb7c65190
+refs/heads/master: d5d9a818b857346a321f52f3be050fdb7aeb6200
diff --git a/trunk/drivers/pinctrl/sh-pfc/Kconfig b/trunk/drivers/pinctrl/sh-pfc/Kconfig
@@ -107,4 +107,10 @@ config PINCTRL_PFC_SH7786
 	depends on GENERIC_GPIO
 	select PINCTRL_SH_PFC
 
+config PINCTRL_PFC_SHX3
+	def_bool y
+	depends on CPU_SUBTYPE_SHX3
+	depends on GENERIC_GPIO
+	select PINCTRL_SH_PFC
+
 endif
diff --git a/trunk/drivers/pinctrl/sh-pfc/Makefile b/trunk/drivers/pinctrl/sh-pfc/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_PINCTRL_PFC_SH7734)	+= pfc-sh7734.o
 obj-$(CONFIG_PINCTRL_PFC_SH7757)	+= pfc-sh7757.o
 obj-$(CONFIG_PINCTRL_PFC_SH7785)	+= pfc-sh7785.o
 obj-$(CONFIG_PINCTRL_PFC_SH7786)	+= pfc-sh7786.o
+obj-$(CONFIG_PINCTRL_PFC_SHX3)		+= pfc-shx3.o
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -600,6 +600,9 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7786
 	{ "pfc-sh7786", (kernel_ulong_t)&sh7786_pinmux_info },
+#endif
+#ifdef CONFIG_PINCTRL_PFC_SHX3
+	{ "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info },
 #endif
 	{ "sh-pfc", 0 },
 	{ },

diff --git a/trunk/drivers/pinctrl/sh-pfc/core.h b/trunk/drivers/pinctrl/sh-pfc/core.h
@@ -66,5 +66,6 @@ extern struct sh_pfc_soc_info sh7734_pinmux_info;
 extern struct sh_pfc_soc_info sh7757_pinmux_info;
 extern struct sh_pfc_soc_info sh7785_pinmux_info;
 extern struct sh_pfc_soc_info sh7786_pinmux_info;
+extern struct sh_pfc_soc_info shx3_pinmux_info;
 
 #endif /* __SH_PFC_CORE_H__ */