public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Resubmitting 2430 Support - 2430 /arm/mach-omap2
@ 2006-11-10 19:06 Syed Mohammed, Khasim
  2006-11-10 20:37 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Syed Mohammed, Khasim @ 2006-11-10 19:06 UTC (permalink / raw)
  To: linux-omap-open-source

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi Tony,

The attached patch is for the arch/arm/mach-omap2 directory. The
existing files were updated to add OMAP2430 functionality. A new file
"board-2430sdp.c" is added to this directory.

I have removed the sync port that was in my previous patch. The new
files are indented (Lindent). 

Thanks & Regards,
Khasim


[-- Attachment #2: arch_2430support.patch --]
[-- Type: application/octet-stream, Size: 11460 bytes --]

This patch adds minimal OMAP2430 support to get the kernel booting on 2430SDP.

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

Files Changed:

 Kconfig         |    8 ++
 Makefile        |    1
 board-2430sdp.c |  224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 devices.c       |    2
 gpmc.c          |    7 +
 id.c            |    6 +
 io.c            |   22 +++++
 7 files changed, 268 insertions(+), 2 deletions(-)

=============================================================================
diff -purN linux-omap/arch/arm/mach-omap2/Kconfig dev-linux-omap-2.6.git/arch/arm/mach-omap2/Kconfig
--- linux-omap/arch/arm/mach-omap2/Kconfig	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/Kconfig	2006-11-10 10:12:48.000000000 -0600
@@ -11,6 +11,10 @@ config ARCH_OMAP2420
 	select OMAP_DM_TIMER
 	select ARCH_OMAP_OTG
 
+config ARCH_OMAP2430
+	bool "OMAP2430 support"
+	depends on ARCH_OMAP24XX
+
 comment "OMAP Board Type"
 	depends on ARCH_OMAP2
 
@@ -27,6 +31,10 @@ config MACH_OMAP_H4
 	depends on ARCH_OMAP2 && ARCH_OMAP24XX
 	select GPIOEXPANDER_OMAP
 
+config MACH_OMAP_2430SDP
+	bool "OMAP 2430 SDP board"
+	depends on ARCH_OMAP2 && ARCH_OMAP24XX
+
 config MACH_OMAP_H4_TUSB
 	bool "TUSB 6010 EVM board"
 	depends on MACH_OMAP_H4
diff -purN linux-omap/arch/arm/mach-omap2/Makefile dev-linux-omap-2.6.git/arch/arm/mach-omap2/Makefile
--- linux-omap/arch/arm/mach-omap2/Makefile	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/Makefile	2006-11-10 10:12:48.000000000 -0600
@@ -17,6 +17,7 @@ obj-$(CONFIG_OMAP_DSP) += mailbox.o
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o
+obj-$(CONFIG_MACH_OMAP_2430SDP)         += board-2430sdp.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o
 
 # TUSB 6010 chips
diff -purN linux-omap/arch/arm/mach-omap2/board-2430sdp.c dev-linux-omap-2.6.git/arch/arm/mach-omap2/board-2430sdp.c
--- linux-omap/arch/arm/mach-omap2/board-2430sdp.c	1969-12-31 18:00:00.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/board-2430sdp.c	2006-11-10 10:21:22.000000000 -0600
@@ -0,0 +1,224 @@
+/*
+ * linux/arch/arm/mach-omap/omap2/board-2430sdp.c
+ *
+ * Copyright (C) 2006 Texas Instruments
+ *
+ * Modified from mach-omap2/board-generic.c
+ *
+ * Initial Code : Based on a patch from Komal Shah and Richard Woodruff
+ * Updated the Code for 2430 SDP : 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/gpioexpander.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/usb.h>
+#include <asm/arch/irda.h>
+#include <asm/arch/board.h>
+#include <asm/arch/common.h>
+#include <asm/arch/keypad.h>
+#include <asm/arch/menelaus.h>
+#include <asm/arch/dma.h>
+#include <asm/arch/gpmc.h>
+#include "prcm-regs.h"
+
+#include <asm/io.h>
+#include <asm/delay.h>
+
+#define	SDP2430_FLASH_CS	0
+#define	SDP2430_SMC91X_CS	5
+
+static struct mtd_partition sdp2430_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 sdp2430_flash_data = {
+	.map_name = "cfi_probe",
+	.width = 2,
+	.parts = sdp2430_partitions,
+	.nr_parts = ARRAY_SIZE(sdp2430_partitions),
+};
+
+static struct resource sdp2430_flash_resource = {
+	.start = SDP2430_CS0_BASE,
+	.end = SDP2430_CS0_BASE + SZ_64M - 1,
+	.flags = IORESOURCE_MEM,
+};
+
+static struct platform_device sdp2430_flash_device = {
+	.name = "omapflash",
+	.id = 0,
+	.dev = {
+		.platform_data = &sdp2430_flash_data,
+		},
+	.num_resources = 1,
+	.resource = &sdp2430_flash_resource,
+};
+
+static struct resource sdp2430_smc91x_resources[] = {
+	[0] = {
+	       .start = SDP2430_CS0_BASE,
+	       .end = SDP2430_CS0_BASE + SZ_64M - 1,
+	       .flags = IORESOURCE_MEM,
+	       },
+	[1] = {
+	       .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
+	       .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
+	       .flags = IORESOURCE_IRQ,
+	       },
+};
+
+static struct platform_device sdp2430_smc91x_device = {
+	.name = "smc91x",
+	.id = -1,
+	.num_resources = ARRAY_SIZE(sdp2430_smc91x_resources),
+	.resource = sdp2430_smc91x_resources,
+};
+
+static struct platform_device *sdp2430_devices[] __initdata = {
+	&sdp2430_smc91x_device,
+	&sdp2430_flash_device,
+};
+
+static inline void __init sdp2430_init_smc91x(void)
+{
+	int eth_cs;
+	unsigned long cs_mem_base;
+	unsigned int rate;
+	struct clk *l3ck;
+
+	eth_cs = SDP2430_SMC91X_CS;
+
+	l3ck = clk_get(NULL, "core_l3_ck");
+	if (IS_ERR(l3ck))
+		rate = 100000000;
+	else
+		rate = clk_get_rate(l3ck);
+
+	/* Make sure CS1 timings are correct, for 2430 always muxed */
+	gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG1, 0x00011200);
+
+	if (rate >= 160000000) {
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f01);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080803);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1c0b1c0a);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4);
+	} else if (rate >= 130000000) {
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4);
+	} else { /* rate = 100000000 */
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x031A1F1F);
+		gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000003C2);
+	}
+
+	if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
+		printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
+		return;
+	}
+
+	sdp2430_smc91x_resources[0].start = cs_mem_base + 0x300;
+	sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f;
+	udelay(100);
+
+	if (omap_request_gpio(OMAP24XX_ETHR_GPIO_IRQ) < 0) {
+		printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
+		       OMAP24XX_ETHR_GPIO_IRQ);
+		gpmc_cs_free(eth_cs);
+		return;
+	}
+	omap_set_gpio_direction(OMAP24XX_ETHR_GPIO_IRQ, 1);
+
+}
+
+static void __init omap_2430sdp_init_irq(void)
+{
+	omap2_init_common_hw();
+	omap_init_irq();
+	omap_gpio_init();
+	sdp2430_init_smc91x();
+}
+
+static struct omap_uart_config sdp2430_uart_config __initdata = {
+	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
+};
+
+static struct omap_board_config_kernel sdp2430_config[] = {
+	{OMAP_TAG_UART, &sdp2430_uart_config},
+};
+
+static void __init omap_2430sdp_init(void)
+{
+	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
+	omap_board_config = sdp2430_config;
+	omap_board_config_size = ARRAY_SIZE(sdp2430_config);
+	omap_serial_init();
+}
+
+static void __init omap_2430sdp_map_io(void)
+{
+	omap2_map_common_io();
+}
+
+MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
+    /* Maintainer: Syed Khasim - Texas Instruments Inc */
+    .phys_io      = 0x48000000,
+    .io_pg_offst  = ((0xd8000000) >> 18) & 0xfffc,
+    .boot_params  = 0x80000100,
+    .map_io       = omap_2430sdp_map_io,
+    .init_irq     = omap_2430sdp_init_irq,
+    .init_machine = omap_2430sdp_init,
+    .timer        = &omap_timer, 
+MACHINE_END
diff -purN linux-omap/arch/arm/mach-omap2/devices.c dev-linux-omap-2.6.git/arch/arm/mach-omap2/devices.c
--- linux-omap/arch/arm/mach-omap2/devices.c	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/devices.c	2006-11-10 11:47:01.000000000 -0600
@@ -52,7 +52,7 @@ static struct platform_device omap_i2c_d
 static void omap_init_i2c(void)
 {
 	/* REVISIT: Second I2C not in use on H4? */
-	if (machine_is_omap_h4())
+	if (machine_is_omap_h4() || machine_is_omap_2430sdp() )
 		return;
 
 	omap_cfg_reg(J15_24XX_I2C2_SCL);
diff -purN linux-omap/arch/arm/mach-omap2/gpmc.c dev-linux-omap-2.6.git/arch/arm/mach-omap2/gpmc.c
--- linux-omap/arch/arm/mach-omap2/gpmc.c	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/gpmc.c	2006-11-10 11:49:08.000000000 -0600
@@ -22,7 +22,14 @@
 
 #undef DEBUG
 
+#ifdef CONFIG_ARCH_OMAP2420
 #define GPMC_BASE		0x6800a000
+#endif
+
+#ifdef CONFIG_ARCH_OMAP2430
+#define GPMC_BASE		0x6E000000
+#endif
+
 #define GPMC_REVISION		0x00
 #define GPMC_SYSCONFIG		0x10
 #define GPMC_SYSSTATUS		0x14
diff -purN linux-omap/arch/arm/mach-omap2/id.c dev-linux-omap-2.6.git/arch/arm/mach-omap2/id.c
--- linux-omap/arch/arm/mach-omap2/id.c	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/id.c	2006-11-10 11:53:12.000000000 -0600
@@ -17,7 +17,13 @@
 
 #include <asm/io.h>
 
+#if defined(CONFIG_ARCH_OMAP2420)
 #define OMAP24XX_TAP_BASE	io_p2v(0x48014000)
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2430)
+#define OMAP24XX_TAP_BASE	io_p2v(0x4900A000)
+#endif
 
 #define OMAP_TAP_IDCODE		0x0204
 #define OMAP_TAP_PROD_ID	0x0208
diff -purN linux-omap/arch/arm/mach-omap2/io.c dev-linux-omap-2.6.git/arch/arm/mach-omap2/io.c
--- linux-omap/arch/arm/mach-omap2/io.c	2006-11-02 00:15:02.000000000 -0600
+++ dev-linux-omap-2.6.git/arch/arm/mach-omap2/io.c	2006-11-10 12:01:47.000000000 -0600
@@ -5,7 +5,8 @@
  *
  * Copyright (C) 2005 Nokia Corporation
  * Author: Juha Yrjölä <juha.yrjola@nokia.com>
- *
+ * Updated map desc to add 2430 support : <x0khasim@ti.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.
@@ -46,6 +47,20 @@ static struct map_desc omap2_io_desc[] _
 		.length		= L4_24XX_SIZE,
 		.type		= MT_DEVICE
 	},
+#ifdef CONFIG_ARCH_OMAP2430
+	{
+		.virtual	= L4_WK_243X_VIRT,
+		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),
+		.length		= L4_WK_243X_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= OMAP243X_GPMC_VIRT,
+		.pfn		= __phys_to_pfn(OMAP243X_GPMC_PHYS),
+		.length		= OMAP243X_GPMC_SIZE,
+		.type		= MT_DEVICE
+	},
+#endif
 	{
 		.virtual	= DSP_MEM_24XX_VIRT,
 		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),
@@ -86,6 +101,11 @@ void __init omap2_init_common_hw(void)
 {
 	omap2_mux_init();
 	omap2_clk_init();
+/*
+ * Need to Fix this for 2430
+ */
+#ifndef CONFIG_ARCH_OMAP2430
 	omap2_init_memory();
+#endif
 	gpmc_init();
 }

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-11-10 20:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-10 19:06 [PATCH] Resubmitting 2430 Support - 2430 /arm/mach-omap2 Syed Mohammed, Khasim
2006-11-10 20:37 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox