[PATCH 23/80] ARM: shmobile: r8a7779: Register PFC platform device
Simon Horman
horms+renesas at verge.net.au
Thu Jan 24 21:23:59 EST 2013
From: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
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 at ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij at linaro.org>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
arch/arm/mach-shmobile/pfc-r8a7779.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
index 9513234..3d333b1 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);
}
--
1.7.10.4
More information about the linux-arm-kernel
mailing list