---

yaml --- r: 355380 b: refs/heads/master c: a8d42fc h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 7cec6bf · 7cec6bf
1 parent f719e14
commit 7cec6bf
Show file tree

Hide file tree

Showing 6 changed files with 2,142 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccda552eb168590fb35ef840b295014e11721ad5
+refs/heads/master: a8d42fc4217b1ea18f34a6676a60ddcc34248f44
diff --git a/trunk/drivers/pinctrl/sh-pfc/Kconfig b/trunk/drivers/pinctrl/sh-pfc/Kconfig
@@ -37,6 +37,12 @@ config PINCTRL_PFC_SH7203
 	depends on GENERIC_GPIO
 	select PINCTRL_SH_PFC
 
+config PINCTRL_PFC_SH7264
+	def_bool y
+	depends on CPU_SUBTYPE_SH7264
+	depends on GENERIC_GPIO
+	select PINCTRL_SH_PFC
+
 config PINCTRL_PFC_SH7372
 	def_bool y
 	depends on ARCH_SH7372

diff --git a/trunk/drivers/pinctrl/sh-pfc/Makefile b/trunk/drivers/pinctrl/sh-pfc/Makefile
@@ -6,5 +6,6 @@ obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc.o
 obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o
 obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o
 obj-$(CONFIG_PINCTRL_PFC_SH7203)	+= pfc-sh7203.o
+obj-$(CONFIG_PINCTRL_PFC_SH7264)	+= pfc-sh7264.o
 obj-$(CONFIG_PINCTRL_PFC_SH7372)	+= pfc-sh7372.o
 obj-$(CONFIG_PINCTRL_PFC_SH73A0)	+= pfc-sh73a0.o
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -565,6 +565,9 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_SH7203
 	{ "pfc-sh7203", (kernel_ulong_t)&sh7203_pinmux_info },
 #endif
+#ifdef CONFIG_PINCTRL_PFC_SH7264
+	{ "pfc-sh7264", (kernel_ulong_t)&sh7264_pinmux_info },
+#endif
 #ifdef CONFIG_PINCTRL_PFC_SH7372
 	{ "pfc-sh7372", (kernel_ulong_t)&sh7372_pinmux_info },
 #endif

diff --git a/trunk/drivers/pinctrl/sh-pfc/core.h b/trunk/drivers/pinctrl/sh-pfc/core.h
@@ -54,6 +54,7 @@ int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,
 extern struct sh_pfc_soc_info r8a7740_pinmux_info;
 extern struct sh_pfc_soc_info r8a7779_pinmux_info;
 extern struct sh_pfc_soc_info sh7203_pinmux_info;
+extern struct sh_pfc_soc_info sh7264_pinmux_info;
 extern struct sh_pfc_soc_info sh7372_pinmux_info;
 extern struct sh_pfc_soc_info sh73a0_pinmux_info;