[ARM] 3247/1: AT91RM9200 support for 2.6 (Cogent CSB337 & CSB637 boards) (Patch

	#3244)

Patch from Andrew Victor

This patch adds support to the 2.6 kernel series for the Atmel
AT91RM9200 processor.

This patch is the support for the Cogent CSB337 and CSB637 boards.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

3 files changed, 261 insertions, 2 deletions

diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile
index a1b4ea3ec470..75e6ee318ded 100644
--- a/arch/arm/mach-at91rm9200/Makefile
+++ b/arch/arm/mach-at91rm9200/Makefile
@@ -10,8 +10,8 @@ obj-		:=
 # Board-specific support
 obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
 obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
-#obj-$(CONFIG_MACH_CSB337)      += board-csb337.o
-#obj-$(CONFIG_MACH_CSB637)      += board-csb637.o
+obj-$(CONFIG_MACH_CSB337)       += board-csb337.o
+obj-$(CONFIG_MACH_CSB637)       += board-csb637.o
 #obj-$(CONFIG_MACH_CARMEVA)     += board-carmeva.o
 #obj-$(CONFIG_MACH_KB9200)      += board-kb9202.o
 
diff --git a/arch/arm/mach-at91rm9200/board-csb337.c b/arch/arm/mach-at91rm9200/board-csb337.c
new file mode 100644
index 000000000000..4aec834ee47f
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/board-csb337.c
@@ -0,0 +1,143 @@
+/*
+ * linux/arch/arm/mach-at91rm9200/board-csb337.c
+ *
+ *  Copyright (C) 2005 SAN People
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/hardware.h>
+#include <asm/mach/serial_at91rm9200.h>
+#include <asm/arch/board.h>
+
+#include "generic.h"
+
+static void __init csb337_init_irq(void)
+{
+        /* Initialize AIC controller */
+        at91rm9200_init_irq(NULL);
+
+        /* Set up the GPIO interrupts */
+        at91_gpio_irq_setup(BGA_GPIO_BANKS);
+}
+
+/*
+ * Serial port configuration.
+ *    0 .. 3 = USART0 .. USART3
+ *    4      = DBGU
+ */
+#define CSB337_UART_MAP         { 4, 1, -1, -1, -1 }    /* ttyS0, ..., ttyS4 */
+#define CSB337_SERIAL_CONSOLE   0                       /* ttyS0 */
+
+static void __init csb337_map_io(void)
+{
+        int serial[AT91_NR_UART] = CSB337_UART_MAP;
+        int i;
+
+        at91rm9200_map_io();
+
+        /* Initialize clocks: 3.6864 MHz crystal */
+        at91_clock_init(3686400);
+
+#ifdef CONFIG_SERIAL_AT91
+        at91_console_port = CSB337_SERIAL_CONSOLE;
+        memcpy(at91_serial_map, serial, sizeof(serial));
+
+        /* Register UARTs */
+        for (i = 0; i < AT91_NR_UART; i++) {
+                if (serial[i] >= 0)
+                        at91_register_uart(i, serial[i]);
+        }
+#endif
+}
+
+static struct at91_eth_data __initdata csb337_eth_data = {
+        .phy_irq_pin    = AT91_PIN_PC2,
+        .is_rmii        = 0,
+};
+
+static struct at91_usbh_data __initdata csb337_usbh_data = {
+        .ports          = 2,
+};
+
+static struct at91_udc_data __initdata csb337_udc_data = {
+        // this has no VBUS sensing pin
+        .pullup_pin     = AT91_PIN_PA24,
+};
+
+static struct at91_cf_data __initdata csb337_cf_data = {
+        /*
+         * connector P4 on the CSB 337 mates to
+         * connector P8 on the CSB 300CF
+         */
+
+        /* CSB337 specific */
+        .det_pin        = AT91_PIN_PC3,
+
+        /* CSB300CF specific */
+        .irq_pin        = AT91_PIN_PA19,
+        .vcc_pin        = AT91_PIN_PD0,
+        .rst_pin        = AT91_PIN_PD2,
+};
+
+static struct at91_mmc_data __initdata csb337_mmc_data = {
+        .det_pin        = AT91_PIN_PD5,
+        .is_b           = 0,
+        .wire4          = 1,
+        .wp_pin         = AT91_PIN_PD6,
+};
+
+static void __init csb337_board_init(void)
+{
+        /* Ethernet */
+        at91_add_device_eth(&csb337_eth_data);
+        /* USB Host */
+        at91_add_device_usbh(&csb337_usbh_data);
+        /* USB Device */
+        at91_add_device_udc(&csb337_udc_data);
+        /* Compact Flash */
+        at91_set_gpio_input(AT91_PIN_PB22, 1);          /* IOIS16 */
+        at91_add_device_cf(&csb337_cf_data);
+        /* MMC */
+        at91_add_device_mmc(&csb337_mmc_data);
+}
+
+MACHINE_START(CSB337, "Cogent CSB337")
+        /* Maintainer: Bill Gatliff */
+        .phys_ram       = AT91_SDRAM_BASE,
+        .phys_io        = AT91_BASE_SYS,
+        .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+        .boot_params    = AT91_SDRAM_BASE + 0x100,
+        .timer          = &at91rm9200_timer,
+        .map_io         = csb337_map_io,
+        .init_irq       = csb337_init_irq,
+        .init_machine   = csb337_board_init,
+MACHINE_END
diff --git a/arch/arm/mach-at91rm9200/board-csb637.c b/arch/arm/mach-at91rm9200/board-csb637.c
new file mode 100644
index 000000000000..23e4cc21481a
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/board-csb637.c
@@ -0,0 +1,116 @@
+/*
+ * linux/arch/arm/mach-at91rm9200/board-csb637.c
+ *
+ *  Copyright (C) 2005 SAN People
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/hardware.h>
+#include <asm/mach/serial_at91rm9200.h>
+#include <asm/arch/board.h>
+
+#include "generic.h"
+
+static void __init csb637_init_irq(void)
+{
+        /* Initialize AIC controller */
+        at91rm9200_init_irq(NULL);
+
+        /* Set up the GPIO interrupts */
+        at91_gpio_irq_setup(BGA_GPIO_BANKS);
+}
+
+/*
+ * Serial port configuration.
+ *    0 .. 3 = USART0 .. USART3
+ *    4      = DBGU
+ */
+#define CSB637_UART_MAP         { 4, 1, -1, -1, -1 }    /* ttyS0, ..., ttyS4 */
+#define CSB637_SERIAL_CONSOLE   0                       /* ttyS0 */
+
+static void __init csb637_map_io(void)
+{
+        int serial[AT91_NR_UART] = CSB637_UART_MAP;
+        int i;
+
+        at91rm9200_map_io();
+
+        /* Initialize clocks: 3.6864 MHz crystal */
+        at91_clock_init(3686400);
+
+#ifdef CONFIG_SERIAL_AT91
+        at91_console_port = CSB637_SERIAL_CONSOLE;
+        memcpy(at91_serial_map, serial, sizeof(serial));
+
+        /* Register UARTs */
+        for (i = 0; i < AT91_NR_UART; i++) {
+                if (serial[i] >= 0)
+                        at91_register_uart(i, serial[i]);
+        }
+#endif
+}
+
+static struct at91_eth_data __initdata csb637_eth_data = {
+        .phy_irq_pin    = AT91_PIN_PC0,
+        .is_rmii        = 0,
+};
+
+static struct at91_usbh_data __initdata csb637_usbh_data = {
+        .ports          = 2,
+};
+
+static struct at91_udc_data __initdata csb637_udc_data = {
+        .vbus_pin     = AT91_PIN_PB28,
+        .pullup_pin   = AT91_PIN_PB1,
+};
+
+static void __init csb637_board_init(void)
+{
+        /* Ethernet */
+        at91_add_device_eth(&csb637_eth_data);
+        /* USB Host */
+        at91_add_device_usbh(&csb637_usbh_data);
+        /* USB Device */
+        at91_add_device_udc(&csb637_udc_data);
+}
+
+MACHINE_START(CSB637, "Cogent CSB637")
+        /* Maintainer: Bill Gatliff */
+        .phys_ram       = AT91_SDRAM_BASE,
+        .phys_io        = AT91_BASE_SYS,
+        .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+        .boot_params    = AT91_SDRAM_BASE + 0x100,
+        .timer          = &at91rm9200_timer,
+        .map_io         = csb637_map_io,
+        .init_irq       = csb637_init_irq,
+        .init_machine   = csb637_board_init,
+MACHINE_END