On Fri, Dec 05, 2008 at 12:06:27PM -0800, Tony Lindgren wrote:
> +#include <linux/clk.h>
Not required.
> +#include <linux/delay.h>
Not required.
> +#include <linux/err.h>
Not required.
> +#include <linux/init.h>
> +#include <linux/io.h>
May not be required.
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +
> +#include <linux/spi/spi.h>
> +#include <linux/spi/ads7846.h>
> +#include <linux/i2c/twl4030.h>
> +
> +#include <linux/mtd/mtd.h>
> +#include <linux/mtd/nand.h>
> +#include <linux/mtd/partitions.h>
> +
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/flash.h>
> +#include <asm/mach/map.h>
> +
> +#include <mach/board.h>
> +#include <mach/common.h>
> +#include <mach/gpio.h>
> +#include <mach/gpmc.h>
> +#include <mach/hardware.h>
> +#include <mach/nand.h>
> +#include <mach/mcspi.h>
> +
> +#define NAND_BLOCK_SIZE SZ_128K
> +#define GPMC_CS0_BASE 0x60
> +#define GPMC_CS_SIZE 0x30
> +
> +#define OMAP3_PANDORA_TS_GPIO 94
> +
> +static struct mtd_partition omap3pandora_nand_partitions[] = {
> + {
> + .name = "xloader",
> + .offset = 0, /* Offset = 0x00000 */
> + .size = 4 * NAND_BLOCK_SIZE,
> + .mask_flags = MTD_WRITEABLE
> + }, {
> + .name = "uboot",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
> + .size = 14 * NAND_BLOCK_SIZE,
> + }, {
> + .name = "uboot environment",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x240000 */
> + .size = 2 * NAND_BLOCK_SIZE,
> + }, {
> + .name = "linux",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */
> + .size = 32 * NAND_BLOCK_SIZE,
> + }, {
> + .name = "rootfs",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */
> + .size = MTDPART_SIZ_FULL,
> + },
> +};
> +
> +static struct omap_nand_platform_data omap3pandora_nand_data = {
> + .parts = omap3pandora_nand_partitions,
> + .nr_parts = ARRAY_SIZE(omap3pandora_nand_partitions),
> + .dma_channel = -1, /* disable DMA in OMAP NAND driver */
> +};
> +
> +static struct resource omap3pandora_nand_resource[] = {
> + {
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
> +static struct platform_device omap3pandora_nand_device = {
> + .name = "omap2-nand",
> + .id = -1,
> + .dev = {
> + .platform_data = &omap3pandora_nand_data,
> + },
> + .num_resources = ARRAY_SIZE(omap3pandora_nand_resource),
> + .resource = omap3pandora_nand_resource,
> +};
> +
> +static void __init omap3pandora_flash_init(void)
> +{
> + u8 cs = 0;
> + u8 nandcs = GPMC_CS_NUM + 1;
> +
> + u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
If it's a virtual address why is it an integer?
> +
> + /* find out the chip-select on which NAND exists */
> + while (cs < GPMC_CS_NUM) {
> + u32 ret = 0;
> + ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
> +
> + if ((ret & 0xC00) == 0x800) {
> + printk(KERN_INFO "Found NAND on CS%d\n", cs);
> + if (nandcs > GPMC_CS_NUM)
> + nandcs = cs;
> + }
> + cs++;
> + }
Shouldn't this be some generic bit of code?
> +
> + if (nandcs > GPMC_CS_NUM) {
> + printk(KERN_INFO "NAND: Unable to find configuration "
> + "in GPMC\n ");
> + return;
> + }
> +
> + if (nandcs < GPMC_CS_NUM) {
> + omap3pandora_nand_data.cs = nandcs;
> + omap3pandora_nand_data.gpmc_cs_baseaddr = (void *)
> + (gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
> + omap3pandora_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
Unnecessary casts with proper typing of gpmc_base_add.
> +
> + printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
Shouldn't something also update omap3pandora_nand_resource?
> + if (platform_device_register(&omap3pandora_nand_device) < 0)
> + printk(KERN_ERR "Unable to register NAND device\n");
> + }
> +}
> +
> +static struct omap_uart_config omap3pandora_uart_config __initdata = {
> + .enabled_uarts = (1 << 2), /* UART3 */
> +};
> +
> +static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
> + .gpio_base = OMAP_MAX_GPIO_LINES,
> + .irq_base = TWL4030_GPIO_IRQ_BASE,
> + .irq_end = TWL4030_GPIO_IRQ_END,
> +};
> +
> +static struct twl4030_usb_data omap3pandora_usb_data = {
> + .usb_mode = T2_USB_MODE_ULPI,
> +};
> +
> +static struct twl4030_platform_data omap3pandora_twldata = {
> + .irq_base = TWL4030_IRQ_BASE,
> + .irq_end = TWL4030_IRQ_END,
> + .gpio = &omap3pandora_gpio_data,
> + .usb = &omap3pandora_usb_data,
> +};
> +
> +static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
> + {
> + I2C_BOARD_INFO("tps65950", 0x48),
> + .flags = I2C_CLIENT_WAKE,
> + .irq = INT_34XX_SYS_NIRQ,
> + .platform_data = &omap3pandora_twldata,
> + },
> +};
> +
> +static int __init omap3pandora_i2c_init(void)
> +{
> + omap_register_i2c_bus(1, 2600, omap3pandora_i2c_boardinfo,
> + ARRAY_SIZE(omap3pandora_i2c_boardinfo));
> + /* i2c2 pins are not connected */
> + omap_register_i2c_bus(3, 400, NULL, 0);
> + return 0;
> +}
> +
> +static void __init omap3pandora_init_irq(void)
> +{
> + omap2_init_common_hw();
> + omap_init_irq();
> + omap_gpio_init();
> +}
> +
> +static void __init omap3pandora_ads7846_init(void)
> +{
> + int gpio = OMAP3_PANDORA_TS_GPIO;
> + int ret;
> +
> + ret = gpio_request(gpio, "ads7846_pen_down");
> + if (ret < 0) {
> + printk(KERN_ERR "Failed to request GPIO %d for "
> + "ads7846 pen down IRQ\n", gpio);
> + return;
> + }
> +
> + gpio_direction_input(gpio);
> +}
> +
> +static int ads7846_get_pendown_state(void)
> +{
> + return !gpio_get_value(OMAP3_PANDORA_TS_GPIO);
> +}
> +
> +static struct ads7846_platform_data ads7846_config = {
> + .x_max = 0x0fff,
> + .y_max = 0x0fff,
> + .x_plate_ohms = 180,
> + .pressure_max = 255,
> + .debounce_max = 10,
> + .debounce_tol = 3,
> + .debounce_rep = 1,
> + .get_pendown_state = ads7846_get_pendown_state,
> + .keep_vref_on = 1,
> +};
> +
> +static struct omap2_mcspi_device_config ads7846_mcspi_config = {
> + .turbo_mode = 0,
> + .single_channel = 1, /* 0: slave, 1: master */
> +};
> +
> +static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
> + {
> + .modalias = "ads7846",
> + .bus_num = 1,
> + .chip_select = 0,
> + .max_speed_hz = 1500000,
> + .controller_data = &ads7846_mcspi_config,
> + .irq = OMAP_GPIO_IRQ(OMAP3_PANDORA_TS_GPIO),
> + .platform_data = &ads7846_config,
> + }
> +};
> +
> +static struct platform_device omap3pandora_lcd_device = {
> + .name = "pandora_lcd",
> + .id = -1,
> +};
> +
> +static struct omap_lcd_config omap3pandora_lcd_config __initdata = {
> + .ctrl_name = "internal",
> +};
> +
> +static struct omap_board_config_kernel omap3pandora_config[] __initdata = {
> + { OMAP_TAG_UART, &omap3pandora_uart_config },
> + { OMAP_TAG_LCD, &omap3pandora_lcd_config },
> +};
> +
> +static struct platform_device *omap3pandora_devices[] __initdata = {
> + &omap3pandora_lcd_device,
> +};
> +
> +static void __init omap3pandora_init(void)
> +{
> + omap3pandora_i2c_init();
> + platform_add_devices(omap3pandora_devices,
> + ARRAY_SIZE(omap3pandora_devices));
> + omap_board_config = omap3pandora_config;
> + omap_board_config_size = ARRAY_SIZE(omap3pandora_config);
> + omap_serial_init();
> + spi_register_board_info(omap3pandora_spi_board_info,
> + ARRAY_SIZE(omap3pandora_spi_board_info));
> + omap3pandora_flash_init();
> + omap3pandora_ads7846_init();
> +}
> +
> +static void __init omap3pandora_map_io(void)
> +{
> + omap2_set_globals_343x();
> + omap2_map_common_io();
> +}
> +
> +MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
> + .phys_io = 0x48000000,
> + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
> + .boot_params = 0x80000100,
> + .map_io = omap3pandora_map_io,
> + .init_irq = omap3pandora_init_irq,
> + .init_machine = omap3pandora_init,
> + .timer = &omap_timer,
> +MACHINE_END
>
>
> -------------------------------------------------------------------
> List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
> FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
> Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
