---

yaml --- r: 355376 b: refs/heads/master c: 881023d h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · eadaf77 · eadaf77
1 parent 493e7b0
commit eadaf77
Show file tree

Hide file tree

Showing 6 changed files with 2,634 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5b1521a94659167e77616368fe6e7c9b3aa1733
+refs/heads/master: 881023d28b465eb457067dc8bbca0f24d8b34279
diff --git a/trunk/drivers/pinctrl/sh-pfc/Kconfig b/trunk/drivers/pinctrl/sh-pfc/Kconfig
@@ -26,4 +26,9 @@ config PINCTRL_PFC_R8A7740
 	depends on ARCH_R8A7740
 	select PINCTRL_SH_PFC
 
+config PINCTRL_PFC_R8A7779
+	def_bool y
+	depends on ARCH_R8A7779
+	select PINCTRL_SH_PFC
+
 endif
diff --git a/trunk/drivers/pinctrl/sh-pfc/Makefile b/trunk/drivers/pinctrl/sh-pfc/Makefile
@@ -4,3 +4,4 @@ sh-pfc-objs			+= gpio.o
 endif
 obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc.o
 obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o
+obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -558,6 +558,9 @@ static int sh_pfc_remove(struct platform_device *pdev)
 static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_R8A7740
 	{ "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
+#endif
+#ifdef CONFIG_PINCTRL_PFC_R8A7779
+	{ "pfc-r8a7779", (kernel_ulong_t)&r8a7779_pinmux_info },
 #endif
 	{ "sh-pfc", 0 },
 	{ },

diff --git a/trunk/drivers/pinctrl/sh-pfc/core.h b/trunk/drivers/pinctrl/sh-pfc/core.h
@@ -52,5 +52,6 @@ int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,
 		       int cfg_mode);
 
 extern struct sh_pfc_soc_info r8a7740_pinmux_info;
+extern struct sh_pfc_soc_info r8a7779_pinmux_info;
 
 #endif /* __SH_PFC_CORE_H__ */