* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...
Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
		
	
			
		
			
				
	
	
		
			133 lines
		
	
	
	
		
			3.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			133 lines
		
	
	
	
		
			3.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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 <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 "board-flash.h"
 | 
						|
#include "mux.h"
 | 
						|
#include "sdram-hynix-h8mbx00u0mer-0em.h"
 | 
						|
 | 
						|
static struct omap_board_config_kernel zoom_config[] __initdata = {
 | 
						|
};
 | 
						|
 | 
						|
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_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,
 | 
						|
	.port_mode[2]		= EHCI_HCD_OMAP_MODE_UNKNOWN,
 | 
						|
	.phy_reset		= true,
 | 
						|
	.reset_gpio_port[0]	= -EINVAL,
 | 
						|
	.reset_gpio_port[1]	= 64,
 | 
						|
	.reset_gpio_port[2]	= -EINVAL,
 | 
						|
};
 | 
						|
 | 
						|
static void __init omap_zoom_init(void)
 | 
						|
{
 | 
						|
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
 | 
						|
	zoom_peripherals_init();
 | 
						|
	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);
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 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
 |