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

Commit 20826853 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

arm: omap: combine zoom2 and zoom3 board-files 



They are extremely similar anyway, let's get rid
of one file.

While at that, also remove the empty zoom_config
variable.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 235228ba

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -144,12 +144,12 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ 
					   board-rx51-peripherals.o \

					   board-rx51-video.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom2.o \

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

					   board-zoom-peripherals.o \

					   board-flash.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom3.o \

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

					   board-zoom-peripherals.o \

					   board-flash.o \

					   hsmmc.o \

arch/arm/mach-omap2/board-zoom3.c→arch/arm/mach-omap2/board-zoom.c

+59 −41
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Texas Instruments Inc.

 * Copyright (C) 2009-2010 Texas Instruments Inc.

 * Mikkel Christensen <mlc@ti.com>

 * Felipe Balbi <balbi@ti.com>

 *

 * Modified from mach-omap2/board-ldp.c

 *

 * 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
@@ -12,22 +15,55 @@ 
#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/i2c/twl.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/board-zoom.h>



#include <plat/common.h>

#include <plat/board.h>

#include <plat/usb.h>



#include <mach/board-zoom.h>



#include "board-flash.h"

#include "mux.h"

#include "sdram-micron-mt46h32m32lf-6.h"

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



static struct omap_board_config_kernel zoom_config[] __initdata = {

static void __init omap_zoom_init_irq(void)

{

	if (machine_is_omap_zoom2())

		omap2_init_common_hw(mt46h32m32lf6_sdrc_params,

				mt46h32m32lf6_sdrc_params);

	else if (machine_is_omap_zoom3())

		omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,

				h8mbx00u0mer0em_sdrc_params);



	omap_init_irq();

	omap_gpio_init();

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* WLAN IRQ - GPIO 162 */

	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN POWER ENABLE - GPIO 101 */

	OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),

	/* WLAN SDIO: MMC3 CMD */

	OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE3 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 CLK */

	OMAP3_MUX(ETK_CLK, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 DAT[0-3] */

	OMAP3_MUX(ETK_D3, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D4, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D5, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static struct mtd_partition zoom_nand_partitions[] = {

	/* All the partition sizes are listed in terms of NAND block size */
@@ -70,37 +106,6 @@ static struct mtd_partition zoom_nand_partitions[] = { 
	},

};



static void __init omap_zoom_init_irq(void)

{

	omap_board_config = zoom_config;

	omap_board_config_size = ARRAY_SIZE(zoom_config);

	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,

			h8mbx00u0mer0em_sdrc_params);

	omap_init_irq();

	omap_gpio_init();

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* WLAN IRQ - GPIO 162 */

	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN POWER ENABLE - GPIO 101 */

	OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),

	/* WLAN SDIO: MMC3 CMD */

	OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE3 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 CLK */

	OMAP3_MUX(ETK_CLK, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 DAT[0-3] */

	OMAP3_MUX(ETK_D3, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D4, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D5, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

	.port_mode[0]		= EHCI_HCD_OMAP_MODE_UNKNOWN,

	.port_mode[1]		= EHCI_HCD_OMAP_MODE_PHY,
@@ -113,16 +118,29 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 


static void __init omap_zoom_init(void)

{

	if (machine_is_omap_zoom2()) {

		omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	} else if (machine_is_omap_zoom3()) {

		omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	zoom_peripherals_init();

		omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);

		usb_ehci_init(&ehci_pdata);

	}



	board_nand_init(zoom_nand_partitions,

			ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);

	zoom_debugboard_init();



	omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);

	usb_ehci_init(&ehci_pdata);

	zoom_peripherals_init();

}



MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")

	.boot_params	= 0x80000100,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= omap_zoom_init_irq,

	.init_machine	= omap_zoom_init,

	.timer		= &omap_timer,

MACHINE_END



MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")

	.boot_params	= 0x80000100,

	.map_io		= omap3_map_io,

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

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

 * Copyright (C) 2009 Texas Instruments Inc.

 * Mikkel Christensen <mlc@ti.com>

 *

 * Modified from mach-omap2/board-ldp.c

 *

 * 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/i2c/twl.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <plat/common.h>

#include <plat/board.h>



#include <mach/board-zoom.h>



#include "board-flash.h"

#include "mux.h"

#include "sdram-micron-mt46h32m32lf-6.h"



static void __init omap_zoom2_init_irq(void)

{

	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,

				 mt46h32m32lf6_sdrc_params);

	omap_init_irq();

	omap_gpio_init();

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* WLAN IRQ - GPIO 162 */

	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN POWER ENABLE - GPIO 101 */

	OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),

	/* WLAN SDIO: MMC3 CMD */

	OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE3 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 CLK */

	OMAP3_MUX(ETK_CLK, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	/* WLAN SDIO: MMC3 DAT[0-3] */

	OMAP3_MUX(ETK_D3, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D4, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D5, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static struct mtd_partition zoom_nand_partitions[] = {

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

	{

		.name		= "X-Loader-NAND",

		.offset		= 0,

		.size		= 4 * (64 * 2048),	/* 512KB, 0x80000 */

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

	},

	{

		.name		= "U-Boot-NAND",

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

		.size		= 10 * (64 * 2048),	/* 1.25MB, 0x140000 */

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

	},

	{

		.name		= "Boot Env-NAND",

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

		.size		= 2 * (64 * 2048),	/* 256KB, 0x40000 */

	},

	{

		.name		= "Kernel-NAND",

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

		.size		= 240 * (64 * 2048),	/* 30M, 0x1E00000 */

	},

	{

		.name		= "system",

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

		.size		= 3328 * (64 * 2048),	/* 416M, 0x1A000000 */

	},

	{

		.name		= "userdata",

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

		.size		= 256 * (64 * 2048),	/* 32M, 0x2000000 */

	},

	{

		.name		= "cache",

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

		.size		= 256 * (64 * 2048),	/* 32M, 0x2000000 */

	},

};



static void __init omap_zoom2_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	zoom_peripherals_init();

	board_nand_init(zoom_nand_partitions,

			ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);

	zoom_debugboard_init();

}



MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")

	.boot_params	= 0x80000100,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= omap_zoom2_init_irq,

	.init_machine	= omap_zoom2_init,

	.timer		= &omap_timer,

MACHINE_END