summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 23:50:58 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-01-25 09:24:22 +0900
commit74494117a5d57302561efa6891c5210ba33f500c (patch)
tree110c408f025e14df88985a0ae08277b92a1e46cc
parente48d1988eefd1c160e3183549e8a51cd2b15be04 (diff)
downloadlinux-74494117a5d57302561efa6891c5210ba33f500c.tar.bz2
ARM: shmobile: r8a7779: Register PFC platform device
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/pfc-r8a7779.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
index 9513234d322b..3d333b1de458 100644
--- a/arch/arm/mach-shmobile/pfc-r8a7779.c
+++ b/arch/arm/mach-shmobile/pfc-r8a7779.c
@@ -19,6 +19,7 @@
*/
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/platform_device.h>
#include <linux/sh_pfc.h>
#include <linux/ioport.h>
#include <mach/r8a7779.h>
@@ -2616,9 +2617,6 @@ static struct resource r8a7779_pfc_resources[] = {
static struct pinmux_info r8a7779_pinmux_info = {
.name = "r8a7779_pfc",
- .resource = r8a7779_pfc_resources,
- .num_resources = ARRAY_SIZE(r8a7779_pfc_resources),
-
.unlock_reg = 0xfffc0000, /* PMMR */
.reserved_id = PINMUX_RESERVED,
@@ -2639,7 +2637,17 @@ static struct pinmux_info r8a7779_pinmux_info = {
.gpio_data_size = ARRAY_SIZE(pinmux_data),
};
+static struct platform_device r8a7779_pfc_device = {
+ .name = "sh-pfc",
+ .id = -1,
+ .resource = r8a7779_pfc_resources,
+ .num_resources = ARRAY_SIZE(r8a7779_pfc_resources),
+ .dev = {
+ .platform_data = &r8a7779_pinmux_info,
+ },
+};
+
void r8a7779_pinmux_init(void)
{
- register_pinmux(&r8a7779_pinmux_info);
+ platform_device_register(&r8a7779_pfc_device);
}