 1ed16a86b4
			
		
	
	
	1ed16a86b4
	
	
	
		
			
			This patch starts using introduced I2C bus registration helper by cleaning up registration currently done in various places and by doing necessary board file modifications. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
		
			
				
	
	
		
			444 lines
		
	
	
	
		
			11 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			444 lines
		
	
	
	
		
			11 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * linux/arch/arm/mach-omap1/board-innovator.c
 | |
|  *
 | |
|  * Board specific inits for OMAP-1510 and OMAP-1610 Innovator
 | |
|  *
 | |
|  * Copyright (C) 2001 RidgeRun, Inc.
 | |
|  * Author: Greg Lonnon <glonnon@ridgerun.com>
 | |
|  *
 | |
|  * Copyright (C) 2002 MontaVista Software, Inc.
 | |
|  *
 | |
|  * Separated FPGA interrupts from innovator1510.c and cleaned up for 2.6
 | |
|  * Copyright (C) 2004 Nokia Corporation by Tony Lindrgen <tony@atomide.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/platform_device.h>
 | |
| #include <linux/delay.h>
 | |
| #include <linux/mtd/mtd.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/mux.h>
 | |
| #include <asm/arch/fpga.h>
 | |
| #include <asm/arch/gpio.h>
 | |
| #include <asm/arch/tc.h>
 | |
| #include <asm/arch/usb.h>
 | |
| #include <asm/arch/keypad.h>
 | |
| #include <asm/arch/common.h>
 | |
| #include <asm/arch/mcbsp.h>
 | |
| #include <asm/arch/omap-alsa.h>
 | |
| 
 | |
| static int innovator_keymap[] = {
 | |
| 	KEY(0, 0, KEY_F1),
 | |
| 	KEY(0, 3, KEY_DOWN),
 | |
| 	KEY(1, 1, KEY_F2),
 | |
| 	KEY(1, 2, KEY_RIGHT),
 | |
| 	KEY(2, 0, KEY_F3),
 | |
| 	KEY(2, 1, KEY_F4),
 | |
| 	KEY(2, 2, KEY_UP),
 | |
| 	KEY(3, 2, KEY_ENTER),
 | |
| 	KEY(3, 3, KEY_LEFT),
 | |
| 	0
 | |
| };
 | |
| 
 | |
| static struct mtd_partition innovator_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 flash1 is a file system */
 | |
| 	{
 | |
| 	      .name		= "rootfs",
 | |
| 	      .offset		= MTDPART_OFS_APPEND,
 | |
| 	      .size		= SZ_16M - SZ_2M - 2 * SZ_128K,
 | |
| 	      .mask_flags	= 0
 | |
| 	},
 | |
| 	/* file system */
 | |
| 	{
 | |
| 	      .name		= "filesystem",
 | |
| 	      .offset		= MTDPART_OFS_APPEND,
 | |
| 	      .size		= MTDPART_SIZ_FULL,
 | |
| 	      .mask_flags	= 0
 | |
| 	}
 | |
| };
 | |
| 
 | |
| static struct flash_platform_data innovator_flash_data = {
 | |
| 	.map_name	= "cfi_probe",
 | |
| 	.width		= 2,
 | |
| 	.parts		= innovator_partitions,
 | |
| 	.nr_parts	= ARRAY_SIZE(innovator_partitions),
 | |
| };
 | |
| 
 | |
| static struct resource innovator_flash_resource = {
 | |
| 	.start		= OMAP_CS0_PHYS,
 | |
| 	.end		= OMAP_CS0_PHYS + SZ_32M - 1,
 | |
| 	.flags		= IORESOURCE_MEM,
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator_flash_device = {
 | |
| 	.name		= "omapflash",
 | |
| 	.id		= 0,
 | |
| 	.dev		= {
 | |
| 		.platform_data	= &innovator_flash_data,
 | |
| 	},
 | |
| 	.num_resources	= 1,
 | |
| 	.resource	= &innovator_flash_resource,
 | |
| };
 | |
| 
 | |
| #define DEFAULT_BITPERSAMPLE 16
 | |
| 
 | |
| static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 | |
| 	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
 | |
| 	.spcr1 = RINTM(3) | RRST,
 | |
| 	.rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
 | |
| 	    RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0),
 | |
| 	.rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),
 | |
| 	.xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |
 | |
| 	    XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG,
 | |
| 	.xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
 | |
| 	.srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1),
 | |
| 	.srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1),
 | |
| 	/*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */
 | |
| 	.pcr0 = CLKXP | CLKRP,  /* mcbsp: slave */
 | |
| };
 | |
| 
 | |
| static struct omap_alsa_codec_config alsa_config = {
 | |
| 	.name			= "OMAP Innovator AIC23",
 | |
| 	.mcbsp_regs_alsa	= &mcbsp_regs,
 | |
| 	.codec_configure_dev	= NULL, /* aic23_configure, */
 | |
| 	.codec_set_samplerate	= NULL, /* aic23_set_samplerate, */
 | |
| 	.codec_clock_setup	= NULL, /* aic23_clock_setup, */
 | |
| 	.codec_clock_on		= NULL, /* aic23_clock_on, */
 | |
| 	.codec_clock_off	= NULL, /* aic23_clock_off, */
 | |
| 	.get_default_samplerate	= NULL, /* aic23_get_default_samplerate, */
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator_mcbsp1_device = {
 | |
| 	.name	= "omap_alsa_mcbsp",
 | |
|  	.id	= 1,
 | |
| 	.dev = {
 | |
| 		.platform_data	= &alsa_config,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct resource innovator_kp_resources[] = {
 | |
| 	[0] = {
 | |
| 		.start	= INT_KEYBOARD,
 | |
| 		.end	= INT_KEYBOARD,
 | |
| 		.flags	= IORESOURCE_IRQ,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct omap_kp_platform_data innovator_kp_data = {
 | |
| 	.rows		= 8,
 | |
| 	.cols		= 8,
 | |
| 	.keymap		= innovator_keymap,
 | |
| 	.keymapsize	= ARRAY_SIZE(innovator_keymap),
 | |
| 	.delay		= 4,
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator_kp_device = {
 | |
| 	.name		= "omap-keypad",
 | |
| 	.id		= -1,
 | |
| 	.dev		= {
 | |
| 		.platform_data = &innovator_kp_data,
 | |
| 	},
 | |
| 	.num_resources	= ARRAY_SIZE(innovator_kp_resources),
 | |
| 	.resource	= innovator_kp_resources,
 | |
| };
 | |
| 
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| 
 | |
| #include <linux/spi/spi.h>
 | |
| #include <linux/spi/ads7846.h>
 | |
| 
 | |
| 
 | |
| /* Only FPGA needs to be mapped here. All others are done with ioremap */
 | |
| static struct map_desc innovator1510_io_desc[] __initdata = {
 | |
| 	{
 | |
| 		.virtual	= OMAP1510_FPGA_BASE,
 | |
| 		.pfn		= __phys_to_pfn(OMAP1510_FPGA_START),
 | |
| 		.length		= OMAP1510_FPGA_SIZE,
 | |
| 		.type		= MT_DEVICE
 | |
| 	}
 | |
| };
 | |
| 
 | |
| static struct resource innovator1510_smc91x_resources[] = {
 | |
| 	[0] = {
 | |
| 		.start	= OMAP1510_FPGA_ETHR_START,	/* Physical */
 | |
| 		.end	= OMAP1510_FPGA_ETHR_START + 0xf,
 | |
| 		.flags	= IORESOURCE_MEM,
 | |
| 	},
 | |
| 	[1] = {
 | |
| 		.start	= OMAP1510_INT_ETHER,
 | |
| 		.end	= OMAP1510_INT_ETHER,
 | |
| 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator1510_smc91x_device = {
 | |
| 	.name		= "smc91x",
 | |
| 	.id		= 0,
 | |
| 	.num_resources	= ARRAY_SIZE(innovator1510_smc91x_resources),
 | |
| 	.resource	= innovator1510_smc91x_resources,
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator1510_lcd_device = {
 | |
| 	.name		= "lcd_inn1510",
 | |
| 	.id		= -1,
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator1510_spi_device = {
 | |
| 	.name		= "spi_inn1510",
 | |
| 	.id		= -1,
 | |
| };
 | |
| 
 | |
| static struct platform_device *innovator1510_devices[] __initdata = {
 | |
| 	&innovator_flash_device,
 | |
| 	&innovator1510_smc91x_device,
 | |
| 	&innovator_mcbsp1_device,
 | |
| 	&innovator_kp_device,
 | |
| 	&innovator1510_lcd_device,
 | |
| 	&innovator1510_spi_device,
 | |
| };
 | |
| 
 | |
| static int innovator_get_pendown_state(void)
 | |
| {
 | |
| 	return !(fpga_read(OMAP1510_FPGA_TOUCHSCREEN) & (1 << 5));
 | |
| }
 | |
| 
 | |
| static const struct ads7846_platform_data innovator1510_ts_info = {
 | |
| 	.model			= 7846,
 | |
| 	.vref_delay_usecs	= 100,	/* internal, no capacitor */
 | |
| 	.x_plate_ohms		= 419,
 | |
| 	.y_plate_ohms		= 486,
 | |
| 	.get_pendown_state	= innovator_get_pendown_state,
 | |
| };
 | |
| 
 | |
| static struct spi_board_info __initdata innovator1510_boardinfo[] = { {
 | |
| 	/* FPGA (bus "10") CS0 has an ads7846e */
 | |
| 	.modalias		= "ads7846",
 | |
| 	.platform_data		= &innovator1510_ts_info,
 | |
| 	.irq			= OMAP1510_INT_FPGA_TS,
 | |
| 	.max_speed_hz		= 120000 /* max sample rate at 3V */
 | |
| 					* 26 /* command + data + overhead */,
 | |
| 	.bus_num		= 10,
 | |
| 	.chip_select		= 0,
 | |
| } };
 | |
| 
 | |
| #endif /* CONFIG_ARCH_OMAP15XX */
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP16XX
 | |
| 
 | |
| static struct resource innovator1610_smc91x_resources[] = {
 | |
| 	[0] = {
 | |
| 		.start	= INNOVATOR1610_ETHR_START,		/* Physical */
 | |
| 		.end	= INNOVATOR1610_ETHR_START + 0xf,
 | |
| 		.flags	= IORESOURCE_MEM,
 | |
| 	},
 | |
| 	[1] = {
 | |
| 		.start	= OMAP_GPIO_IRQ(0),
 | |
| 		.end	= OMAP_GPIO_IRQ(0),
 | |
| 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator1610_smc91x_device = {
 | |
| 	.name		= "smc91x",
 | |
| 	.id		= 0,
 | |
| 	.num_resources	= ARRAY_SIZE(innovator1610_smc91x_resources),
 | |
| 	.resource	= innovator1610_smc91x_resources,
 | |
| };
 | |
| 
 | |
| static struct platform_device innovator1610_lcd_device = {
 | |
| 	.name		= "inn1610_lcd",
 | |
| 	.id		= -1,
 | |
| };
 | |
| 
 | |
| static struct platform_device *innovator1610_devices[] __initdata = {
 | |
| 	&innovator_flash_device,
 | |
| 	&innovator1610_smc91x_device,
 | |
| 	&innovator_kp_device,
 | |
| 	&innovator1610_lcd_device,
 | |
| };
 | |
| 
 | |
| #endif /* CONFIG_ARCH_OMAP16XX */
 | |
| 
 | |
| static void __init innovator_init_smc91x(void)
 | |
| {
 | |
| 	if (cpu_is_omap1510()) {
 | |
| 		fpga_write(fpga_read(OMAP1510_FPGA_RST) & ~1,
 | |
| 			   OMAP1510_FPGA_RST);
 | |
| 		udelay(750);
 | |
| 	} else {
 | |
| 		if ((omap_request_gpio(0)) < 0) {
 | |
| 			printk("Error requesting gpio 0 for smc91x irq\n");
 | |
| 			return;
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void __init innovator_init_irq(void)
 | |
| {
 | |
| 	omap1_init_common_hw();
 | |
| 	omap_init_irq();
 | |
| 	omap_gpio_init();
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| 	if (cpu_is_omap1510()) {
 | |
| 		omap1510_fpga_init_irq();
 | |
| 	}
 | |
| #endif
 | |
| 	innovator_init_smc91x();
 | |
| }
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| static struct omap_usb_config innovator1510_usb_config __initdata = {
 | |
| 	/* for bundled non-standard host and peripheral cables */
 | |
| 	.hmc_mode	= 4,
 | |
| 
 | |
| 	.register_host	= 1,
 | |
| 	.pins[1]	= 6,
 | |
| 	.pins[2]	= 6,		/* Conflicts with UART2 */
 | |
| 
 | |
| 	.register_dev	= 1,
 | |
| 	.pins[0]	= 2,
 | |
| };
 | |
| 
 | |
| static struct omap_lcd_config innovator1510_lcd_config __initdata = {
 | |
| 	.ctrl_name	= "internal",
 | |
| };
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP16XX
 | |
| static struct omap_usb_config h2_usb_config __initdata = {
 | |
| 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 | |
| 	.otg		= 2,
 | |
| 
 | |
| #ifdef	CONFIG_USB_GADGET_OMAP
 | |
| 	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */
 | |
| 	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 | |
| #elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 | |
| 	/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
 | |
| 	.hmc_mode	= 20,	/* 1:dev|otg(off) 1:host 2:disabled */
 | |
| #endif
 | |
| 
 | |
| 	.pins[1]	= 3,
 | |
| };
 | |
| 
 | |
| static struct omap_lcd_config innovator1610_lcd_config __initdata = {
 | |
| 	.ctrl_name	= "internal",
 | |
| };
 | |
| #endif
 | |
| 
 | |
| static struct omap_mmc_config innovator_mmc_config __initdata = {
 | |
| 	.mmc [0] = {
 | |
| 		.enabled 	= 1,
 | |
| 		.wire4		= 1,
 | |
| 		.wp_pin		= OMAP_MPUIO(3),
 | |
| 		.power_pin	= -1,	/* FPGA F3 UIO42 */
 | |
| 		.switch_pin	= -1,	/* FPGA F4 UIO43 */
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct omap_uart_config innovator_uart_config __initdata = {
 | |
| 	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 | |
| };
 | |
| 
 | |
| static struct omap_board_config_kernel innovator_config[] = {
 | |
| 	{ OMAP_TAG_USB,         NULL },
 | |
| 	{ OMAP_TAG_LCD,		NULL },
 | |
| 	{ OMAP_TAG_MMC,		&innovator_mmc_config },
 | |
| 	{ OMAP_TAG_UART,	&innovator_uart_config },
 | |
| };
 | |
| 
 | |
| static void __init innovator_init(void)
 | |
| {
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| 	if (cpu_is_omap1510()) {
 | |
| 		platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
 | |
| 		spi_register_board_info(innovator1510_boardinfo,
 | |
| 				ARRAY_SIZE(innovator1510_boardinfo));
 | |
| 	}
 | |
| #endif
 | |
| #ifdef CONFIG_ARCH_OMAP16XX
 | |
| 	if (!cpu_is_omap1510()) {
 | |
| 		platform_add_devices(innovator1610_devices, ARRAY_SIZE(innovator1610_devices));
 | |
| 	}
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| 	if (cpu_is_omap1510()) {
 | |
| 		innovator_config[0].data = &innovator1510_usb_config;
 | |
| 		innovator_config[1].data = &innovator1510_lcd_config;
 | |
| 	}
 | |
| #endif
 | |
| #ifdef CONFIG_ARCH_OMAP16XX
 | |
| 	if (cpu_is_omap1610()) {
 | |
| 		innovator_config[0].data = &h2_usb_config;
 | |
| 		innovator_config[1].data = &innovator1610_lcd_config;
 | |
| 	}
 | |
| #endif
 | |
| 	omap_board_config = innovator_config;
 | |
| 	omap_board_config_size = ARRAY_SIZE(innovator_config);
 | |
| 	omap_serial_init();
 | |
| 	omap_register_i2c_bus(1, 100, NULL, 0);
 | |
| }
 | |
| 
 | |
| static void __init innovator_map_io(void)
 | |
| {
 | |
| 	omap1_map_common_io();
 | |
| 
 | |
| #ifdef CONFIG_ARCH_OMAP15XX
 | |
| 	if (cpu_is_omap1510()) {
 | |
| 		iotable_init(innovator1510_io_desc, ARRAY_SIZE(innovator1510_io_desc));
 | |
| 		udelay(10);	/* Delay needed for FPGA */
 | |
| 
 | |
| 		/* Dump the Innovator FPGA rev early - useful info for support. */
 | |
| 		printk("Innovator FPGA Rev %d.%d Board Rev %d\n",
 | |
| 		       fpga_read(OMAP1510_FPGA_REV_HIGH),
 | |
| 		       fpga_read(OMAP1510_FPGA_REV_LOW),
 | |
| 		       fpga_read(OMAP1510_FPGA_BOARD_REV));
 | |
| 	}
 | |
| #endif
 | |
| }
 | |
| 
 | |
| MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
 | |
| 	/* Maintainer: MontaVista Software, Inc. */
 | |
| 	.phys_io	= 0xfff00000,
 | |
| 	.io_pg_offst	= ((0xfef00000) >> 18) & 0xfffc,
 | |
| 	.boot_params	= 0x10000100,
 | |
| 	.map_io		= innovator_map_io,
 | |
| 	.init_irq	= innovator_init_irq,
 | |
| 	.init_machine	= innovator_init,
 | |
| 	.timer		= &omap_timer,
 | |
| MACHINE_END
 |