Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 994d66a4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: sh73a0: Use driver-provided pinmux info 



Pinmux info for the sh73a0 is now provided by pinmux drivers. Remove the
duplicate copy in arch code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 5967fe09

arch/arm/mach-shmobile/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o 
smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o



# Pinmux setup

pfc-y				:=

pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o



# IRQ objects

obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o
@@ -48,4 +44,3 @@ obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o 


# Framework support

obj-$(CONFIG_SMP)		+= $(smp-y)
 
obj-$(CONFIG_GENERIC_GPIO)	+= $(pfc-y)

arch/arm/mach-shmobile/pfc-sh73a0.c

deleted100644 → 0
+0 −2829

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-shmobile/setup-sh73a0.c

+25 −0
Original line number Diff line number Diff line
@@ -57,6 +57,31 @@ void __init sh73a0_map_io(void) 
	iotable_init(sh73a0_io_desc, ARRAY_SIZE(sh73a0_io_desc));

}



static struct resource sh73a0_pfc_resources[] = {

	[0] = {

		.start	= 0xe6050000,

		.end	= 0xe6057fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 0xe605801c,

		.end	= 0xe6058027,

		.flags	= IORESOURCE_MEM,

	}

};



static struct platform_device sh73a0_pfc_device = {

	.name		= "pfc-sh73a0",

	.id		= -1,

	.resource	= sh73a0_pfc_resources,

	.num_resources	= ARRAY_SIZE(sh73a0_pfc_resources),

};



void __init sh73a0_pinmux_init(void)

{

	platform_device_register(&sh73a0_pfc_device);

}



static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,