* '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
		
	
			
		
			
				
	
	
		
			225 lines
		
	
	
	
		
			5.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			225 lines
		
	
	
	
		
			5.2 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 <plat/common.h>
 | 
						|
#include <plat/board.h>
 | 
						|
#include <plat/gpmc-smc91x.h>
 | 
						|
#include <plat/usb.h>
 | 
						|
 | 
						|
#include <mach/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 const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 | 
						|
 | 
						|
	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
 | 
						|
	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
 | 
						|
	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
 | 
						|
 | 
						|
	.phy_reset  = true,
 | 
						|
	.reset_gpio_port[0]  = 126,
 | 
						|
	.reset_gpio_port[1]  = 61,
 | 
						|
	.reset_gpio_port[2]  = -EINVAL
 | 
						|
};
 | 
						|
 | 
						|
static struct omap_board_config_kernel sdp_config[] __initdata = {
 | 
						|
};
 | 
						|
 | 
						|
static void __init omap_sdp_init_irq(void)
 | 
						|
{
 | 
						|
	omap_board_config = sdp_config;
 | 
						|
	omap_board_config_size = ARRAY_SIZE(sdp_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 = {
 | 
						|
	{ .reg_offset = OMAP_MUX_TERMINATOR },
 | 
						|
};
 | 
						|
#else
 | 
						|
#define board_mux	NULL
 | 
						|
#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();
 | 
						|
	board_smc91x_init();
 | 
						|
	board_flash_init(sdp_flash_partitions, chip_sel_sdp);
 | 
						|
	enable_board_wakeup_source();
 | 
						|
	usb_ehci_init(&ehci_pdata);
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
 | 
						|
	.boot_params	= 0x80000100,
 | 
						|
	.map_io		= omap3_map_io,
 | 
						|
	.reserve	= omap_reserve,
 | 
						|
	.init_irq	= omap_sdp_init_irq,
 | 
						|
	.init_machine	= omap_sdp_init,
 | 
						|
	.timer		= &omap_timer,
 | 
						|
MACHINE_END
 |