---

yaml --- r: 355386 b: refs/heads/master c: ac1ebc2 h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 6be1e05 · 6be1e05
1 parent 3bb9544
commit 6be1e05
Show file tree

Hide file tree

Showing 6 changed files with 2,486 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ff25baba0386ce9de32b90b5116f1a14a4224b8
+refs/heads/master: ac1ebc2190f575fce6685941f5eeecac808ba467
diff --git a/trunk/drivers/pinctrl/sh-pfc/Kconfig b/trunk/drivers/pinctrl/sh-pfc/Kconfig
@@ -83,4 +83,10 @@ config PINCTRL_PFC_SH7724
 	depends on GENERIC_GPIO
 	select PINCTRL_SH_PFC
 
+config PINCTRL_PFC_SH7734
+	def_bool y
+	depends on CPU_SUBTYPE_SH7734
+	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
@@ -14,3 +14,4 @@ obj-$(CONFIG_PINCTRL_PFC_SH7720)	+= pfc-sh7720.o
 obj-$(CONFIG_PINCTRL_PFC_SH7722)	+= pfc-sh7722.o
 obj-$(CONFIG_PINCTRL_PFC_SH7723)	+= pfc-sh7723.o
 obj-$(CONFIG_PINCTRL_PFC_SH7724)	+= pfc-sh7724.o
+obj-$(CONFIG_PINCTRL_PFC_SH7734)	+= pfc-sh7734.o
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -588,6 +588,9 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7724
 	{ "pfc-sh7724", (kernel_ulong_t)&sh7724_pinmux_info },
+#endif
+#ifdef CONFIG_PINCTRL_PFC_SH7734
+	{ "pfc-sh7734", (kernel_ulong_t)&sh7734_pinmux_info },
 #endif
 	{ "sh-pfc", 0 },
 	{ },

diff --git a/trunk/drivers/pinctrl/sh-pfc/core.h b/trunk/drivers/pinctrl/sh-pfc/core.h
@@ -62,5 +62,6 @@ extern struct sh_pfc_soc_info sh7720_pinmux_info;
 extern struct sh_pfc_soc_info sh7722_pinmux_info;
 extern struct sh_pfc_soc_info sh7723_pinmux_info;
 extern struct sh_pfc_soc_info sh7724_pinmux_info;
+extern struct sh_pfc_soc_info sh7734_pinmux_info;
 
 #endif /* __SH_PFC_CORE_H__ */