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

Commit 97411608 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Remove legacy support for zoom platforms 



We now have pretty decent device tree based support for
zoom platforms. It's not complete, but basics work for
me so adding more features should be quite trivial.

Looks like also 3630 sdp is zoom based, and looking
at it's board file should also be trivial to support
with the device tree based booting.

Patches are welcome if people are still using these.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 95807689

arch/arm/mach-omap2/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -310,20 +310,6 @@ config MACH_NOKIA_RX51 
	default y

	select OMAP_PACKAGE_CBB



config MACH_OMAP_ZOOM2

	bool "OMAP3 Zoom2 board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP_ZOOM3

	bool "OMAP3630 Zoom3 board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBP

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_CM_T35

	bool "CompuLab CM-T35/CM-T3730 modules"

	depends on ARCH_OMAP3
@@ -359,12 +345,6 @@ config MACH_SBC3530 
	default y

	select OMAP_PACKAGE_CUS



config MACH_OMAP_3630SDP

	bool "OMAP3630 SDP board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBP



config MACH_TI8168EVM

	bool "TI8168 Evaluation Module"

	depends on SOC_TI81XX

arch/arm/mach-omap2/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -248,15 +248,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o 
obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-display.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom-display.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-zoom-display.o

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o

arch/arm/mach-omap2/board-3630sdp.c

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

 * Copyright (C) 2009 Texas Instruments Inc.

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/mtd/nand.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "gpmc-smc91x.h"



#include "board-zoom.h"



#include "board-flash.h"

#include "mux.h"

#include "sdram-hynix-h8mbx00u0mer-0em.h"



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)



static struct omap_smc91x_platform_data board_smc91x_data = {

	.cs             = 3,

	.flags          = GPMC_MUX_ADD_DATA | IORESOURCE_IRQ_LOWLEVEL,

};



static void __init board_smc91x_init(void)

{

	board_smc91x_data.gpio_irq = 158;

	gpmc_smc91x_init(&board_smc91x_data);

}



#else



static inline void board_smc91x_init(void)

{

}



#endif /* defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) */



static void enable_board_wakeup_source(void)

{

	/* T2 interrupt line (keypad) */

	omap_mux_init_signal("sys_nirq",

		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 1,

		.reset_gpio = 126,

		.vcc_gpio = -EINVAL,

	},

	{

		.port = 2,

		.reset_gpio = 61,

		.vcc_gpio = -EINVAL,

	},

};



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

};



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#endif



/*

 * SDP3630 CS organization

 * See also the Switch S8 settings in the comments.

 */

static char chip_sel_sdp[][GPMC_CS_NUM] = {

	{PDC_NOR, PDC_NAND, PDC_ONENAND, DBG_MPDB, 0, 0, 0, 0}, /* S8:1111 */

	{PDC_ONENAND, PDC_NAND, PDC_NOR, DBG_MPDB, 0, 0, 0, 0}, /* S8:1110 */

	{PDC_NAND, PDC_ONENAND, PDC_NOR, DBG_MPDB, 0, 0, 0, 0}, /* S8:1101 */

};



static struct mtd_partition sdp_nor_partitions[] = {

	/* bootloader (U-Boot, etc) in first sector */

	{

		.name		= "Bootloader-NOR",

		.offset		= 0,

		.size		= SZ_256K,

		.mask_flags	= MTD_WRITEABLE, /* force read-only */

	},

	/* bootloader params in the next sector */

	{

		.name		= "Params-NOR",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_256K,

		.mask_flags	= 0,

	},

	/* kernel */

	{

		.name		= "Kernel-NOR",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_2M,

		.mask_flags	= 0

	},

	/* file system */

	{

		.name		= "Filesystem-NOR",

		.offset		= MTDPART_OFS_APPEND,

		.size		= MTDPART_SIZ_FULL,

		.mask_flags	= 0

	}

};



static struct mtd_partition sdp_onenand_partitions[] = {

	{

		.name		= "X-Loader-OneNAND",

		.offset		= 0,

		.size		= 4 * (64 * 2048),

		.mask_flags	= MTD_WRITEABLE  /* force read-only */

	},

	{

		.name		= "U-Boot-OneNAND",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 2 * (64 * 2048),

		.mask_flags	= MTD_WRITEABLE  /* force read-only */

	},

	{

		.name		= "U-Boot Environment-OneNAND",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 1 * (64 * 2048),

	},

	{

		.name		= "Kernel-OneNAND",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 16 * (64 * 2048),

	},

	{

		.name		= "File System-OneNAND",

		.offset		= MTDPART_OFS_APPEND,

		.size		= MTDPART_SIZ_FULL,

	},

};



static struct mtd_partition sdp_nand_partitions[] = {

	/* All the partition sizes are listed in terms of NAND block size */

	{

		.name		= "X-Loader-NAND",

		.offset		= 0,

		.size		= 4 * (64 * 2048),

		.mask_flags	= MTD_WRITEABLE,	/* force read-only */

	},

	{

		.name		= "U-Boot-NAND",

		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */

		.size		= 10 * (64 * 2048),

		.mask_flags	= MTD_WRITEABLE,	/* force read-only */

	},

	{

		.name		= "Boot Env-NAND",



		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x1c0000 */

		.size		= 6 * (64 * 2048),

	},

	{

		.name		= "Kernel-NAND",

		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */

		.size		= 40 * (64 * 2048),

	},

	{

		.name		= "File System - NAND",

		.size		= MTDPART_SIZ_FULL,

		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x780000 */

	},

};



static struct flash_partitions sdp_flash_partitions[] = {

	{

		.parts = sdp_nor_partitions,

		.nr_parts = ARRAY_SIZE(sdp_nor_partitions),

	},

	{

		.parts = sdp_onenand_partitions,

		.nr_parts = ARRAY_SIZE(sdp_onenand_partitions),

	},

	{

		.parts = sdp_nand_partitions,

		.nr_parts = ARRAY_SIZE(sdp_nand_partitions),

	},

};



static void __init omap_sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	zoom_peripherals_init();

	omap_sdrc_init(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

	zoom_display_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);

	enable_board_wakeup_source();



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);

}



MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")

	.atag_offset	= 0x100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3630_init_early,

	.init_irq	= omap3_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_sdp_init,

	.init_late	= omap3630_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.restart	= omap3xxx_restart,

MACHINE_END

arch/arm/mach-omap2/board-ldp.c

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <asm/mach/map.h>



#include "common.h"

#include "board-zoom.h"

#include "gpmc.h"

#include "gpmc-smsc911x.h"
@@ -406,7 +405,7 @@ static void __init omap_ldp_init(void) 
	usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");

	usb_musb_init(NULL);

	board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions),

			ZOOM_NAND_CS, 0, nand_default_timings);

			0, 0, nand_default_timings);



	omap_hsmmc_init(mmc);

	ldp_display_init();

arch/arm/mach-omap2/board-zoom-debugboard.c

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

 * Copyright (C) 2009 Texas Instruments Inc.

 * Mikkel Christensen <mlc@ti.com>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/serial_8250.h>

#include <linux/smsc911x.h>

#include <linux/interrupt.h>



#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>



#include "gpmc.h"

#include "gpmc-smsc911x.h"



#include "board-zoom.h"



#include "soc.h"

#include "common.h"



#define ZOOM_SMSC911X_CS	7

#define ZOOM_SMSC911X_GPIO	158

#define ZOOM_QUADUART_CS	3

#define ZOOM_QUADUART_GPIO	102

#define ZOOM_QUADUART_RST_GPIO	152

#define QUART_CLK		1843200

#define DEBUG_BASE		0x08000000

#define ZOOM_ETHR_START	DEBUG_BASE



static struct omap_smsc911x_platform_data zoom_smsc911x_cfg = {

	.cs             = ZOOM_SMSC911X_CS,

	.gpio_irq       = ZOOM_SMSC911X_GPIO,

	.gpio_reset     = -EINVAL,

	.flags		= SMSC911X_USE_32BIT,

};



static inline void __init zoom_init_smsc911x(void)

{

	gpmc_smsc911x_init(&zoom_smsc911x_cfg);

}



static struct plat_serial8250_port serial_platform_data[] = {

	{

		.mapbase	= ZOOM_UART_BASE,

		.flags		= UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ,

		.irqflags	= IRQF_SHARED | IRQF_TRIGGER_RISING,

		.iotype		= UPIO_MEM,

		.regshift	= 1,

		.uartclk	= QUART_CLK,

	}, {

		.flags		= 0

	}

};



static struct platform_device zoom_debugboard_serial_device = {

	.name			= "serial8250",

	.id			= PLAT8250_DEV_PLATFORM,

	.dev			= {

		.platform_data	= serial_platform_data,

	},

};



static inline void __init zoom_init_quaduart(void)

{

	int quart_cs;

	unsigned long cs_mem_base;

	int quart_gpio = 0;



	if (gpio_request_one(ZOOM_QUADUART_RST_GPIO,

				GPIOF_OUT_INIT_LOW,

				"TL16CP754C GPIO") < 0) {

		pr_err("Failed to request GPIO%d for TL16CP754C\n",

			ZOOM_QUADUART_RST_GPIO);

		return;

	}



	quart_cs = ZOOM_QUADUART_CS;



	if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) {

		pr_err("Failed to request GPMC mem for Quad UART(TL16CP754C)\n");

		return;

	}



	quart_gpio = ZOOM_QUADUART_GPIO;



	if (gpio_request_one(quart_gpio, GPIOF_IN, "TL16CP754C GPIO") < 0)

		printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n",

								quart_gpio);



	serial_platform_data[0].irq = gpio_to_irq(102);

}



static inline int omap_zoom_debugboard_detect(void)

{

	int debug_board_detect = 0;

	int ret = 1;



	debug_board_detect = ZOOM_SMSC911X_GPIO;



	if (gpio_request_one(debug_board_detect, GPIOF_IN,

			     "Zoom debug board detect") < 0) {

		pr_err("Failed to request GPIO%d for Zoom debug board detect\n",

		       debug_board_detect);

		return 0;

	}



	if (!gpio_get_value(debug_board_detect)) {

		ret = 0;

	}

	gpio_free(debug_board_detect);

	return ret;

}



static struct platform_device *zoom_devices[] __initdata = {

	&zoom_debugboard_serial_device,

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),

};



int __init zoom_debugboard_init(void)

{

	if (!omap_zoom_debugboard_detect())

		return 0;



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

	zoom_init_smsc911x();

	zoom_init_quaduart();

	return platform_add_devices(zoom_devices, ARRAY_SIZE(zoom_devices));

}