---

yaml --- r: 355375 b: refs/heads/master c: d5b1521 h: refs/heads/master i: 355373: 386c741 355371: 9fb6acf 355367: 3fa22c6 355359: 627ab6c v: v3
git-mirror · Jan 25, 2013 · 493e7b0 · 493e7b0
1 parent 36480d1
commit 493e7b0
Show file tree

Hide file tree

Showing 6 changed files with 2,623 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19bb7fe36950ff74ce322cc29f6f4e025999f1f0
+refs/heads/master: d5b1521a94659167e77616368fe6e7c9b3aa1733
diff --git a/trunk/drivers/pinctrl/sh-pfc/Kconfig b/trunk/drivers/pinctrl/sh-pfc/Kconfig
@@ -21,4 +21,9 @@ config GPIO_SH_PFC
 	  This enables support for GPIOs within the SoC's pin function
 	  controller.
 
+config PINCTRL_PFC_R8A7740
+	def_bool y
+	depends on ARCH_R8A7740
+	select PINCTRL_SH_PFC
+
 endif
diff --git a/trunk/drivers/pinctrl/sh-pfc/Makefile b/trunk/drivers/pinctrl/sh-pfc/Makefile
@@ -3,3 +3,4 @@ ifeq ($(CONFIG_GPIO_SH_PFC),y)
 sh-pfc-objs			+= gpio.o
 endif
 obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc.o
+obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -556,6 +556,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
 	{ "sh-pfc", 0 },
 	{ },
 };

diff --git a/trunk/drivers/pinctrl/sh-pfc/core.h b/trunk/drivers/pinctrl/sh-pfc/core.h
@@ -51,4 +51,6 @@ int sh_pfc_gpio_to_enum(struct sh_pfc *pfc, unsigned gpio, int pos,
 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;
+
 #endif /* __SH_PFC_CORE_H__ */