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

Commit 786deb29 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Remove legacy KZM9D board code 



Remove the C and platform device version of KZM9D.

The DT version of KZM9D board support can now instead
directly be used with SoC specific code in setup-emev2.c.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 3f348e1c

arch/arm/mach-shmobile/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -234,12 +234,6 @@ config MACH_KOELSCH 
	depends on ARCH_R8A7791

	select USE_OF



config MACH_KZM9D

	bool "KZM9D board"

	depends on ARCH_EMEV2

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF



config MACH_KZM9G

	bool "KZM-A9-GT board"

	depends on ARCH_SH73A0

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o 
obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o

obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o

obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d.o

obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o

obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o

endif

arch/arm/mach-shmobile/Makefile.boot

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 
loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000

loadaddr-$(CONFIG_MACH_GENMAI) += 0x8008000

loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000

loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000

loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000

arch/arm/mach-shmobile/board-kzm9d.c

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
/*

 * kzm9d board support

 *

 * Copyright (C) 2012  Renesas Solutions Corp.

 * Copyright (C) 2012  Magnus Damm

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <mach/common.h>

#include <mach/emev2.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



/* Ether */

static struct resource smsc911x_resources[] = {

	[0] = {

		.start	= 0x20000000,

		.end	= 0x2000ffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= EMEV2_GPIO_IRQ(1),

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,

	},

};



static struct smsc911x_platform_config smsc911x_platdata = {

	.flags		= SMSC911X_USE_32BIT,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,

};



static struct platform_device smsc91x_device = {

	.name	= "smsc911x",

	.id	= -1,

	.dev	= {

		  .platform_data = &smsc911x_platdata,

		},

	.num_resources	= ARRAY_SIZE(smsc911x_resources),

	.resource	= smsc911x_resources,

};



static struct platform_device *kzm9d_devices[] __initdata = {

	&smsc91x_device,

};



void __init kzm9d_add_standard_devices(void)

{

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	emev2_add_standard_devices();



	platform_add_devices(kzm9d_devices, ARRAY_SIZE(kzm9d_devices));

}



static const char *kzm9d_boards_compat_dt[] __initdata = {

	"renesas,kzm9d",

	NULL,

};



DT_MACHINE_START(KZM9D_DT, "kzm9d")

	.smp		= smp_ops(emev2_smp_ops),

	.map_io		= emev2_map_io,

	.init_early	= emev2_init_delay,

	.init_machine	= kzm9d_add_standard_devices,

	.init_late	= shmobile_init_late,

	.dt_compat	= kzm9d_boards_compat_dt,

MACHINE_END