Commit a144a563 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge omap tree 

* master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream: (26 commits)
  ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
  ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
  ARM: OMAP: Update dmtimers
  ARM: OMAP: Make clock variables static
  ARM: OMAP: Fix GPMC compilation when DEBUG is defined
  ARM: OMAP: Mux updates for external DMA and GPIO
  ARM: OMAP: Add OMAP_TAG_CAMERA_SENSOR
  ARM: OMAP: Add initial 24xx suspend support
  ARM: OMAP: Update cpufreq support for 24xx
  ARM: OMAP: Add GPMC support for OMAP2
  ARM: OMAP: Fix DMA channel irq handling for omap24xx
  ARM: OMAP: OMAP2 DMA burst support
  ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1
  ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support
  ARM: OMAP: Correct two bugs in arch/arm/mach-omap2/clock.c
  ARM: OMAP: Register the 24xx McSPI device
  ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen
  ARM: OMAP: Aic23 alsa platform driver code for board-innovator
  ARM: OMAP: Fix GPIO IRQ mask handling
  ARM: OMAP: DMA transfer parameter configuration fix
  ...
parents 8fc5ffa0 3cbc9605

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ config XIP_PHYS_ADDR 


endmenu



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)



menu "CPU Frequency scaling"

arch/arm/mach-omap1/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ config MACH_OMAP_PERSEUS2 
	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such

	  a board.



config MACH_OMAP_FSAMPLE

	bool "TI F-Sample"

	depends on ARCH_OMAP1 && ARCH_OMAP730

    	help

	  Support for TI OMAP 850 F-Sample board. Say Y here if you have such

	  a board.



config MACH_VOICEBLUE

	bool "Voiceblue"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

arch/arm/mach-omap1/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o 
obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o

obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o

obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o

arch/arm/mach-omap1/board-ams-delta.c

+7 −0
Original line number Diff line number Diff line
@@ -80,8 +80,15 @@ static struct omap_uart_config ams_delta_uart_config __initdata = { 
	.enabled_uarts = 1,

};



static struct omap_usb_config ams_delta_usb_config __initdata = {

	.register_host	= 1,

	.hmc_mode	= 16,

	.pins[0]	= 2,

};



static struct omap_board_config_kernel ams_delta_config[] = {

	{ OMAP_TAG_UART,	&ams_delta_uart_config },

	{ OMAP_TAG_USB,		&ams_delta_usb_config },

};



static struct platform_device ams_delta_led_device = {

arch/arm/mach-omap1/board-fsample.c

0 → 100644
+319 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-omap1/board-fsample.c

 *

 * Modified from board-perseus2.c

 *

 * Original OMAP730 support by Jean Pihet <j-pihet@ti.com>

 * Updated for 2.6 by Kevin Hilman <kjh@hilman.org>

 *

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

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/input.h>



#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/flash.h>

#include <asm/mach/map.h>



#include <asm/arch/tc.h>

#include <asm/arch/gpio.h>

#include <asm/arch/mux.h>

#include <asm/arch/fpga.h>

#include <asm/arch/keypad.h>

#include <asm/arch/common.h>

#include <asm/arch/board.h>

#include <asm/arch/board-fsample.h>



static int fsample_keymap[] = {

	KEY(0,0,KEY_UP),

	KEY(0,1,KEY_RIGHT),

	KEY(0,2,KEY_LEFT),

	KEY(0,3,KEY_DOWN),

	KEY(0,4,KEY_CENTER),

	KEY(0,5,KEY_0_5),

	KEY(1,0,KEY_SOFT2),

	KEY(1,1,KEY_SEND),

	KEY(1,2,KEY_END),

	KEY(1,3,KEY_VOLUMEDOWN),

	KEY(1,4,KEY_VOLUMEUP),

	KEY(1,5,KEY_RECORD),

	KEY(2,0,KEY_SOFT1),

	KEY(2,1,KEY_3),

	KEY(2,2,KEY_6),

	KEY(2,3,KEY_9),

	KEY(2,4,KEY_SHARP),

	KEY(2,5,KEY_2_5),

	KEY(3,0,KEY_BACK),

	KEY(3,1,KEY_2),

	KEY(3,2,KEY_5),

	KEY(3,3,KEY_8),

	KEY(3,4,KEY_0),

	KEY(3,5,KEY_HEADSETHOOK),

	KEY(4,0,KEY_HOME),

	KEY(4,1,KEY_1),

	KEY(4,2,KEY_4),

	KEY(4,3,KEY_7),

	KEY(4,4,KEY_STAR),

	KEY(4,5,KEY_POWER),

	0

};



static struct resource smc91x_resources[] = {

	[0] = {

		.start	= H2P2_DBG_FPGA_ETHR_START,	/* Physical */

		.end	= H2P2_DBG_FPGA_ETHR_START + 0xf,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= INT_730_MPU_EXT_NIRQ,

		.end	= 0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct mtd_partition nor_partitions[] = {

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

	{

	      .name		= "bootloader",

	      .offset		= 0,

	      .size		= SZ_128K,

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

	},

	/* bootloader params in the next sector */

	{

	      .name		= "params",

	      .offset		= MTDPART_OFS_APPEND,

	      .size		= SZ_128K,

	      .mask_flags	= 0,

	},

	/* kernel */

	{

	      .name		= "kernel",

	      .offset		= MTDPART_OFS_APPEND,

	      .size		= SZ_2M,

	      .mask_flags	= 0

	},

	/* rest of flash is a file system */

	{

	      .name		= "rootfs",

	      .offset		= MTDPART_OFS_APPEND,

	      .size		= MTDPART_SIZ_FULL,

	      .mask_flags	= 0

	},

};



static struct flash_platform_data nor_data = {

	.map_name	= "cfi_probe",

	.width		= 2,

	.parts		= nor_partitions,

	.nr_parts	= ARRAY_SIZE(nor_partitions),

};



static struct resource nor_resource = {

	.start		= OMAP_CS0_PHYS,

	.end		= OMAP_CS0_PHYS + SZ_32M - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device nor_device = {

	.name		= "omapflash",

	.id		= 0,

	.dev		= {

		.platform_data	= &nor_data,

	},

	.num_resources	= 1,

	.resource	= &nor_resource,

};



static struct nand_platform_data nand_data = {

	.options	= NAND_SAMSUNG_LP_OPTIONS,

};



static struct resource nand_resource = {

	.start		= OMAP_CS3_PHYS,

	.end		= OMAP_CS3_PHYS + SZ_4K - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device nand_device = {

	.name		= "omapnand",

	.id		= 0,

	.dev		= {

		.platform_data	= &nand_data,

	},

	.num_resources	= 1,

	.resource	= &nand_resource,

};



static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};



static struct resource kp_resources[] = {

	[0] = {

		.start	= INT_730_MPUIO_KEYPAD,

		.end	= INT_730_MPUIO_KEYPAD,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct omap_kp_platform_data kp_data = {

	.rows	= 8,

	.cols	= 8,

	.keymap = fsample_keymap,

};



static struct platform_device kp_device = {

	.name		= "omap-keypad",

	.id		= -1,

	.dev		= {

		.platform_data = &kp_data,

	},

	.num_resources	= ARRAY_SIZE(kp_resources),

	.resource	= kp_resources,

};



static struct platform_device lcd_device = {

	.name		= "lcd_p2",

	.id		= -1,

};



static struct platform_device *devices[] __initdata = {

	&nor_device,

	&nand_device,

	&smc91x_device,

	&kp_device,

	&lcd_device,

};



#define P2_NAND_RB_GPIO_PIN	62



static int nand_dev_ready(struct nand_platform_data *data)

{

	return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN);

}



static struct omap_uart_config fsample_uart_config __initdata = {

	.enabled_uarts = ((1 << 0) | (1 << 1)),

};



static struct omap_lcd_config fsample_lcd_config __initdata = {

	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel fsample_config[] = {

	{ OMAP_TAG_UART,	&fsample_uart_config },

	{ OMAP_TAG_LCD,		&fsample_lcd_config },

};



static void __init omap_fsample_init(void)

{

	if (!(omap_request_gpio(P2_NAND_RB_GPIO_PIN)))

		nand_data.dev_ready = nand_dev_ready;



	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);



	platform_add_devices(devices, ARRAY_SIZE(devices));



	omap_board_config = fsample_config;

	omap_board_config_size = ARRAY_SIZE(fsample_config);

	omap_serial_init();

}



static void __init fsample_init_smc91x(void)

{

	fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

	fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,

		   H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

}



void omap_fsample_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	fsample_init_smc91x();

}



/* Only FPGA needs to be mapped here. All others are done with ioremap */

static struct map_desc omap_fsample_io_desc[] __initdata = {

	{

		.virtual	= H2P2_DBG_FPGA_BASE,

		.pfn		= __phys_to_pfn(H2P2_DBG_FPGA_START),

		.length		= H2P2_DBG_FPGA_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= FSAMPLE_CPLD_BASE,

		.pfn		= __phys_to_pfn(FSAMPLE_CPLD_START),

		.length		= FSAMPLE_CPLD_SIZE,

		.type		= MT_DEVICE

	}

};



static void __init omap_fsample_map_io(void)

{

	omap1_map_common_io();

	iotable_init(omap_fsample_io_desc,

		     ARRAY_SIZE(omap_fsample_io_desc));



	/* Early, board-dependent init */



	/*

	 * Hold GSM Reset until needed

	 */

	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);



	/*

	 * UARTs -> done automagically by 8250 driver

	 */



	/*

	 * CSx timings, GPIO Mux ... setup

	 */



	/* Flash: CS0 timings setup */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);



	/*

	 * Ethernet support through the debug board

	 * CS1 timings setup

	 */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);



	/*

	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,

	 * It is used as the Ethernet controller interrupt

	 */

	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);

}



MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")

/* Maintainer: Brian Swetland <swetland@google.com> */

	.phys_io	= 0xfff00000,

	.io_pg_offst	= ((0xfef00000) >> 18) & 0xfffc,

	.boot_params	= 0x10000100,

	.map_io		= omap_fsample_map_io,

	.init_irq	= omap_fsample_init_irq,

	.init_machine	= omap_fsample_init,

	.timer		= &omap_timer,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE