[PATCH 5 / 12] Board 3430 SDP file

[PATCH 5 / 12] Board 3430 SDP file

[Syed Mohammed, Khasim]

New board file for 3430 SDP

Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>

Files:
 arch/arm/mach-omap2/board-3430sdp.c
=======================================================================
diff -purN linux-omap/arch/arm/mach-omap2/board-3430sdp.c val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c
--- linux-omap/arch/arm/mach-omap2/board-3430sdp.c	1969-12-31 18:00:00.000000000 -0600
+++ val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c	2007-06-13 16:39:47.000000000 -0500
@@ -0,0 +1,302 @@
+/*
+ * linux/arch/arm/mach-omap2/board-3430sdp.c
+ *
+ * Copyright (C) 2007 Texas Instruments
+ *
+ * Modified from mach-omap2/board-generic.c
+ *
+ * Initial code: Syed Mohammed Khasim
+ *
+ * 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/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/flash.h>
+
+#include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/usb.h>
+#include <asm/arch/board.h>
+#include <asm/arch/common.h>
+#include <asm/arch/keypad.h>
+#include <asm/arch/dma.h>
+#include <asm/arch/gpmc.h>
+
+#include <asm/io.h>
+#include <asm/delay.h>
+
+#define	SDP3430_FLASH_CS	0
+#define	SDP3430_SMC91X_CS	3
+
+#ifdef CONFIG_USB_MUSB_HDRC
+#include <linux/usb_musb.h>
+#endif
+
+static struct mtd_partition sdp3430_partitions[] = {
+	/* bootloader (U-Boot, etc) in first sector */
+	{
+		  .name		= "bootloader",
+		  .offset		= 0,
+		  .size		= SZ_256K,
+		  .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
+	},
+	/* file system */
+	{
+		  .name		= "filesystem",
+		  .offset		= MTDPART_OFS_APPEND,
+		  .size		= MTDPART_SIZ_FULL,
+		  .mask_flags	= 0
+	}
+};
+
+static struct flash_platform_data sdp3430_flash_data = {
+	.map_name	= "cfi_probe",
+	.width		= 2,
+	.parts		= sdp3430_partitions,
+	.nr_parts	= ARRAY_SIZE(sdp3430_partitions),
+};
+
+static struct resource sdp3430_flash_resource = {
+	.start		= FLASH_BASE,
+	.end		= FLASH_BASE + SZ_64M - 1,
+	.flags		= IORESOURCE_MEM,
+};
+
+static struct platform_device sdp3430_flash_device = {
+	.name		= "omapflash",
+	.id		= 0,
+	.dev		= {
+		.platform_data	= &sdp3430_flash_data,
+	},
+	.num_resources	= 1,
+	.resource	= &sdp3430_flash_resource,
+};
+
+static struct resource sdp3430_smc91x_resources[] = {
+	[0] = {
+		.start	= OMAP34XX_ETHR_START,
+		.end	= OMAP34XX_ETHR_START + SZ_4K,
+		.flags		= IORESOURCE_MEM,
+		  },
+	[1] = {
+		.start		= OMAP_GPIO_IRQ(OMAP34XX_ETHR_GPIO_IRQ),
+		.end	= 0,
+		.flags		= IORESOURCE_IRQ,
+		  },
+};
+
+static struct platform_device sdp3430_smc91x_device = {
+	.name		= "smc91x",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(sdp3430_smc91x_resources),
+	.resource	= sdp3430_smc91x_resources,
+};
+
+#ifdef CONFIG_USB_MUSB_HDRC
+static struct resource musb_resources[] = {
+	[0] = {
+		 .start	= OMAP343X_HS_BASE,
+		 .end	= OMAP343X_HS_BASE + SZ_8K,
+		 .flags	= IORESOURCE_MEM,
+		  },
+	[1] = {	/* general IRQ */
+		 .start	= INT_HS_USB_MC_NINT,
+		 .flags	= IORESOURCE_IRQ,
+		  },
+	[2] = {		/* DMA IRQ */
+		 .start	= INT_HS_USB_DMA_NINT,
+		 .flags	= IORESOURCE_IRQ,
+		  },
+};
+
+static struct musb_hdrc_platform_data musb_plat = {
+#ifdef CONFIG_USB_MUSB_OTG
+	.mode		= MUSB_OTG,
+#elif CONFIG_USB_MUSB_HDRC_HCD
+	.mode		= MUSB_HOST,
+#elif CONFIG_USB_GADGET_MUSB_HDRC
+	.mode		= MUSB_PERIPHERAL,
+#endif
+	.multipoint	= 1,
+};
+
+static u64 musb_dmamask = ~(u32)0;
+
+static struct platform_device musb_device = {
+	.name		= "musb_hdrc",
+	.id		= 0,
+	.dev = {
+		.dma_mask		= &musb_dmamask,
+		.coherent_dma_mask	= 0xffffffff,
+		.platform_data		= &musb_plat,
+	},
+	.num_resources	= ARRAY_SIZE(musb_resources),
+	.resource	= musb_resources,
+};
+#endif /* CONFIG_USB_MUSB_HDRC */
+static struct platform_device *sdp3430_devices[] __initdata = {
+	&sdp3430_smc91x_device,
+	&sdp3430_flash_device,
+#ifdef CONFIG_USB_MUSB_HDRC
+	&musb_device,
+#endif
+};
+#if 	defined(CONFIG_USB_OMAP24XX_FS_PORT0)
+static struct omap_usb_config fsusb_otg0_config __initdata = {
+	/* usb0 has a Mini-AB port and external isp1301 transceiver */
+	.otg		= 1,
+
+#ifdef	CONFIG_USB_GADGET_OMAP
+	.hmc_mode	= 0x0,	// 0:dev/otg 1:disabled 2:disabled
+
+#elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+	.hmc_mode	= 0x1,	// 0:host|otg 1:host 2:host
+#endif
+
+	.pins[0]	= 3,
+};
+
+#elif	defined(CONFIG_USB_OMAP24XX_FS_PORT1)
+static struct omap_usb_config fsusb_host1_config __initdata = {
+	.register_host	= 1,
+	.hmc_mode	= 0x1,	// 0:host|otg 1:host 2:host
+	.pins[1]	= 3,
+};
+#endif
+
+static inline void __init sdp3430_init_smc91x(void)
+{
+	int eth_cs;
+	unsigned long cs_mem_base;
+	unsigned int rate;
+	struct clk *l3ck;
+
+	eth_cs	= SDP3430_SMC91X_CS;
+
+	l3ck = clk_get(NULL, "core_l3_ck");
+	if (IS_ERR(l3ck))
+		rate = 100000000;
+	else
+		rate = clk_get_rate(l3ck);
+
+	if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
+		printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
+		return;
+	}
+
+	sdp3430_smc91x_resources[0].start = cs_mem_base + 0x0;
+	sdp3430_smc91x_resources[0].end   = cs_mem_base + 0xf;
+	udelay(100);
+
+	if (omap_request_gpio(OMAP34XX_ETHR_GPIO_IRQ) < 0) {
+		printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
+			OMAP34XX_ETHR_GPIO_IRQ);
+		return;
+	}
+	omap_set_gpio_direction(OMAP34XX_ETHR_GPIO_IRQ, 1);
+}
+
+static void __init sdp3430_init_flash(void)
+{
+	unsigned long base;
+
+	if (gpmc_cs_request(SDP3430_FLASH_CS, SZ_64M, &base) < 0) {
+		printk("Can't request GPMC CS for flash\n");
+		return;
+	}
+	sdp3430_flash_resource.start	= base;
+	sdp3430_flash_resource.end	= base + SZ_64M - 1;
+}
+
+static void __init omap_3430sdp_init_irq(void)
+{
+	omap2_init_common_hw();
+	omap_init_irq();
+	omap_gpio_init();
+	sdp3430_init_smc91x();
+}
+
+static struct omap_uart_config sdp3430_uart_config __initdata = {
+	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
+};
+
+static struct omap_mmc_config sdp3430_mmc_config __initdata = {
+	.mmc [0] = {
+		.enabled	= 1,
+		.wire4		= -1,
+		.wp_pin		= -1,
+		.power_pin	= -1,
+		.switch_pin	= 0,
+	},
+	.mmc [1] = {
+		.enabled	= 1,
+		.wire4		= -1,
+		.wp_pin		= -1,
+		.power_pin	= -1,
+		.switch_pin	= 1,
+	},
+};
+
+static struct omap_board_config_kernel sdp3430_config[] = {
+	{ OMAP_TAG_UART,	&sdp3430_uart_config },
+	{ OMAP_TAG_MMC,	&sdp3430_mmc_config },
+#if	defined(CONFIG_USB_OMAP24XX_FS_PORT0)
+	{ OMAP_TAG_USB,	&fsusb_otg0_config },
+#elif	defined(CONFIG_USB_OMAP24XX_FS_PORT1)
+	{ OMAP_TAG_USB,	&fsusb_host1_config },
+#endif
+};
+
+static void __init omap_3430sdp_init(void)
+{
+	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
+	omap_board_config = sdp3430_config;
+	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
+	omap_serial_init();
+}
+
+static void __init omap_3430sdp_map_io(void)
+{
+	omap2_map_common_io();
+}
+
+MACHINE_START(OMAP_SDP3430, "OMAP3430 sdp3430 board")
+	/* Maintainer: Syed Khasim - Texas Instruments Inc */
+	.phys_io	= 0x48000000,
+	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
+	.boot_params	= 0x80000100,
+	.map_io		= omap_3430sdp_map_io,
+	.init_irq	= omap_3430sdp_init_irq,
+	.init_machine	= omap_3430sdp_init,
+	.timer		= &omap_timer,
+MACHINE_END

Re: [PATCH 5 / 12] Board 3430 SDP file

[Trilok Soni]

On 6/14/07, Syed Mohammed, Khasim <x0khasim@ti.com> wrote:
> New board file for 3430 SDP
>
> Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>
>
> Files:
>  arch/arm/mach-omap2/board-3430sdp.c
> =======================================================================
> diff -purN linux-omap/arch/arm/mach-omap2/board-3430sdp.c val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c
> --- linux-omap/arch/arm/mach-omap2/board-3430sdp.c      1969-12-31 18:00:00.000000000 -0600
> +++ val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c    2007-06-13 16:39:47.000000000 -0500
> @@ -0,0 +1,302 @@
> +/*
> + * linux/arch/arm/mach-omap2/board-3430sdp.c
> + *
> + * Copyright (C) 2007 Texas Instruments
> + *
> + * Modified from mach-omap2/board-generic.c
> + *
> + * Initial code: Syed Mohammed Khasim
> + *
> + * 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/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
> +#include <linux/delay.h>
> +#include <linux/workqueue.h>
> +#include <linux/input.h>

Why this header file? I don't yet see input drivers related code in this file.

> +#include <linux/err.h>
> +#include <linux/clk.h>
> +
> +#include <asm/hardware.h>
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +#include <asm/mach/flash.h>
> +
> +#include <asm/arch/gpio.h>
> +#include <asm/arch/mux.h>
> +#include <asm/arch/usb.h>
> +#include <asm/arch/board.h>
> +#include <asm/arch/common.h>
> +#include <asm/arch/keypad.h>

Why this header file? I don't yet see keypad related code in this file.

> +#include <asm/arch/dma.h>
> +#include <asm/arch/gpmc.h>
> +
> +#include <asm/io.h>
> +#include <asm/delay.h>
> +
> +#define        SDP3430_FLASH_CS        0
> +#define        SDP3430_SMC91X_CS       3
> +
> +#ifdef CONFIG_USB_MUSB_HDRC
> +#include <linux/usb_musb.h>
> +#endif
> +
> +static struct mtd_partition sdp3430_partitions[] = {
> +       /* bootloader (U-Boot, etc) in first sector */
> +       {
> +                 .name         = "bootloader",
> +                 .offset               = 0,
> +                 .size         = SZ_256K,
> +                 .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
> +       },
> +       /* file system */
> +       {
> +                 .name         = "filesystem",
> +                 .offset               = MTDPART_OFS_APPEND,
> +                 .size         = MTDPART_SIZ_FULL,
> +                 .mask_flags   = 0
> +       }
> +};
> +
> +static struct flash_platform_data sdp3430_flash_data = {
> +       .map_name       = "cfi_probe",
> +       .width          = 2,
> +       .parts          = sdp3430_partitions,
> +       .nr_parts       = ARRAY_SIZE(sdp3430_partitions),
> +};
> +
> +static struct resource sdp3430_flash_resource = {
> +       .start          = FLASH_BASE,
> +       .end            = FLASH_BASE + SZ_64M - 1,
> +       .flags          = IORESOURCE_MEM,
> +};
> +
> +static struct platform_device sdp3430_flash_device = {
> +       .name           = "omapflash",
> +       .id             = 0,
> +       .dev            = {
> +               .platform_data  = &sdp3430_flash_data,
> +       },
> +       .num_resources  = 1,
> +       .resource       = &sdp3430_flash_resource,
> +};
> +
> +static struct resource sdp3430_smc91x_resources[] = {
> +       [0] = {
> +               .start  = OMAP34XX_ETHR_START,
> +               .end    = OMAP34XX_ETHR_START + SZ_4K,
> +               .flags          = IORESOURCE_MEM,
> +                 },

The closing "}" bracket should be indented to come under "[" bracket
not to "{". Please check other board files.

> +       [1] = {
> +               .start          = OMAP_GPIO_IRQ(OMAP34XX_ETHR_GPIO_IRQ),
> +               .end    = 0,
> +               .flags          = IORESOURCE_IRQ,
> +                 },
> +};
> +
> +static struct platform_device sdp3430_smc91x_device = {
> +       .name           = "smc91x",
> +       .id             = -1,
> +       .num_resources  = ARRAY_SIZE(sdp3430_smc91x_resources),
> +       .resource       = sdp3430_smc91x_resources,
> +};
> +
> +#ifdef CONFIG_USB_MUSB_HDRC
> +static struct resource musb_resources[] = {
> +       [0] = {
> +                .start = OMAP343X_HS_BASE,
> +                .end   = OMAP343X_HS_BASE + SZ_8K,
> +                .flags = IORESOURCE_MEM,
> +                 },

Ditto.

> +       [1] = { /* general IRQ */
> +                .start = INT_HS_USB_MC_NINT,
> +                .flags = IORESOURCE_IRQ,
> +                 },
> +       [2] = {         /* DMA IRQ */
> +                .start = INT_HS_USB_DMA_NINT,
> +                .flags = IORESOURCE_IRQ,
> +                 },
> +};
> +
> +static struct musb_hdrc_platform_data musb_plat = {
> +#ifdef CONFIG_USB_MUSB_OTG
> +       .mode           = MUSB_OTG,
> +#elif CONFIG_USB_MUSB_HDRC_HCD
> +       .mode           = MUSB_HOST,
> +#elif CONFIG_USB_GADGET_MUSB_HDRC
> +       .mode           = MUSB_PERIPHERAL,
> +#endif
> +       .multipoint     = 1,
> +};
> +
> +static u64 musb_dmamask = ~(u32)0;
> +
> +static struct platform_device musb_device = {
> +       .name           = "musb_hdrc",
> +       .id             = 0,
> +       .dev = {
> +               .dma_mask               = &musb_dmamask,
> +               .coherent_dma_mask      = 0xffffffff,
> +               .platform_data          = &musb_plat,
> +       },
> +       .num_resources  = ARRAY_SIZE(musb_resources),
> +       .resource       = musb_resources,
> +};
> +#endif /* CONFIG_USB_MUSB_HDRC */
> +static struct platform_device *sdp3430_devices[] __initdata = {
> +       &sdp3430_smc91x_device,
> +       &sdp3430_flash_device,
> +#ifdef CONFIG_USB_MUSB_HDRC
> +       &musb_device,
> +#endif
> +};
> +#if    defined(CONFIG_USB_OMAP24XX_FS_PORT0)
> +static struct omap_usb_config fsusb_otg0_config __initdata = {
> +       /* usb0 has a Mini-AB port and external isp1301 transceiver */
> +       .otg            = 1,
> +
> +#ifdef CONFIG_USB_GADGET_OMAP
> +       .hmc_mode       = 0x0,  // 0:dev/otg 1:disabled 2:disabled

Avoid "//" comments please. scripts/checkpatch.pl can help here.


> +
> +#elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
> +       .hmc_mode       = 0x1,  // 0:host|otg 1:host 2:host
> +#endif
> +
> +       .pins[0]        = 3,
> +};
> +
> +#elif  defined(CONFIG_USB_OMAP24XX_FS_PORT1)
> +static struct omap_usb_config fsusb_host1_config __initdata = {
> +       .register_host  = 1,
> +       .hmc_mode       = 0x1,  // 0:host|otg 1:host 2:host
> +       .pins[1]        = 3,
> +};
> +#endif
> +
> +static inline void __init sdp3430_init_smc91x(void)
> +{
> +       int eth_cs;
> +       unsigned long cs_mem_base;
> +       unsigned int rate;
> +       struct clk *l3ck;
> +
> +       eth_cs  = SDP3430_SMC91X_CS;
> +
> +       l3ck = clk_get(NULL, "core_l3_ck");
> +       if (IS_ERR(l3ck))
> +               rate = 100000000;
> +       else
> +               rate = clk_get_rate(l3ck);
> +
> +       if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
> +               printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
> +               return;
> +       }
> +
> +       sdp3430_smc91x_resources[0].start = cs_mem_base + 0x0;
> +       sdp3430_smc91x_resources[0].end   = cs_mem_base + 0xf;
> +       udelay(100);
> +
> +       if (omap_request_gpio(OMAP34XX_ETHR_GPIO_IRQ) < 0) {
> +               printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
> +                       OMAP34XX_ETHR_GPIO_IRQ);
> +               return;
> +       }
> +       omap_set_gpio_direction(OMAP34XX_ETHR_GPIO_IRQ, 1);
> +}
> +
> +static void __init sdp3430_init_flash(void)
> +{
> +       unsigned long base;
> +
> +       if (gpmc_cs_request(SDP3430_FLASH_CS, SZ_64M, &base) < 0) {
> +               printk("Can't request GPMC CS for flash\n");

KERN_* facility is required here.

> +               return;
> +       }
> +       sdp3430_flash_resource.start    = base;
> +       sdp3430_flash_resource.end      = base + SZ_64M - 1;
> +}
> +
> +static void __init omap_3430sdp_init_irq(void)
> +{
> +       omap2_init_common_hw();
> +       omap_init_irq();
> +       omap_gpio_init();
> +       sdp3430_init_smc91x();
> +}
> +
> +static struct omap_uart_config sdp3430_uart_config __initdata = {
> +       .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
> +};
> +
> +static struct omap_mmc_config sdp3430_mmc_config __initdata = {
> +       .mmc [0] = {
> +               .enabled        = 1,
> +               .wire4          = -1,
> +               .wp_pin         = -1,
> +               .power_pin      = -1,
> +               .switch_pin     = 0,
> +       },
> +       .mmc [1] = {
> +               .enabled        = 1,
> +               .wire4          = -1,
> +               .wp_pin         = -1,
> +               .power_pin      = -1,
> +               .switch_pin     = 1,
> +       },
> +};
> +
> +static struct omap_board_config_kernel sdp3430_config[] = {
> +       { OMAP_TAG_UART,        &sdp3430_uart_config },
> +       { OMAP_TAG_MMC, &sdp3430_mmc_config },
> +#if    defined(CONFIG_USB_OMAP24XX_FS_PORT0)
> +       { OMAP_TAG_USB, &fsusb_otg0_config },
> +#elif  defined(CONFIG_USB_OMAP24XX_FS_PORT1)
> +       { OMAP_TAG_USB, &fsusb_host1_config },
> +#endif
> +};
> +
> +static void __init omap_3430sdp_init(void)
> +{
> +       platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
> +       omap_board_config = sdp3430_config;
> +       omap_board_config_size = ARRAY_SIZE(sdp3430_config);
> +       omap_serial_init();
> +}
> +
> +static void __init omap_3430sdp_map_io(void)
> +{
> +       omap2_map_common_io();
> +}
> +
> +MACHINE_START(OMAP_SDP3430, "OMAP3430 sdp3430 board")
> +       /* Maintainer: Syed Khasim - Texas Instruments Inc */
> +       .phys_io        = 0x48000000,
> +       .io_pg_offst    = ((0xd8000000) >> 18) & 0xfffc,
> +       .boot_params    = 0x80000100,
> +       .map_io         = omap_3430sdp_map_io,
> +       .init_irq       = omap_3430sdp_init_irq,
> +       .init_machine   = omap_3430sdp_init,
> +       .timer          = &omap_timer,
> +MACHINE_END
> _______________________________________________
> Linux-omap-open-source mailing list
> Linux-omap-open-source@linux.omap.com
> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>

-- 
--Trilok Soni

[PATCH 5 / 12] Board 3430 SDP file

[Syed Mohammed, Khasim]

Reposting after incorporating review comments.

New board file for 3430 SDP

Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>

Files:
 arch/arm/mach-omap2/board-3430sdp.c
=======================================================================
diff -purN linux-omap/arch/arm/mach-omap2/board-3430sdp.c val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c
--- linux-omap/arch/arm/mach-omap2/board-3430sdp.c	1969-12-31 18:00:00.000000000 -0600
+++ val_3430_GIT/arch/arm/mach-omap2/board-3430sdp.c	2007-06-14 01:16:24.000000000 -0500
@@ -0,0 +1,302 @@
+/*
+ * linux/arch/arm/mach-omap2/board-3430sdp.c
+ *
+ * Copyright (C) 2007 Texas Instruments
+ *
+ * Modified from mach-omap2/board-generic.c
+ *
+ * Initial code: Syed Mohammed Khasim
+ *
+ * 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/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/flash.h>
+
+#include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/usb.h>
+#include <asm/arch/board.h>
+#include <asm/arch/common.h>
+#include <asm/arch/keypad.h>
+#include <asm/arch/dma.h>
+#include <asm/arch/gpmc.h>
+
+#include <asm/io.h>
+#include <asm/delay.h>
+
+#define	SDP3430_FLASH_CS	0
+#define	SDP3430_SMC91X_CS	3
+
+#ifdef CONFIG_USB_MUSB_HDRC
+#include <linux/usb_musb.h>
+#endif
+
+static struct mtd_partition sdp3430_partitions[] = {
+	/* bootloader (U-Boot, etc) in first sector */
+	{
+	      .name		= "bootloader",
+	      .offset		= 0,
+	      .size		= SZ_256K,
+	      .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
+	},
+	/* file system */
+	{
+	      .name		= "filesystem",
+	      .offset		= MTDPART_OFS_APPEND,
+	      .size		= MTDPART_SIZ_FULL,
+	      .mask_flags	= 0
+	}
+};
+
+static struct flash_platform_data sdp3430_flash_data = {
+	.map_name	= "cfi_probe",
+	.width		= 2,
+	.parts		= sdp3430_partitions,
+	.nr_parts	= ARRAY_SIZE(sdp3430_partitions),
+};
+
+static struct resource sdp3430_flash_resource = {
+	.start		= FLASH_BASE,
+	.end		= FLASH_BASE + SZ_64M - 1,
+	.flags		= IORESOURCE_MEM,
+};
+
+static struct platform_device sdp3430_flash_device = {
+	.name		= "omapflash",
+	.id		= 0,
+	.dev		= {
+		.platform_data	= &sdp3430_flash_data,
+	},
+	.num_resources	= 1,
+	.resource	= &sdp3430_flash_resource,
+};
+
+static struct resource sdp3430_smc91x_resources[] = {
+	[0] = {
+		.start	= OMAP34XX_ETHR_START,
+		.end	= OMAP34XX_ETHR_START + SZ_4K,
+		.flags  = IORESOURCE_MEM,
+	},
+	[1] = {
+		.start  = OMAP_GPIO_IRQ(OMAP34XX_ETHR_GPIO_IRQ),
+		.end    = 0,
+		.flags  = IORESOURCE_IRQ,
+	},
+};
+
+static struct platform_device sdp3430_smc91x_device = {
+	.name		= "smc91x",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(sdp3430_smc91x_resources),
+	.resource	= sdp3430_smc91x_resources,
+};
+
+#ifdef CONFIG_USB_MUSB_HDRC
+static struct resource musb_resources[] = {
+	[0] = {
+		 .start	= OMAP343X_HS_BASE,
+		 .end	= OMAP343X_HS_BASE + SZ_8K,
+		 .flags	= IORESOURCE_MEM,
+	},
+	[1] = {	/* general IRQ */
+		 .start	= INT_HS_USB_MC_NINT,
+		 .flags	= IORESOURCE_IRQ,
+	},
+	[2] = {	/* DMA IRQ */
+		 .start	= INT_HS_USB_DMA_NINT,
+		 .flags	= IORESOURCE_IRQ,
+	},
+};
+
+static struct musb_hdrc_platform_data musb_plat = {
+#ifdef CONFIG_USB_MUSB_OTG
+	.mode		= MUSB_OTG,
+#elif CONFIG_USB_MUSB_HDRC_HCD
+	.mode		= MUSB_HOST,
+#elif CONFIG_USB_GADGET_MUSB_HDRC
+	.mode		= MUSB_PERIPHERAL,
+#endif
+	.multipoint	= 1,
+};
+
+static u64 musb_dmamask = ~(u32)0;
+
+static struct platform_device musb_device = {
+	.name		= "musb_hdrc",
+	.id		= 0,
+	.dev = {
+		.dma_mask		= &musb_dmamask,
+		.coherent_dma_mask	= 0xffffffff,
+		.platform_data		= &musb_plat,
+	},
+	.num_resources	= ARRAY_SIZE(musb_resources),
+	.resource	= musb_resources,
+};
+#endif /* CONFIG_USB_MUSB_HDRC */
+static struct platform_device *sdp3430_devices[] __initdata = {
+	&sdp3430_smc91x_device,
+	&sdp3430_flash_device,
+#ifdef CONFIG_USB_MUSB_HDRC
+	&musb_device,
+#endif
+};
+#if 	defined(CONFIG_USB_OMAP24XX_FS_PORT0)
+static struct omap_usb_config fsusb_otg0_config __initdata = {
+	/* usb0 has a Mini-AB port and external isp1301 transceiver */
+	.otg		= 1,
+
+#ifdef	CONFIG_USB_GADGET_OMAP
+	.hmc_mode	= 0x0,	/* 0:dev/otg 1:disabled 2:disabled */
+
+#elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+	.hmc_mode	= 0x1,	/* 0:host|otg 1:host 2:host */
+#endif
+
+	.pins[0]	= 3,
+};
+
+#elif	defined(CONFIG_USB_OMAP24XX_FS_PORT1)
+static struct omap_usb_config fsusb_host1_config __initdata = {
+	.register_host	= 1,
+	.hmc_mode	= 0x1,	/* 0:host|otg 1:host 2:host */
+	.pins[1]	= 3,
+};
+#endif
+
+static inline void __init sdp3430_init_smc91x(void)
+{
+	int eth_cs;
+	unsigned long cs_mem_base;
+	unsigned int rate;
+	struct clk *l3ck;
+
+	eth_cs	= SDP3430_SMC91X_CS;
+
+	l3ck = clk_get(NULL, "core_l3_ck");
+	if (IS_ERR(l3ck))
+		rate = 100000000;
+	else
+		rate = clk_get_rate(l3ck);
+
+	if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
+		printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
+		return;
+	}
+
+	sdp3430_smc91x_resources[0].start = cs_mem_base + 0x0;
+	sdp3430_smc91x_resources[0].end   = cs_mem_base + 0xf;
+	udelay(100);
+
+	if (omap_request_gpio(OMAP34XX_ETHR_GPIO_IRQ) < 0) {
+		printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
+			OMAP34XX_ETHR_GPIO_IRQ);
+		return;
+	}
+	omap_set_gpio_direction(OMAP34XX_ETHR_GPIO_IRQ, 1);
+}
+
+static void __init sdp3430_init_flash(void)
+{
+	unsigned long base;
+
+	if (gpmc_cs_request(SDP3430_FLASH_CS, SZ_64M, &base) < 0) {
+		printk(KERN_ERR "Can't request GPMC CS for flash\n");
+		return;
+	}
+	sdp3430_flash_resource.start	= base;
+	sdp3430_flash_resource.end	= base + SZ_64M - 1;
+}
+
+static void __init omap_3430sdp_init_irq(void)
+{
+	omap2_init_common_hw();
+	omap_init_irq();
+	omap_gpio_init();
+	sdp3430_init_smc91x();
+}
+
+static struct omap_uart_config sdp3430_uart_config __initdata = {
+	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
+};
+
+static struct omap_mmc_config sdp3430_mmc_config __initdata = {
+	.mmc [0] = {
+		.enabled	= 1,
+		.wire4		= -1,
+		.wp_pin		= -1,
+		.power_pin	= -1,
+		.switch_pin	= 0,
+	},
+	.mmc [1] = {
+		.enabled	= 1,
+		.wire4		= -1,
+		.wp_pin		= -1,
+		.power_pin	= -1,
+		.switch_pin	= 1,
+	},
+};
+
+static struct omap_board_config_kernel sdp3430_config[] = {
+	{ OMAP_TAG_UART,	&sdp3430_uart_config },
+	{ OMAP_TAG_MMC,         &sdp3430_mmc_config },
+#if	defined(CONFIG_USB_OMAP24XX_FS_PORT0)
+	{ OMAP_TAG_USB,		&fsusb_otg0_config },
+#elif	defined(CONFIG_USB_OMAP24XX_FS_PORT1)
+	{ OMAP_TAG_USB,		&fsusb_host1_config },
+#endif
+};
+
+static void __init omap_3430sdp_init(void)
+{
+	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
+	omap_board_config = sdp3430_config;
+	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
+	omap_serial_init();
+}
+
+static void __init omap_3430sdp_map_io(void)
+{
+	omap2_map_common_io();
+}
+
+MACHINE_START(OMAP_SDP3430, "OMAP3430 sdp3430 board")
+	/* Maintainer: Syed Khasim - Texas Instruments Inc */
+	.phys_io	= 0x48000000,
+	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
+	.boot_params	= 0x80000100,
+	.map_io		= omap_3430sdp_map_io,
+	.init_irq	= omap_3430sdp_init_irq,
+	.init_machine	= omap_3430sdp_init,
+	.timer		= &omap_timer,
+MACHINE_END

RE: [PATCH 5 / 12] Board 3430 SDP file

[Syed Mohammed, Khasim]

Hi Trilok,

>-----Original Message-----
>From: Trilok Soni [mailto:soni.trilok@gmail.com]
>Sent: Thursday, June 14, 2007 1:00 AM
>To: Syed Mohammed, Khasim
>Cc: Linux OMAP
>Subject: Re: [PATCH 5 / 12] Board 3430 SDP file
>
>On 6/14/07, Syed Mohammed, Khasim <x0khasim@ti.com> wrote:
>> New board file for 3430 SDP
>>
>> Signed-off-by: Syed Mohammed Khasim  <x0khasim@ti.com>
>>
>> Files:

Thanks for the comments. 

Regards,
Khasim

RE: [PATCH 5 / 12] Board 3430 SDP file

[Kyungmin Park]

Hi,

> +static struct omap_mmc_config sdp3430_mmc_config __initdata = {
> +	.mmc [0] = {
> +		.enabled	= 1,
> +		.wire4		= -1,
> +		.wp_pin		= -1,
> +		.power_pin	= -1,
> +		.switch_pin	= 0,
> +	},
> +	.mmc [1] = {
> +		.enabled	= 1,
> +		.wire4		= -1,
> +		.wp_pin		= -1,
> +		.power_pin	= -1,
> +		.switch_pin	= 1,
> +	},
> +};
> +

To disable the wire4 mode, you should assign the value 0 instead of -1. The "-1"
will enable the wire4 mode in the code.

static int __init mmc_omap_probe(struct platform_device *pdev)
{
        struct omap_mmc_conf *minfo = pdev->dev.platform_data;
	...
	if (minfo->wire4)
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
	...
}

Thank you,
Kyungmin Park

RE: [PATCH 5 / 12] Board 3430 SDP file

[Madhusudhan Chikkature Rajashekar]

Hi,

>To disable the wire4 mode, you should assign the value 0 instead of -1. The
>"-1" will enable the wire4 mode in the code.
Yes. Ideally it should have been set to 0.

But, note that the mmc_omap_probe you are referring here is of omap1 and
omap2(only 2420) driver. The above is a 3430 board file, so it might not
have that effect.

Regards,
Madhu


-----Original Message-----
From: linux-omap-open-source-bounces@linux.omap.com
[mailto:linux-omap-open-source-bounces@linux.omap.com] On Behalf Of Kyungmin
Park
Sent: Thursday, June 14, 2007 12:19 PM
To: 'Syed Mohammed, Khasim'; 'Linux OMAP'
Subject: RE: [PATCH 5 / 12] Board 3430 SDP file

Hi,

> +static struct omap_mmc_config sdp3430_mmc_config __initdata = {
> +	.mmc [0] = {
> +		.enabled	= 1,
> +		.wire4		= -1,
> +		.wp_pin		= -1,
> +		.power_pin	= -1,
> +		.switch_pin	= 0,
> +	},
> +	.mmc [1] = {
> +		.enabled	= 1,
> +		.wire4		= -1,
> +		.wp_pin		= -1,
> +		.power_pin	= -1,
> +		.switch_pin	= 1,
> +	},
> +};
> +

To disable the wire4 mode, you should assign the value 0 instead of -1. The
"-1"
will enable the wire4 mode in the code.

static int __init mmc_omap_probe(struct platform_device *pdev)
{
        struct omap_mmc_conf *minfo = pdev->dev.platform_data;
	...
	if (minfo->wire4)
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
	...
}

Thank you,
Kyungmin Park


_______________________________________________
Linux-omap-open-source mailing list
Linux-omap-open-source@linux.omap.com
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Re: [PATCH 5 / 12] Board 3430 SDP file

[Trilok Soni]

On 6/14/07, Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com> wrote:
> Hi,
>
> >To disable the wire4 mode, you should assign the value 0 instead of -1. The
> >"-1" will enable the wire4 mode in the code.
> Yes. Ideally it should have been set to 0.
>
> But, note that the mmc_omap_probe you are referring here is of omap1 and
> omap2(only 2420) driver. The above is a 3430 board file, so it might not
> have that effect.
>

I have hard time to understand above sentence. Do you mean new mmc
driver file for 3430 or you mean adding some #ifdefery in existing
mmc.c ?

-- 
--Trilok Soni

RE: [PATCH 5 / 12] Board 3430 SDP file

[Madhusudhan Chikkature Rajashekar]

Hi,

>I have hard time to understand above sentence. Do you mean new mmc
>driver file for 3430 or you mean adding some #ifdefery in existing
>mmc.c ?
The mmc controller in 2430/3430 is a new one which is very much different
from the omap1 mmc controller. The register set does not match. So, it makes
sense to write a new driver (I mean a different file) to support 2430/3430.

BTW,
Sorry about the wire4 mode. It should be set to "1" as the 3430 sdp can
support 4-bit.

Trilok,
I am not referring to mmc.c. I am referring to the mmc controller driver
omap.c.

Regards,
Madhu

-----Original Message-----
From: Trilok Soni [mailto:soni.trilok@gmail.com] 
Sent: Thursday, June 14, 2007 12:40 PM
To: Madhusudhan Chikkature Rajashekar
Cc: kmpark@infradead.org; Syed Mohammed, Khasim; Linux OMAP
Subject: Re: [PATCH 5 / 12] Board 3430 SDP file

On 6/14/07, Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com> wrote:
> Hi,
>
> >To disable the wire4 mode, you should assign the value 0 instead of -1.
The
> >"-1" will enable the wire4 mode in the code.
> Yes. Ideally it should have been set to 0.
>
> But, note that the mmc_omap_probe you are referring here is of omap1 and
> omap2(only 2420) driver. The above is a 3430 board file, so it might not
> have that effect.
>

I have hard time to understand above sentence. Do you mean new mmc
driver file for 3430 or you mean adding some #ifdefery in existing
mmc.c ?

-- 
--Trilok Soni

RE: [PATCH 5 / 12] Board 3430 SDP file

[Syed Mohammed, Khasim]

Hi Kyungmin,

>> +};
>> +
>
>To disable the wire4 mode, you should assign the value 0 instead of -1. The
>"-1"
>will enable the wire4 mode in the code.
>
Thanks for pointing this out. I will take this up along with MMC driver for 2430 / 3430.

For now, I prefer continuing with same patch.

I will be shortly adding OneNAND and Keypad drivers for 3430. Will work on MMC along with these.

Regards,
Khasim