This patch serie, against 2.6.27-rc2, adds support for the PXA-255 based
Arcom/Eurotech Viper SBC. It is roughly based on the old 2.6.16.28 port
made by Arcom, though all bugs are of course mine.
It's been heavily tested over the last two months.
Most of these patches are quite straightforward, except for the generic
PCMCIA patch that may be questionable.
As usual, I'll be glad to receive any comment you may have about this patch.
Thanks,
M.
arch/arm/configs/viper_defconfig | 1657 ++++++++++++++++++++++++++++++++++++++
arch/arm/mach-pxa/Kconfig | 6 +
arch/arm/mach-pxa/Makefile | 1 +
arch/arm/mach-pxa/viper.c | 952 ++++++++++++++++++++++
drivers/net/smc91x.h | 21 +
drivers/pcmcia/Kconfig | 2 +-
drivers/pcmcia/Makefile | 1 +
drivers/pcmcia/pxa2xx_base.c | 20 +-
drivers/pcmcia/pxa2xx_base.h | 7 +
drivers/pcmcia/pxa2xx_viper.c | 183 +++++
drivers/pcmcia/soc_common.h | 2 +
include/asm-arm/arch-pxa/irqs.h | 23 +
include/asm-arm/arch-pxa/viper.h | 91 +++
Signed-off-by: Marc Zyngier <[email protected]>
---
arch/arm/mach-pxa/Kconfig | 6 +
arch/arm/mach-pxa/Makefile | 1 +
arch/arm/mach-pxa/viper.c | 952 ++++++++++++++++++++++++++++++++++++++
include/asm-arm/arch-pxa/irqs.h | 23 +
include/asm-arm/arch-pxa/viper.h | 91 ++++
5 files changed, 1073 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-pxa/viper.c
create mode 100644 include/asm-arm/arch-pxa/viper.h
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e8ee7ec..31a554e 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -115,6 +115,12 @@ config MACH_TOSA
depends on PXA_SHARPSL
select PXA25x
+config ARCH_VIPER
+ bool "Arcom/Eurotech VIPER SBC"
+ select PXA25x
+ select ISA
+ select I2C_GPIO
+
config ARCH_PXA_ESERIES
bool "PXA based Toshiba e-series PDAs"
select PXA25x
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 99ecbe7..c8a47cc 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_MACH_E750) += e750_lcd.o
obj-$(CONFIG_MACH_E400) += e400_lcd.o
obj-$(CONFIG_MACH_E800) += e800_lcd.o
obj-$(CONFIG_MACH_PALMTX) += palmtx.o
+obj-$(CONFIG_ARCH_VIPER) += viper.o
ifeq ($(CONFIG_MACH_ZYLONITE),y)
obj-y += zylonite.o
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
new file mode 100644
index 0000000..7c1d9a0
--- /dev/null
+++ b/arch/arm/mach-pxa/viper.c
@@ -0,0 +1,952 @@
+/*
+ * linux/arch/arm/mach-pxa/viper.c
+ *
+ * Support for the Arcom VIPER SBC.
+ *
+ * Author: Ian Campbell
+ * Created: Feb 03, 2003
+ * Copyright: Arcom Control Systems
+ *
+ * Maintained by Marc Zyngier <[email protected]>
+ * <[email protected]>
+ *
+ * Based on lubbock.c:
+ * Author: Nicolas Pitre
+ * Created: Jun 15, 2001
+ * Copyright: MontaVista Software Inc.
+ *
+ * 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/types.h>
+#include <linux/memory.h>
+#include <linux/cpu.h>
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/major.h>
+#include <linux/module.h>
+#include <linux/pm.h>
+#include <linux/sched.h>
+#include <linux/gpio.h>
+#include <linux/i2c-gpio.h>
+#include <linux/serial_8250.h>
+#include <linux/smc91x.h>
+#include <linux/usb/isp116x.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
+#include <asm/arch/bitfield.h>
+#include <asm/arch/audio.h>
+#include <asm/arch/pxafb.h>
+#include <asm/arch/mfp-pxa25x.h>
+#include <asm/arch/i2c.h>
+#include <asm/arch/viper.h>
+
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+#include <asm/sizes.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
+
+#include "generic.h"
+
+#ifdef VIPER_DEBUG_INTR
+#define DEBUG_INTR(fmt...) printk(fmt)
+#else
+#define DEBUG_INTR(fmt...) do { } while (0)
+#endif
+
+#ifdef VIPER_DEBUG_VCORE
+#define DEBUG_VCORE(fmt...) printk(fmt)
+#else
+#define DEBUG_VCORE(fmt...) do { } while (0)
+#endif
+
+#define VIPER_ICR __VIPER_CPLD_REG(_VIPER_ICR_PHYS)
+
+static unsigned int icr;
+
+void viper_icr_set_bit(unsigned int bit)
+{
+ icr |= bit;
+ VIPER_ICR = icr;
+}
+EXPORT_SYMBOL(viper_icr_set_bit);
+
+void viper_icr_clear_bit(unsigned int bit)
+{
+ icr &= ~bit;
+ VIPER_ICR = icr;
+}
+EXPORT_SYMBOL(viper_icr_clear_bit);
+
+/*
+ * The CPLD version register was not present on VIPER boards prior to
+ * v2i1. On v1 boards where the version register is not present we
+ * will just read back the previous value from the databus.
+ *
+ * Therefore we do two reads. The first time we write 0 to the
+ * (read-only) register before reading and the second time we write
+ * 0xff first. If the two reads do not match or they read back as 0xff
+ * or 0x00 then we have version 1 hardware.
+ */
+#define VIPER_VERSION __VIPER_CPLD_REG(_VIPER_VERSION_PHYS)
+static u8 viper_hw_version(void)
+{
+ u8 v1, v2;
+ unsigned long flags;
+
+ local_irq_save(flags);
+
+ VIPER_VERSION = 0;
+ v1 = VIPER_VERSION;
+ VIPER_VERSION = 0xff;
+ v2 = VIPER_VERSION;
+
+ if (v1 != v2) { /* a v1i6 board */
+ v1 = 0;
+ } else if (v1 /* ==v2 */ == 0xff) { /* a v1i6 board */
+ v1 = 0;
+ }
+
+ local_irq_restore(flags);
+ return v1;
+}
+
+/* CPU sysdev */
+static int viper_cpu_suspend(struct sys_device *sysdev, pm_message_t state)
+{
+ viper_icr_set_bit(VIPER_ICR_R_DIS);
+ return 0;
+}
+
+static int viper_cpu_resume(struct sys_device *sysdev)
+{
+ viper_icr_clear_bit(VIPER_ICR_R_DIS);
+ return 0;
+}
+
+static struct sysdev_driver viper_cpu_sysdev_driver = {
+ .suspend = viper_cpu_suspend,
+ .resume = viper_cpu_resume,
+};
+
+/* Interrupt handling */
+static unsigned long viper_irq_enabled_mask;
+
+static void viper_ack_irq(unsigned int irq)
+{
+ int viper_irq = (irq - VIPER_IRQ(0));
+
+ if (viper_irq < 8) {
+ DEBUG_INTR(KERN_DEBUG "viper_ack_irq: acknowledge lo irq %d "
+ "(number %d) with 0x%x => %p\n",
+ irq, viper_irq, 1 << viper_irq,
+ &VIPER_LO_IRQ_STATUS);
+ VIPER_LO_IRQ_STATUS = 1 << viper_irq;
+ } else {
+ DEBUG_INTR(KERN_DEBUG "viper_ack_irq: acknowledge hi irq %d "
+ "(number %d) with 0x%x => %p\n",
+ irq, viper_irq, 1 << (viper_irq - 8),
+ &VIPER_HI_IRQ_STATUS);
+ VIPER_HI_IRQ_STATUS = 1 << (viper_irq-8);
+ }
+}
+
+static void viper_mask_irq(unsigned int irq)
+{
+ int viper_irq = (irq - VIPER_IRQ(0));
+ viper_irq_enabled_mask &= ~(1 << viper_irq);
+}
+
+static void viper_unmask_irq(unsigned int irq)
+{
+ int viper_irq = (irq - VIPER_IRQ(0));
+ viper_irq_enabled_mask |= (1 << viper_irq);
+}
+
+static inline unsigned long viper_irq_pending(void)
+{
+ u8 hi, lo;
+ unsigned long result;
+
+ hi = VIPER_HI_IRQ_STATUS;
+ lo = VIPER_LO_IRQ_STATUS;
+ result = lo;
+ result |= hi<<8;
+ result &= viper_irq_enabled_mask;
+ return result;
+}
+
+static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+ unsigned long pending;
+
+ DEBUG_INTR(KERN_DEBUG "viper_irq_handler: entry\n");
+
+ pending = viper_irq_pending();
+ do {
+ DEBUG_INTR(KERN_DEBUG "viper_irq_handler: pending 0x%lx\n",
+ pending);
+ GEDR(VIPER_CPLD_GPIO) = GPIO_bit(VIPER_CPLD_GPIO);
+ if (likely(pending)) {
+ irq = VIPER_IRQ(0) + __ffs(pending);
+#ifdef VIPER_DEBUG_INTR
+ desc = irq_desc + irq;
+ DEBUG_INTR(KERN_DEBUG
+ "viper_irq_handler: dispatching IRQ %d to %p\n",
+ irq, desc->handle);
+#endif
+ generic_handle_irq(irq);
+ }
+ pending = viper_irq_pending();
+ } while (pending);
+ DEBUG_INTR(KERN_DEBUG "viper_irq_handler: exit\n");
+}
+
+static unsigned int current_voltage_divisor;
+
+/*
+ * If force is not true then step from existing to new divisor. If
+ * force is true then jump straight to the new divisor. Stepping is
+ * used because if the jump in voltage is too large, the VCC can dip
+ * too low and the regulator cuts out.
+ *
+ * force can be used to initialize the divisor to a know state by
+ * setting the value for the current clock speed, since we are already
+ * running at that speed we know the voltage should be pretty close so
+ * the jump won't be too large
+ */
+static void viper_set_core_cpu_voltage(unsigned long khz, int force)
+{
+ int i = 0;
+ unsigned int divisor = 0;
+ const char *v;
+
+ if (khz < 200000) {
+ v = "1.0"; divisor = 0xfff;
+ } else if (khz < 300000) {
+ v = "1.1"; divisor = 0xde5;
+ } else {
+ v = "1.3"; divisor = 0x325;
+ }
+
+ DEBUG_VCORE(KERN_INFO
+ "viper: setting CPU core voltage to %sV at %d.%03dMHz\n",
+ v, (int)khz / 1000, (int)khz % 1000);
+
+#define STEP 0x100
+ do {
+ int step;
+
+ if (force)
+ step = divisor;
+ else if (current_voltage_divisor < divisor - STEP)
+ step = current_voltage_divisor + STEP;
+ else if (current_voltage_divisor > divisor + STEP)
+ step = current_voltage_divisor - STEP;
+ else
+ step = divisor;
+ force = 0;
+
+ gpio_set_value(VIPER_PSU_CLK_GPIO, 0);
+ gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);
+
+ for (i = 1 << 11 ; i > 0 ; i >>= 1) {
+ udelay(1);
+ if (step & i)
+ gpio_set_value(VIPER_PSU_DATA_GPIO, 1);
+ else
+ gpio_set_value(VIPER_PSU_DATA_GPIO, 0);
+ udelay(1);
+
+ gpio_set_value(VIPER_PSU_CLK_GPIO, 1);
+ udelay(1);
+
+ gpio_set_value(VIPER_PSU_CLK_GPIO, 0);
+ }
+ udelay(1);
+
+ gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 1);
+ udelay(1);
+
+ gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);
+
+ current_voltage_divisor = step;
+ } while (current_voltage_divisor != divisor);
+}
+
+#ifdef CONFIG_CPU_FREQ
+static int
+viper_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
+ void *data)
+{
+ struct cpufreq_freqs *freq = data;
+
+ /* TODO: Adjust timings??? */
+
+ switch (val) {
+ case CPUFREQ_PRECHANGE:
+ if (freq->old < freq->new) {
+ /* we are getting faster so raise the voltage
+ * before we change freq */
+ viper_set_core_cpu_voltage(freq->new, 0);
+ }
+ break;
+ case CPUFREQ_POSTCHANGE:
+ if (freq->old > freq->new) {
+ /* we are slowing down so drop the power
+ * after we change freq */
+ viper_set_core_cpu_voltage(freq->new, 0);
+ }
+ break;
+ case CPUFREQ_RESUMECHANGE:
+ viper_set_core_cpu_voltage(freq->new, 0);
+ break;
+ default:
+ /* ignore */
+ break;
+ }
+
+ return 0;
+}
+
+static struct notifier_block viper_cpufreq_notifier_block = {
+ .notifier_call = viper_cpufreq_notifier
+};
+#endif
+
+static void viper_init_cpufreq(void)
+{
+ if (gpio_request(VIPER_PSU_DATA_GPIO, "PSU data"))
+ goto err_request_data;
+
+ if (gpio_request(VIPER_PSU_CLK_GPIO, "PSU clock"))
+ goto err_request_clk;
+
+ if (gpio_request(VIPER_PSU_nCS_LD_GPIO, "PSU cs"))
+ goto err_request_cs;
+
+ if (gpio_direction_output(VIPER_PSU_DATA_GPIO, 0) ||
+ gpio_direction_output(VIPER_PSU_CLK_GPIO, 0) ||
+ gpio_direction_output(VIPER_PSU_nCS_LD_GPIO, 0))
+ goto err_dir;
+
+ if (!cpufreq_register_notifier(&viper_cpufreq_notifier_block,
+ CPUFREQ_TRANSITION_NOTIFIER))
+ return;
+
+err_dir:
+ gpio_free(VIPER_PSU_nCS_LD_GPIO);
+err_request_cs:
+ gpio_free(VIPER_PSU_CLK_GPIO);
+err_request_clk:
+ gpio_free(VIPER_PSU_DATA_GPIO);
+err_request_data:
+ printk(KERN_ERR "viper: Failed to setup cpufreq\n");
+}
+
+static struct irq_chip viper_irq_chip = {
+ .ack = viper_ack_irq,
+ .mask = viper_mask_irq,
+ .unmask = viper_unmask_irq
+};
+
+static void __init viper_init_irq(void)
+{
+ const int isa_irqs[] = { 3, 4, 5, 6, 7, 10, 11, 12, 9, 14, 15 };
+ int irq;
+
+ pxa25x_init_irq();
+
+ /* setup ISA IRQs */
+ for (irq = VIPER_IRQ(0); irq < VIPER_IRQ(0) + 11; irq++) {
+ printk(KERN_INFO "Map ISA IRQ %d to IRQ %d\n",
+ isa_irqs[irq - VIPER_IRQ(0)], irq);
+ set_irq_chip(irq, &viper_irq_chip);
+ set_irq_handler(irq, handle_edge_irq);
+ set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ }
+
+ set_irq_chained_handler(VIPER_CPLD_IRQ, viper_irq_handler);
+ set_irq_type(VIPER_CPLD_IRQ, IRQ_TYPE_EDGE_BOTH);
+
+ /* Peripheral IRQs
+ * Ethernet has been moved to resources */
+ set_irq_type(VIPER_USB_IRQ, IRQ_TYPE_EDGE_RISING);
+ set_irq_type(VIPER_UARTA_IRQ, IRQ_TYPE_EDGE_RISING);
+ set_irq_type(VIPER_UARTB_IRQ, IRQ_TYPE_EDGE_RISING);
+
+ /* GPIO9 and 10 control FB backlight. Initialise to off */
+ if (gpio_request(VIPER_BCKLIGHT_EN_GPIO, "Backlight"))
+ goto err_request_bckl;
+
+ if (gpio_request(VIPER_LCD_EN_GPIO, "LCD"))
+ goto err_request_lcd;
+
+ /* Setup Backlight control on PWM0 */
+ if (gpio_request(VIPER_PWM0_GPIO, "Backlight control"))
+ goto err_request_bc;
+
+ if (gpio_direction_output(VIPER_BCKLIGHT_EN_GPIO, 0) ||
+ gpio_direction_output(VIPER_LCD_EN_GPIO, 0) ||
+ gpio_direction_output(VIPER_PWM0_GPIO, 0))
+ goto err_dir;
+
+ PWM_CTRL1 = 4; /* 1 Msec. */
+
+ return;
+
+err_dir:
+ gpio_free(VIPER_PWM0_GPIO);
+err_request_bc:
+ gpio_free(VIPER_LCD_EN_GPIO);
+err_request_lcd:
+ gpio_free(VIPER_BCKLIGHT_EN_GPIO);
+err_request_bckl:
+ printk(KERN_ERR "viper: Failed to setup LCD GPIOs\n");
+}
+
+static void viper_power_off(void)
+{
+ printk(KERN_NOTICE "Shutting off UPS\n");
+ local_irq_disable();
+ gpio_set_value(VIPER_UPS_GPIO, 1);
+ while (1) {
+ /*
+ * Spin
+ */
+ }
+}
+
+/* Audio */
+static struct platform_device audio_device = {
+ .name = "pxa2xx-ac97",
+ .id = -1,
+};
+
+/* Flat Panel */
+static void viper_lcd_power(int on, struct fb_var_screeninfo *var)
+{
+ /* fb_var_screeninfo is currently unused */
+ if (on)
+ gpio_set_value(VIPER_LCD_EN_GPIO, 1);
+ else
+ gpio_set_value(VIPER_LCD_EN_GPIO, 0);
+}
+
+static void viper_backlight_power(int on)
+{
+ if (on) {
+ gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, 1);
+ /* Set full brightness */
+ gpio_set_value(VIPER_PWM0_GPIO, 0);
+ } else {
+ gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, 0);
+ gpio_set_value(VIPER_PWM0_GPIO, 1);
+ }
+}
+
+static struct pxafb_mode_info fb_mode_info = {
+ .pixclock = 157500,
+
+ .xres = 320,
+ .yres = 240,
+
+ .bpp = 16,
+
+ .hsync_len = 63,
+ .left_margin = 7,
+ .right_margin = 13,
+
+ .vsync_len = 20,
+ .upper_margin = 1,
+ .lower_margin = 1,
+
+ .sync = 0,
+};
+
+static struct pxafb_mach_info fb_info = {
+ .modes = &fb_mode_info,
+ .num_modes = 1,
+ .lccr0 = LCCR0_Act | LCCR0_Color,
+ .lccr3 = LCCR3_OutEnH | LCCR3_PixFlEdg | LCCR3_Acb(0xFF),
+
+ .pxafb_lcd_power = viper_lcd_power,
+ .pxafb_backlight_power = viper_backlight_power,
+};
+
+/* Ethernet */
+static struct resource smc91x_resources[] = {
+ [0] = {
+ .name = "smc91x-regs",
+ .start = VIPER_ETH_PHYS + 0x300,
+ .end = VIPER_ETH_PHYS + 0x30f,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = VIPER_ETH_IRQ,
+ .end = VIPER_ETH_IRQ,
+ .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),
+ },
+ [2] = {
+ .name = "smc91x-data32",
+ .start = VIPER_ETH_DATA_PHYS,
+ .end = VIPER_ETH_DATA_PHYS + 3,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct smc91x_platdata viper_smc91x_info = {
+ .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
+};
+
+static struct platform_device smc91x_device = {
+ .name = "smc91x",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(smc91x_resources),
+ .resource = smc91x_resources,
+ .dev = {
+ .platform_data = &viper_smc91x_info,
+ },
+};
+
+/* i2c */
+static struct i2c_gpio_platform_data i2c_bus_data = {
+ .sda_pin = VIPER_RTC_I2C_SDA_GPIO,
+ .scl_pin = VIPER_RTC_I2C_SCL_GPIO,
+ .udelay = 10,
+ .timeout = 100,
+};
+
+static struct platform_device i2c_bus_device = {
+ .name = "i2c-gpio",
+ .id = 1, /* pxa2xx-i2c is bus 0, so start at 1 */
+ .dev = {
+ .platform_data = &i2c_bus_data,
+ }
+};
+
+static struct i2c_board_info __initdata viper_i2c_devices[] = {
+ {
+ I2C_BOARD_INFO("ds1338", 0x68),
+ },
+};
+
+/* serial */
+static struct resource viper_serial_resources[] = {
+ {
+ .start = 0x40100000,
+ .end = 0x4010001f,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = 0x40200000,
+ .end = 0x4020001f,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = 0x40700000,
+ .end = 0x4070001f,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = VIPER_UARTA_PHYS,
+ .end = VIPER_UARTA_PHYS + 0xf,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = VIPER_UARTB_PHYS,
+ .end = VIPER_UARTB_PHYS + 0xf,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct plat_serial8250_port serial_platform_data[] = {
+ /* Internal UARTs */
+ {
+ .membase = (void *)&FFUART,
+ .mapbase = __PREG(FFUART),
+ .irq = IRQ_FFUART,
+ .uartclk = 921600 * 16,
+ .regshift = 2,
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+ .iotype = UPIO_MEM,
+ },
+ {
+ .membase = (void *)&BTUART,
+ .mapbase = __PREG(BTUART),
+ .irq = IRQ_BTUART,
+ .uartclk = 921600 * 16,
+ .regshift = 2,
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+ .iotype = UPIO_MEM,
+ },
+ {
+ .membase = (void *)&STUART,
+ .mapbase = __PREG(STUART),
+ .irq = IRQ_STUART,
+ .uartclk = 921600 * 16,
+ .regshift = 2,
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+ .iotype = UPIO_MEM,
+ },
+ /* External UARTs */
+ {
+ .mapbase = VIPER_UARTA_PHYS,
+ .irq = VIPER_UARTA_IRQ,
+ .uartclk = 1843200,
+ .regshift = 1,
+ .iotype = UPIO_MEM,
+ .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
+ UPF_SKIP_TEST,
+ },
+ {
+ .mapbase = VIPER_UARTB_PHYS,
+ .irq = VIPER_UARTB_IRQ,
+ .uartclk = 1843200,
+ .regshift = 1,
+ .iotype = UPIO_MEM,
+ .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
+ UPF_SKIP_TEST,
+ },
+ { },
+};
+
+static struct platform_device serial_device = {
+ .name = "serial8250",
+ .id = 0,
+ .dev = {
+ .platform_data = serial_platform_data,
+ },
+ .num_resources = ARRAY_SIZE(viper_serial_resources),
+ .resource = viper_serial_resources,
+};
+
+/* USB */
+static void isp116x_delay(struct device *dev, int delay)
+{
+ /* On this platform, we work with 200MHz clock, giving
+ 5 ns per instruction. The cycle below involves 2
+ instructions and we lose 2 more instruction times due
+ to pipeline flush at a jump. I.e., we consume 20 ns
+ per cycle.
+ */
+ int cyc = delay/20 + 1;
+ cyc <<= 2; /* actually, 400MHz */
+
+ __asm__ volatile ("0:\n"
+ " subs %0, %1, #1\n"
+ " bge 0b\n"
+ : "=r" (cyc)
+ : "0" (cyc)
+ );
+}
+
+static struct resource isp116x_resources[] = {
+ [0] = { /* DATA */
+ .start = VIPER_USB_PHYS + 0,
+ .end = VIPER_USB_PHYS + 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = { /* ADDR */
+ .start = VIPER_USB_PHYS + 2,
+ .end = VIPER_USB_PHYS + 3,
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .start = VIPER_USB_IRQ,
+ .end = VIPER_USB_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data isp116x_platform_data = {
+ /* Enable internal resistors on downstream ports */
+ .sel15Kres = 1,
+ /* On-chip overcurrent protection */
+ .oc_enable = 1,
+ /* INT output polarity */
+ .int_act_high = 1,
+ /* INT edge or level triggered */
+ .int_edge_triggered = 0,
+
+ /* WAKEUP pin connected - NOT SUPPORTED */
+ /* .remote_wakeup_connected = 0, */
+ /* Wakeup by devices on usb bus enabled */
+ .remote_wakeup_enable = 0,
+ .delay = isp116x_delay,
+};
+
+static struct platform_device isp116x_device = {
+ .name = "isp116x-hcd",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(isp116x_resources),
+ .resource = isp116x_resources,
+ .dev = {
+ .platform_data = &isp116x_platform_data,
+ },
+
+};
+
+static struct resource sram_resource = {
+ .start = _VIPER_SRAM_BASE,
+ .end = _VIPER_SRAM_BASE + SZ_256K - 1,
+ .flags = IORESOURCE_MEM,
+};
+
+static struct platform_device sram_device = {
+ .name = "pxa2xx-8bit-sram",
+ .id = 0,
+ .num_resources = 1,
+ .resource = &sram_resource,
+};
+
+static struct resource flash_resources[] = {
+ [0] = { /* RedBoot config + filesystem flash */
+ .start = VIPER_FLASH_PHYS,
+ .end = VIPER_FLASH_PHYS + SZ_32M - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = { /* Boot flash */
+ .start = VIPER_BOOT_PHYS,
+ .end = VIPER_BOOT_PHYS + SZ_1M - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct mtd_partition viper_boot_flash_partition = {
+ .name = "RedBoot",
+ .size = SZ_1M,
+ .offset = 0,
+ .mask_flags = MTD_WRITEABLE, /* force R/O */
+};
+
+static struct flash_platform_data viper_flash_data[] = {
+ [0] = {
+ .name = "ViperFlash",
+ .map_name = "cfi_probe",
+ .width = 2,
+ .parts = NULL,
+ .nr_parts = 0,
+ },
+ [1] = {
+ .name = "ViperBootFlash",
+ .map_name = "jedec_probe",
+ .width = 2,
+ .parts = &viper_boot_flash_partition,
+ .nr_parts = 1,
+ },
+};
+
+static struct platform_device viper_flash_devices[] = {
+ {
+ .name = "pxa2xx-flash",
+ .id = 0,
+ .dev = {
+ .platform_data = &viper_flash_data[0],
+ },
+ .resource = &flash_resources[0],
+ .num_resources = 1,
+ },
+ {
+ .name = "pxa2xx-flash",
+ .id = 1,
+ .dev = {
+ .platform_data = &viper_flash_data[1],
+ },
+ .resource = &flash_resources[1],
+ .num_resources = 1,
+ },
+};
+
+static struct platform_device *viper_devs[] __initdata = {
+ &smc91x_device,
+ &i2c_bus_device,
+ &serial_device,
+ &isp116x_device,
+ &audio_device,
+ &sram_device,
+ &viper_flash_devices[0],
+ &viper_flash_devices[1],
+};
+
+static mfp_cfg_t viper_pin_config[] __initdata = {
+ /* Chip selects */
+ GPIO15_nCS_1,
+ GPIO78_nCS_2,
+ GPIO79_nCS_3,
+ GPIO80_nCS_4,
+ GPIO33_nCS_5,
+
+ /* FP Backlight */
+ VIPER_BCKLIGHT_EN_GPIO | MFP_DIR_OUT,
+ VIPER_LCD_EN_GPIO | MFP_DIR_OUT,
+ VIPER_PWM0_GPIO | MFP_DIR_OUT,
+
+ /* Compact-Flash / PC104 */
+ VIPER_CF_POWER_GPIO | MFP_DIR_OUT,
+ VIPER_CF_CD_GPIO,
+ VIPER_CF_RDY_GPIO,
+
+ /* Integrated UPS control */
+ VIPER_UPS_GPIO | MFP_DIR_OUT,
+
+ /* Vcc regulator control */
+ VIPER_PSU_DATA_GPIO | MFP_DIR_OUT,
+ VIPER_PSU_CLK_GPIO | MFP_DIR_OUT,
+ VIPER_PSU_nCS_LD_GPIO | MFP_DIR_OUT,
+
+ /* i2c busses */
+ VIPER_TPM_I2C_SDA_GPIO,
+ VIPER_TPM_I2C_SCL_GPIO | MFP_DIR_OUT,
+ VIPER_RTC_I2C_SDA_GPIO,
+ VIPER_RTC_I2C_SCL_GPIO | MFP_DIR_OUT,
+};
+
+static unsigned long viper_tpm;
+
+static int __init viper_tpm_setup(char *str)
+{
+ strict_strtoul(str, 10, &viper_tpm);
+ return 1;
+}
+
+__setup("tpm=", viper_tpm_setup);
+
+static void __init viper_init(void)
+{
+ u8 version;
+
+ pm_power_off = viper_power_off;
+
+ pxa2xx_mfp_config(ARRAY_AND_SIZE(viper_pin_config));
+
+ set_pxa_fb_info(&fb_info);
+
+ /* v1 hardware cannot use the datacs line */
+ version = viper_hw_version();
+ if (version == 0)
+ smc91x_device.num_resources--;
+
+ pxa_set_i2c_info(NULL);
+ platform_add_devices(viper_devs, ARRAY_SIZE(viper_devs));
+
+ viper_init_cpufreq();
+ /* c/should assume redboot set the correct level ??? */
+ viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1);
+
+ sysdev_driver_register(&cpu_sysdev_class, &viper_cpu_sysdev_driver);
+
+ if (version) {
+ printk(KERN_INFO "viper: hardware v%di%d detected. "
+ "CPLD revision %d.\n",
+ VIPER_BOARD_VERSION(version),
+ VIPER_BOARD_ISSUE(version),
+ VIPER_CPLD_REVISION(version));
+ system_rev = (VIPER_BOARD_VERSION(version) << 8) |
+ (VIPER_BOARD_ISSUE(version) << 4) |
+ VIPER_CPLD_REVISION(version);
+ } else {
+ printk(KERN_INFO "viper: No version register.\n");
+ }
+
+ i2c_register_board_info(1, viper_i2c_devices,
+ ARRAY_SIZE(viper_i2c_devices));
+
+ /* Allocate TPM i2c bus if requested */
+ if (viper_tpm) {
+ struct platform_device *tpm_device;
+ struct i2c_gpio_platform_data i2c_tpm_data = {
+ .sda_pin = VIPER_TPM_I2C_SDA_GPIO,
+ .scl_pin = VIPER_TPM_I2C_SCL_GPIO,
+ .udelay = 10,
+ .timeout = 100,
+ };
+ char *errstr;
+
+ tpm_device = platform_device_alloc("i2c-gpio", 2);
+ if (tpm_device) {
+ if (!platform_device_add_data(tpm_device,
+ &i2c_tpm_data,
+ sizeof(i2c_tpm_data))) {
+ if (platform_device_add(tpm_device)) {
+ errstr = "register TPM i2c bus";
+ goto error_free_tpm;
+ }
+ } else {
+ errstr = "allocate TPM i2c bus data";
+ goto error_free_tpm;
+ }
+
+ goto no_error_tpm;
+ }
+
+ errstr = "allocate TPM i2c device";
+ goto error_tpm;
+
+error_free_tpm:
+ kfree(tpm_device);
+error_tpm:
+ printk(KERN_ERR "viper: Couldn't %s, giving up\n", errstr);
+ }
+
+no_error_tpm:
+
+ return;
+}
+
+static struct map_desc viper_io_desc[] __initdata = {
+ {
+ .virtual = VIPER_CPLD_BASE,
+ .pfn = __phys_to_pfn(VIPER_CPLD_PHYS),
+ .length = 0x00300000,
+ .type = MT_DEVICE,
+ },
+ {
+ .virtual = VIPER_PC104IO_BASE,
+ .pfn = __phys_to_pfn(_PCMCIA1IO),
+ .length = 0x00800000,
+ .type = MT_DEVICE,
+ },
+};
+
+static void __init viper_map_io(void)
+{
+ pxa_map_io();
+
+ iotable_init(viper_io_desc, ARRAY_SIZE(viper_io_desc));
+
+ /* setup sleep mode values */
+ /* FIXME : to be removed once completly converted to mfp */
+ PWER = 0x00000002;
+ PFER = 0x00000000;
+ PRER = 0x00000002;
+ PGSR0 = 0x00008000;
+ PGSR1 = 0x003F0202;
+ PGSR2 = 0x0001C000;
+ PCFR |= PCFR_OPDE;
+}
+
+MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")
+ /* Maintainer: Arcom Control Systems Ltd. */
+ .phys_io = 0x40000000,
+ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
+ .boot_params = 0xa0000100,
+ .map_io = viper_map_io,
+ .init_irq = viper_init_irq,
+ .timer = &pxa_timer,
+ .init_machine = viper_init,
+MACHINE_END
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h
index 9413121..583c300 100644
--- a/include/asm-arm/arch-pxa/irqs.h
+++ b/include/asm-arm/arch-pxa/irqs.h
@@ -179,6 +179,7 @@
#elif defined(CONFIG_SHARP_LOCOMO)
#define NR_IRQS (IRQ_LOCOMO_SPI_TEND + 1)
#elif defined(CONFIG_ARCH_LUBBOCK) || \
+ defined(CONFIG_ARCH_VIPER) || \
defined(CONFIG_MACH_LOGICPD_PXA270) || \
defined(CONFIG_MACH_TOSA) || \
defined(CONFIG_MACH_MAINSTONE) || \
@@ -232,6 +233,28 @@
#define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2)
#define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3)
+/* ARCOM VIPER */
+#define VIPER_ETH_IRQ IRQ_GPIO(VIPER_ETH_GPIO)
+#define VIPER_CPLD_IRQ IRQ_GPIO(VIPER_CPLD_GPIO)
+#define VIPER_USB_IRQ IRQ_GPIO(VIPER_USB_GPIO)
+
+#define VIPER_UARTA_IRQ IRQ_GPIO(VIPER_UARTA_GPIO)
+#define VIPER_UARTB_IRQ IRQ_GPIO(VIPER_UARTB_GPIO)
+
+#define VIPER_CF_CD_IRQ IRQ_GPIO(VIPER_CF_CD_GPIO)
+#define VIPER_CF_RDY_IRQ IRQ_GPIO(VIPER_CF_RDY_GPIO)
+
+#define VIPER_IRQ(x) (IRQ_BOARD_START + (x))
+
+#define VIPER_ISA_IRQ3 VIPER_IRQ(0)
+#define VIPER_ISA_IRQ4 VIPER_IRQ(1)
+#define VIPER_ISA_IRQ5 VIPER_IRQ(2)
+#define VIPER_ISA_IRQ6 VIPER_IRQ(3)
+#define VIPER_ISA_IRQ7 VIPER_IRQ(4)
+#define VIPER_ISA_IRQ10 VIPER_IRQ(5)
+#define VIPER_ISA_IRQ11 VIPER_IRQ(6)
+#define VIPER_ISA_IRQ14 VIPER_IRQ(7)
+
/* phyCORE-PXA270 (PCM027) Interrupts */
#define PCM027_IRQ(x) (IRQ_BOARD_START + (x))
#define PCM027_BTDET_IRQ PCM027_IRQ(0)
diff --git a/include/asm-arm/arch-pxa/viper.h b/include/asm-arm/arch-pxa/viper.h
new file mode 100644
index 0000000..f8b3630
--- /dev/null
+++ b/include/asm-arm/arch-pxa/viper.h
@@ -0,0 +1,91 @@
+/*
+ * linux/include/asm-arm/arch-pxa/viper.h
+ *
+ * Author: Ian Campbell
+ * Created: Feb 03, 2003
+ * Copyright: Arcom Control Systems.
+ *
+ * Created based on lubbock.h:
+ * Author: Nicolas Pitre
+ * Created: Jun 15, 2001
+ * Copyright: MontaVista Software Inc.
+ *
+ * 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.
+ */
+
+#ifndef ARCH_VIPER_H
+#define ARCH_VIPER_H
+
+#define VIPER_BOOT_PHYS PXA_CS0_PHYS
+#define VIPER_FLASH_PHYS PXA_CS1_PHYS
+#define VIPER_ETH_PHYS PXA_CS2_PHYS
+#define VIPER_USB_PHYS PXA_CS3_PHYS
+#define VIPER_ETH_DATA_PHYS PXA_CS4_PHYS
+#define VIPER_CPLD_PHYS PXA_CS5_PHYS
+
+#define VIPER_CPLD_BASE (0xf0000000)
+#define VIPER_PC104IO_BASE (0xf1000000)
+#define VIPER_USB_BASE (0xf1800000)
+
+#define VIPER_ETH_GPIO (0)
+#define VIPER_CPLD_GPIO (1)
+#define VIPER_USB_GPIO (2)
+#define VIPER_UARTA_GPIO (4)
+#define VIPER_UARTB_GPIO (3)
+#define VIPER_CF_CD_GPIO (32)
+#define VIPER_CF_RDY_GPIO (8)
+#define VIPER_BCKLIGHT_EN_GPIO (9)
+#define VIPER_LCD_EN_GPIO (10)
+#define VIPER_PSU_DATA_GPIO (6)
+#define VIPER_PSU_CLK_GPIO (11)
+#define VIPER_PWM0_GPIO (16)
+#define VIPER_PSU_nCS_LD_GPIO (19)
+#define VIPER_UPS_GPIO (20)
+#define VIPER_CF_POWER_GPIO (82)
+#define VIPER_TPM_I2C_SDA_GPIO (26)
+#define VIPER_TPM_I2C_SCL_GPIO (27)
+#define VIPER_RTC_I2C_SDA_GPIO (83)
+#define VIPER_RTC_I2C_SCL_GPIO (84)
+
+#define VIPER_CPLD_P2V(x) ((x) - VIPER_CPLD_PHYS + VIPER_CPLD_BASE)
+#define VIPER_CPLD_V2P(x) ((x) - VIPER_CPLD_BASE + VIPER_CPLD_PHYS)
+
+#ifndef __ASSEMBLY__
+# define __VIPER_CPLD_REG(x) (*((volatile u16 *)VIPER_CPLD_P2V(x)))
+#endif
+
+/* board level registers in the CPLD: (offsets from CPLD_BASE) ... */
+
+/* ... Physical addresses */
+#define _VIPER_LO_IRQ_STATUS (VIPER_CPLD_PHYS + 0x100000)
+#define _VIPER_ICR_PHYS (VIPER_CPLD_PHYS + 0x100002)
+#define _VIPER_HI_IRQ_STATUS (VIPER_CPLD_PHYS + 0x100004)
+#define _VIPER_VERSION_PHYS (VIPER_CPLD_PHYS + 0x100006)
+#define VIPER_UARTA_PHYS (VIPER_CPLD_PHYS + 0x300010)
+#define VIPER_UARTB_PHYS (VIPER_CPLD_PHYS + 0x300000)
+#define _VIPER_SRAM_BASE (VIPER_CPLD_PHYS + 0x800000)
+
+/* ... Virtual addresses */
+#define VIPER_LO_IRQ_STATUS __VIPER_CPLD_REG(_VIPER_LO_IRQ_STATUS)
+#define VIPER_HI_IRQ_STATUS __VIPER_CPLD_REG(_VIPER_HI_IRQ_STATUS)
+
+/* Decode VIPER_VERSION register */
+#define VIPER_CPLD_REVISION(x) (((x) >> 5) & 0x7)
+#define VIPER_BOARD_VERSION(x) (((x) >> 3) & 0x3)
+#define VIPER_BOARD_ISSUE(x) (((x) >> 0) & 0x7)
+
+/* Interrupt and Configuration Register (VIPER_ICR) */
+/* This is a write only register. Only CF_RST is used under Linux */
+
+extern void viper_icr_set_bit(unsigned int bit);
+extern void viper_icr_clear_bit(unsigned int bit);
+
+#define VIPER_ICR_RETRIG (1 << 0)
+#define VIPER_ICR_AUTO_CLR (1 << 1)
+#define VIPER_ICR_R_DIS (1 << 2)
+#define VIPER_ICR_CF_RST (1 << 3)
+
+#endif
+
--
1.5.4.3
Signed-off-by: Marc Zyngier <[email protected]>
---
drivers/net/smc91x.h | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 22209b6..9481412 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -185,6 +185,27 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define SMC_IRQ_FLAGS (-1)
+#elif defined(CONFIG_ARCH_VIPER)
+
+/* We can only do 16-bit reads and writes in the static memory space. */
+#define SMC_CAN_USE_8BIT 0
+#define SMC_CAN_USE_16BIT 1
+#define SMC_CAN_USE_32BIT 0
+#define SMC_CAN_USE_DATACS 1
+#define SMC_NOWAIT 1
+
+#define SMC_IO_SHIFT 0
+
+#define SMC_inw(a, r) readw((a) + (r))
+#define SMC_outw(v, a, r) writew(v, (a) + (r))
+#define SMC_insw(a, r, p, l) insw((a) + (r), p, l)
+#define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l)
+
+#define RPC_LSA_DEFAULT RPC_LED_100_10
+#define RPC_LSB_DEFAULT RPC_LED_TX_RX
+
+#define SMC_IRQ_FLAGS (-1) /* from resource */
+
#elif defined(CONFIG_SA1100_ASSABET)
#include <asm/arch/neponset.h>
--
1.5.4.3
Some platforms, namely the Arcom/Eurotech Viper, need some extra care
to run (on this board, the PC104 connector is actually wired to the
second PCMCIA slot, and needs to be powered on despite not being managed
by the PCMCIA code...).
Add a quirks field to the pcmcia_low_level structure that the SOC
dependant code can inspect.
Introduce a PXA2XX_QUIRK_NEEDS_MECR_NOS that can be used by the offending
board.
Signed-off-by: Marc Zyngier <[email protected]>
---
drivers/pcmcia/pxa2xx_base.c | 20 ++++++++++++++++++--
drivers/pcmcia/pxa2xx_base.h | 7 +++++++
drivers/pcmcia/soc_common.h | 2 ++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index ccfdf19..9e61f21 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -195,7 +195,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
MECR |= MECR_CIT;
/* Set MECR:NOS (Number Of Sockets) */
- if (nr > 1)
+ if (nr > 1 || (ops->quirks & PXA2XX_QUIRK_NEEDS_MECR_NOS))
MECR |= MECR_NOS;
else
MECR &= ~MECR_NOS;
@@ -226,7 +226,23 @@ static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)
struct pcmcia_low_level *ops = dev->dev.platform_data;
int nr = ops ? ops->nr : 0;
- MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
+ if (nr > 0) {
+ u32 quirks = ops ? ops->quirks : 0;
+ int v;
+
+ /*
+ * We have at least one socket, so set MECR:CIT
+ * (Card Is There)
+ */
+ v = MECR_CIT;
+
+ /* Set MECR:NOS (Number Of Sockets) */
+ if (nr > 1 || (quirks & PXA2XX_QUIRK_NEEDS_MECR_NOS))
+ v |= MECR_NOS;
+
+ MECR = v;
+ } else
+ MECR = 0;
return pcmcia_socket_dev_resume(&dev->dev);
}
diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h
index 235d681..956ee9d 100644
--- a/drivers/pcmcia/pxa2xx_base.h
+++ b/drivers/pcmcia/pxa2xx_base.h
@@ -1,3 +1,10 @@
+#ifndef PXA2XX_BASE
+#define PXA2XX_BASE
+
+#define PXA2XX_QUIRK_NEEDS_MECR_NOS (1 << 0)
+
/* temporary measure */
extern int __pxa2xx_drv_pcmcia_probe(struct device *);
+#endif
+
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 91ef6a0..9e288fc 100644
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -76,6 +76,8 @@ struct pcmcia_low_level {
int first;
/* nr of sockets */
int nr;
+ /* Quirks required by this system, SOC dependant */
+ u32 quirks;
int (*hw_init)(struct soc_pcmcia_socket *);
void (*hw_shutdown)(struct soc_pcmcia_socket *);
--
1.5.4.3
Signed-off-by: Marc Zyngier <[email protected]>
---
drivers/pcmcia/Kconfig | 2 +-
drivers/pcmcia/Makefile | 1 +
drivers/pcmcia/pxa2xx_viper.c | 183 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 185 insertions(+), 1 deletions(-)
create mode 100644 drivers/pcmcia/pxa2xx_viper.c
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index e0f8840..de57e7e 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -220,7 +220,7 @@ config PCMCIA_PXA2XX
tristate "PXA2xx support"
depends on ARM && ARCH_PXA && PCMCIA
depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
- || MACH_ARMCORE || ARCH_PXA_PALM)
+ || MACH_ARMCORE || ARCH_PXA_PALM || ARCH_VIPER)
help
Say Y here to include support for the PXA2xx PCMCIA controller
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 269a9e9..76e8590 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -72,5 +72,6 @@ pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o
pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x270.o
+pxa2xx_cs-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o
pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
new file mode 100644
index 0000000..9ac96c3
--- /dev/null
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -0,0 +1,183 @@
+/*
+ * VIPER PCMCIA support
+ * Copyright 2004 Arcom Control Systems
+ *
+ * Maintained by Marc Zyngier <[email protected]>
+ * <[email protected]>
+ *
+ * Based on:
+ * iPAQ h2200 PCMCIA support
+ * Copyright 2004 Koen Kooi <[email protected]>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+
+#include <pcmcia/ss.h>
+
+#include <asm/hardware.h>
+#include <asm/irq.h>
+
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/viper.h>
+
+#include "soc_common.h"
+#include "pxa2xx_base.h"
+
+static void viper_cf_rst(int state)
+{
+ if (state)
+ viper_icr_set_bit(VIPER_ICR_CF_RST);
+ else
+ viper_icr_clear_bit(VIPER_ICR_CF_RST);
+
+}
+
+static struct pcmcia_irqs irqs[] = {
+ { 0, VIPER_CF_CD_IRQ, "PCMCIA_CD" }
+};
+
+static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
+{
+ unsigned long flags;
+
+ skt->irq = VIPER_CF_RDY_IRQ;
+
+ if (gpio_request(VIPER_CF_CD_GPIO, "CF detect"))
+ goto err_request_cd;
+
+ if (gpio_request(VIPER_CF_RDY_GPIO, "CF ready"))
+ goto err_request_rdy;
+
+ if (gpio_request(VIPER_CF_POWER_GPIO, "CF power"))
+ goto err_request_pwr;
+
+ local_irq_save(flags);
+
+ /* GPIO 82 is the CF power enable line. initially off */
+ if (gpio_direction_output(VIPER_CF_POWER_GPIO, 0) ||
+ gpio_direction_input(VIPER_CF_CD_GPIO) ||
+ gpio_direction_input(VIPER_CF_RDY_GPIO)) {
+ local_irq_restore(flags);
+ goto err_dir;
+ }
+
+ local_irq_restore(flags);
+
+ return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+
+err_dir:
+ gpio_free(VIPER_CF_POWER_GPIO);
+err_request_pwr:
+ gpio_free(VIPER_CF_RDY_GPIO);
+err_request_rdy:
+ gpio_free(VIPER_CF_CD_GPIO);
+err_request_cd:
+ printk(KERN_ERR "viper: Failed to setup PCMCIA GPIOs\n");
+ return -1;
+}
+
+/*
+ * Release all resources.
+ */
+static void viper_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
+{
+ soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ gpio_free(VIPER_CF_POWER_GPIO);
+ gpio_free(VIPER_CF_RDY_GPIO);
+ gpio_free(VIPER_CF_CD_GPIO);
+}
+
+static void viper_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
+ struct pcmcia_state *state)
+{
+ state->detect = gpio_get_value(VIPER_CF_CD_GPIO) ? 0 : 1;
+ state->ready = gpio_get_value(VIPER_CF_RDY_GPIO) ? 1 : 0;
+ state->bvd1 = 1;
+ state->bvd2 = 1;
+ state->wrprot = 0;
+ state->vs_3v = 1; /* Can only apply 3.3V */
+ state->vs_Xv = 0;
+}
+
+static int viper_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
+ const socket_state_t *state)
+{
+ /* Silently ignore Vpp, output enable, speaker enable. */
+ viper_cf_rst(state->flags & SS_RESET);
+
+ /* Apply socket voltage */
+ switch (state->Vcc) {
+ case 0:
+ gpio_set_value(VIPER_CF_POWER_GPIO, 0);
+ break;
+ case 33:
+ gpio_set_value(VIPER_CF_POWER_GPIO, 1);
+ break;
+ default:
+ printk(KERN_ERR "%s: Unsupported Vcc:%d\n",
+ __func__, state->Vcc);
+ return -1;
+ }
+
+ return 0;
+}
+
+static void viper_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
+{
+}
+
+static void viper_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
+{
+}
+
+static struct pcmcia_low_level viper_pcmcia_ops = {
+ .owner = THIS_MODULE,
+ .hw_init = viper_pcmcia_hw_init,
+ .hw_shutdown = viper_pcmcia_hw_shutdown,
+ .socket_state = viper_pcmcia_socket_state,
+ .configure_socket = viper_pcmcia_configure_socket,
+ .socket_init = viper_pcmcia_socket_init,
+ .socket_suspend = viper_pcmcia_socket_suspend,
+ .nr = 1,
+ .quirks = PXA2XX_QUIRK_NEEDS_MECR_NOS,
+};
+
+static struct platform_device *viper_pcmcia_device;
+
+static int __init viper_pcmcia_init(void)
+{
+ int ret;
+
+ viper_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
+ if (!viper_pcmcia_device)
+ return -ENOMEM;
+
+ viper_pcmcia_device->dev.platform_data = &viper_pcmcia_ops;
+
+ ret = platform_device_add(viper_pcmcia_device);
+
+ if (ret)
+ platform_device_put(viper_pcmcia_device);
+
+ return ret;
+}
+
+static void __exit viper_pcmcia_exit(void)
+{
+ platform_device_unregister(viper_pcmcia_device);
+}
+
+module_init(viper_pcmcia_init);
+module_exit(viper_pcmcia_exit);
+
+MODULE_LICENSE("GPL");
--
1.5.4.3
On Wed, Aug 6, 2008 at 9:19 PM, Marc Zyngier <[email protected]> wrote:
> Signed-off-by: Marc Zyngier <[email protected]>
> ---
> arch/arm/mach-pxa/Kconfig | 6 +
> arch/arm/mach-pxa/Makefile | 1 +
> arch/arm/mach-pxa/viper.c | 952 ++++++++++++++++++++++++++++++++++++++
> include/asm-arm/arch-pxa/irqs.h | 23 +
> include/asm-arm/arch-pxa/viper.h | 91 ++++
> 5 files changed, 1073 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-pxa/viper.c
> create mode 100644 include/asm-arm/arch-pxa/viper.h
>
> diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
> index e8ee7ec..31a554e 100644
> --- a/arch/arm/mach-pxa/Kconfig
> +++ b/arch/arm/mach-pxa/Kconfig
> @@ -115,6 +115,12 @@ config MACH_TOSA
> depends on PXA_SHARPSL
> select PXA25x
>
> +config ARCH_VIPER
> + bool "Arcom/Eurotech VIPER SBC"
> + select PXA25x
> + select ISA
> + select I2C_GPIO
> +
> config ARCH_PXA_ESERIES
> bool "PXA based Toshiba e-series PDAs"
> select PXA25x
> diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
> index 99ecbe7..c8a47cc 100644
> --- a/arch/arm/mach-pxa/Makefile
> +++ b/arch/arm/mach-pxa/Makefile
> @@ -43,6 +43,7 @@ obj-$(CONFIG_MACH_E750) += e750_lcd.o
> obj-$(CONFIG_MACH_E400) += e400_lcd.o
> obj-$(CONFIG_MACH_E800) += e800_lcd.o
> obj-$(CONFIG_MACH_PALMTX) += palmtx.o
> +obj-$(CONFIG_ARCH_VIPER) += viper.o
>
> ifeq ($(CONFIG_MACH_ZYLONITE),y)
> obj-y += zylonite.o
> diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
> new file mode 100644
> index 0000000..7c1d9a0
> --- /dev/null
> +++ b/arch/arm/mach-pxa/viper.c
> @@ -0,0 +1,952 @@
> +/*
> + * linux/arch/arm/mach-pxa/viper.c
> + *
> + * Support for the Arcom VIPER SBC.
> + *
> + * Author: Ian Campbell
> + * Created: Feb 03, 2003
> + * Copyright: Arcom Control Systems
> + *
> + * Maintained by Marc Zyngier <[email protected]>
> + * <[email protected]>
> + *
> + * Based on lubbock.c:
> + * Author: Nicolas Pitre
> + * Created: Jun 15, 2001
> + * Copyright: MontaVista Software Inc.
> + *
> + * 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/types.h>
> +#include <linux/memory.h>
> +#include <linux/cpu.h>
> +#include <linux/cpufreq.h>
> +#include <linux/delay.h>
> +#include <linux/fs.h>
> +#include <linux/init.h>
> +#include <linux/interrupt.h>
> +#include <linux/major.h>
> +#include <linux/module.h>
> +#include <linux/pm.h>
> +#include <linux/sched.h>
> +#include <linux/gpio.h>
> +#include <linux/i2c-gpio.h>
> +#include <linux/serial_8250.h>
> +#include <linux/smc91x.h>
> +#include <linux/usb/isp116x.h>
> +#include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
> +
> +#include <asm/arch/pxa-regs.h>
> +#include <asm/arch/pxa2xx-regs.h>
> +#include <asm/arch/bitfield.h>
> +#include <asm/arch/audio.h>
> +#include <asm/arch/pxafb.h>
> +#include <asm/arch/mfp-pxa25x.h>
> +#include <asm/arch/i2c.h>
> +#include <asm/arch/viper.h>
> +
> +#include <asm/setup.h>
> +#include <asm/mach-types.h>
> +#include <asm/irq.h>
> +#include <asm/sizes.h>
> +
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +#include <asm/mach/irq.h>
> +#include <asm/mach/flash.h>
> +
> +#include "generic.h"
> +
> +#ifdef VIPER_DEBUG_INTR
> +#define DEBUG_INTR(fmt...) printk(fmt)
> +#else
> +#define DEBUG_INTR(fmt...) do { } while (0)
> +#endif
> +
> +#ifdef VIPER_DEBUG_VCORE
> +#define DEBUG_VCORE(fmt...) printk(fmt)
> +#else
> +#define DEBUG_VCORE(fmt...) do { } while (0)
> +#endif
> +
These are ugly, consider pr_debug() please.
> +#define VIPER_ICR __VIPER_CPLD_REG(_VIPER_ICR_PHYS)
> +
This could be defined in the header file indeed.
> +static unsigned int icr;
> +
> +void viper_icr_set_bit(unsigned int bit)
> +{
> + icr |= bit;
> + VIPER_ICR = icr;
> +}
> +EXPORT_SYMBOL(viper_icr_set_bit);
> +
> +void viper_icr_clear_bit(unsigned int bit)
> +{
> + icr &= ~bit;
> + VIPER_ICR = icr;
> +}
> +EXPORT_SYMBOL(viper_icr_clear_bit);
It's usually not a good idea to export something like this, you
may want to hide the details of VIPER_CPLD in this file, and
only export those higher-level APIs.
> +
> +/*
> + * The CPLD version register was not present on VIPER boards prior to
> + * v2i1. On v1 boards where the version register is not present we
> + * will just read back the previous value from the databus.
> + *
> + * Therefore we do two reads. The first time we write 0 to the
> + * (read-only) register before reading and the second time we write
> + * 0xff first. If the two reads do not match or they read back as 0xff
> + * or 0x00 then we have version 1 hardware.
> + */
> +#define VIPER_VERSION __VIPER_CPLD_REG(_VIPER_VERSION_PHYS)
Ditto
> +static u8 viper_hw_version(void)
> +{
> + u8 v1, v2;
> + unsigned long flags;
> +
> + local_irq_save(flags);
> +
> + VIPER_VERSION = 0;
> + v1 = VIPER_VERSION;
> + VIPER_VERSION = 0xff;
> + v2 = VIPER_VERSION;
> +
this is really weird
> + if (v1 != v2) { /* a v1i6 board */
> + v1 = 0;
> + } else if (v1 /* ==v2 */ == 0xff) { /* a v1i6 board */
> + v1 = 0;
> + }
this is unreadable and confused, plus the parentheses are not
necessary when there is only one simple statement.
What about this?
v1 = (v1 != v2 || v1 == 0xff) ? 0 : v1; /* a v1i6 board */
> +
> + local_irq_restore(flags);
> + return v1;
> +}
> +
> +/* CPU sysdev */
> +static int viper_cpu_suspend(struct sys_device *sysdev, pm_message_t state)
> +{
> + viper_icr_set_bit(VIPER_ICR_R_DIS);
> + return 0;
> +}
> +
> +static int viper_cpu_resume(struct sys_device *sysdev)
> +{
> + viper_icr_clear_bit(VIPER_ICR_R_DIS);
> + return 0;
> +}
> +
> +static struct sysdev_driver viper_cpu_sysdev_driver = {
> + .suspend = viper_cpu_suspend,
> + .resume = viper_cpu_resume,
> +};
> +
> +/* Interrupt handling */
> +static unsigned long viper_irq_enabled_mask;
> +
> +static void viper_ack_irq(unsigned int irq)
> +{
> + int viper_irq = (irq - VIPER_IRQ(0));
> +
> + if (viper_irq < 8) {
> + DEBUG_INTR(KERN_DEBUG "viper_ack_irq: acknowledge lo irq %d "
> + "(number %d) with 0x%x => %p\n",
> + irq, viper_irq, 1 << viper_irq,
> + &VIPER_LO_IRQ_STATUS);
This is ugly. If the code is fully verified, I'd prefer to remove this
completely. This is quite low-level code, and no one will ever
want to turn debug on/off frequently to inspect this code.
> + VIPER_LO_IRQ_STATUS = 1 << viper_irq;
> + } else {
> + DEBUG_INTR(KERN_DEBUG "viper_ack_irq: acknowledge hi irq %d "
> + "(number %d) with 0x%x => %p\n",
> + irq, viper_irq, 1 << (viper_irq - 8),
> + &VIPER_HI_IRQ_STATUS);
> + VIPER_HI_IRQ_STATUS = 1 << (viper_irq-8);
> + }
> +}
> +
> +static void viper_mask_irq(unsigned int irq)
> +{
> + int viper_irq = (irq - VIPER_IRQ(0));
You may omit the parentheses here, or simplier:
viper_irq_enabled_mask &= ~(1 << (irq - VIPER_IRQ(0)))
> + viper_irq_enabled_mask &= ~(1 << viper_irq);
> +}
> +
> +static void viper_unmask_irq(unsigned int irq)
> +{
> + int viper_irq = (irq - VIPER_IRQ(0));
> + viper_irq_enabled_mask |= (1 << viper_irq);
> +}
> +
ditto
> +static inline unsigned long viper_irq_pending(void)
> +{
> + u8 hi, lo;
> + unsigned long result;
> +
> + hi = VIPER_HI_IRQ_STATUS;
> + lo = VIPER_LO_IRQ_STATUS;
> + result = lo;
> + result |= hi<<8;
> + result &= viper_irq_enabled_mask;
> + return result;
> +}
or simplified to
return (VIPER_HI_IRQ_STATUS << 8 | VIPER_LO_IRQ_STATUS) &
viper_irq_enabled_mask?
> +
> +static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)
> +{
> + unsigned long pending;
> +
> + DEBUG_INTR(KERN_DEBUG "viper_irq_handler: entry\n");
> +
this
> + pending = viper_irq_pending();
> + do {
> + DEBUG_INTR(KERN_DEBUG "viper_irq_handler: pending 0x%lx\n",
> + pending);
this
> + GEDR(VIPER_CPLD_GPIO) = GPIO_bit(VIPER_CPLD_GPIO);
> + if (likely(pending)) {
> + irq = VIPER_IRQ(0) + __ffs(pending);
> +#ifdef VIPER_DEBUG_INTR
> + desc = irq_desc + irq;
> + DEBUG_INTR(KERN_DEBUG
> + "viper_irq_handler: dispatching IRQ %d to %p\n",
> + irq, desc->handle);
> +#endif
this
> + generic_handle_irq(irq);
> + }
> + pending = viper_irq_pending();
> + } while (pending);
> + DEBUG_INTR(KERN_DEBUG "viper_irq_handler: exit\n");
and this, better be removed
> +}
> +
> +static unsigned int current_voltage_divisor;
> +
> +/*
> + * If force is not true then step from existing to new divisor. If
> + * force is true then jump straight to the new divisor. Stepping is
> + * used because if the jump in voltage is too large, the VCC can dip
> + * too low and the regulator cuts out.
> + *
> + * force can be used to initialize the divisor to a know state by
> + * setting the value for the current clock speed, since we are already
> + * running at that speed we know the voltage should be pretty close so
> + * the jump won't be too large
> + */
> +static void viper_set_core_cpu_voltage(unsigned long khz, int force)
> +{
> + int i = 0;
> + unsigned int divisor = 0;
> + const char *v;
> +
> + if (khz < 200000) {
> + v = "1.0"; divisor = 0xfff;
> + } else if (khz < 300000) {
> + v = "1.1"; divisor = 0xde5;
> + } else {
> + v = "1.3"; divisor = 0x325;
> + }
> +
> + DEBUG_VCORE(KERN_INFO
> + "viper: setting CPU core voltage to %sV at %d.%03dMHz\n",
> + v, (int)khz / 1000, (int)khz % 1000);
> +
> +#define STEP 0x100
> + do {
> + int step;
> +
> + if (force)
> + step = divisor;
> + else if (current_voltage_divisor < divisor - STEP)
> + step = current_voltage_divisor + STEP;
> + else if (current_voltage_divisor > divisor + STEP)
> + step = current_voltage_divisor - STEP;
> + else
> + step = divisor;
> + force = 0;
> +
> + gpio_set_value(VIPER_PSU_CLK_GPIO, 0);
> + gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);
> +
> + for (i = 1 << 11 ; i > 0 ; i >>= 1) {
> + udelay(1);
> + if (step & i)
> + gpio_set_value(VIPER_PSU_DATA_GPIO, 1);
> + else
> + gpio_set_value(VIPER_PSU_DATA_GPIO, 0);
this can be simplified to:
gpio_set_value(VIPER_PSU_DATA_GPIO, step & i);
> + udelay(1);
> +
> + gpio_set_value(VIPER_PSU_CLK_GPIO, 1);
> + udelay(1);
> +
> + gpio_set_value(VIPER_PSU_CLK_GPIO, 0);
> + }
> + udelay(1);
> +
> + gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 1);
> + udelay(1);
> +
> + gpio_set_value(VIPER_PSU_nCS_LD_GPIO, 0);
> +
> + current_voltage_divisor = step;
> + } while (current_voltage_divisor != divisor);
> +}
> +
> +#ifdef CONFIG_CPU_FREQ
> +static int
> +viper_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
> + void *data)
> +{
> + struct cpufreq_freqs *freq = data;
> +
> + /* TODO: Adjust timings??? */
> +
> + switch (val) {
> + case CPUFREQ_PRECHANGE:
> + if (freq->old < freq->new) {
> + /* we are getting faster so raise the voltage
> + * before we change freq */
> + viper_set_core_cpu_voltage(freq->new, 0);
> + }
> + break;
> + case CPUFREQ_POSTCHANGE:
> + if (freq->old > freq->new) {
> + /* we are slowing down so drop the power
> + * after we change freq */
> + viper_set_core_cpu_voltage(freq->new, 0);
> + }
> + break;
> + case CPUFREQ_RESUMECHANGE:
> + viper_set_core_cpu_voltage(freq->new, 0);
> + break;
> + default:
> + /* ignore */
> + break;
> + }
> +
> + return 0;
> +}
> +
> +static struct notifier_block viper_cpufreq_notifier_block = {
> + .notifier_call = viper_cpufreq_notifier
> +};
> +#endif
> +
> +static void viper_init_cpufreq(void)
> +{
> + if (gpio_request(VIPER_PSU_DATA_GPIO, "PSU data"))
> + goto err_request_data;
> +
> + if (gpio_request(VIPER_PSU_CLK_GPIO, "PSU clock"))
> + goto err_request_clk;
> +
> + if (gpio_request(VIPER_PSU_nCS_LD_GPIO, "PSU cs"))
> + goto err_request_cs;
> +
> + if (gpio_direction_output(VIPER_PSU_DATA_GPIO, 0) ||
> + gpio_direction_output(VIPER_PSU_CLK_GPIO, 0) ||
> + gpio_direction_output(VIPER_PSU_nCS_LD_GPIO, 0))
> + goto err_dir;
> +
> + if (!cpufreq_register_notifier(&viper_cpufreq_notifier_block,
> + CPUFREQ_TRANSITION_NOTIFIER))
> + return;
> +
> +err_dir:
> + gpio_free(VIPER_PSU_nCS_LD_GPIO);
> +err_request_cs:
> + gpio_free(VIPER_PSU_CLK_GPIO);
> +err_request_clk:
> + gpio_free(VIPER_PSU_DATA_GPIO);
> +err_request_data:
> + printk(KERN_ERR "viper: Failed to setup cpufreq\n");
Or alternatively pr_err(), I don't have preference, either is OK to me.
> +}
This viper_init_cpufreq() can actually better be included in the
#ifdef CONFIG_CPU_FREQ .. #endif, and use the following
code structure:
#ifdef CONFIG_CPU_FREQ
...
static void __init viper_init_cpufreq(void)
{
....
}
#else
static inline void viper_init_cpufreq(void) {}
#endif
So you don't have to worry about whether CONFIG_CPU_FREQ
is selected or not, just invoke viper_init_cpufreq() in the following
code.
> +
> +static struct irq_chip viper_irq_chip = {
> + .ack = viper_ack_irq,
> + .mask = viper_mask_irq,
> + .unmask = viper_unmask_irq
> +};
> +
> +static void __init viper_init_irq(void)
> +{
> + const int isa_irqs[] = { 3, 4, 5, 6, 7, 10, 11, 12, 9, 14, 15 };
> + int irq;
> +
> + pxa25x_init_irq();
> +
> + /* setup ISA IRQs */
> + for (irq = VIPER_IRQ(0); irq < VIPER_IRQ(0) + 11; irq++) {
> + printk(KERN_INFO "Map ISA IRQ %d to IRQ %d\n",
> + isa_irqs[irq - VIPER_IRQ(0)], irq);
> + set_irq_chip(irq, &viper_irq_chip);
> + set_irq_handler(irq, handle_edge_irq);
> + set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
> + }
> +
> + set_irq_chained_handler(VIPER_CPLD_IRQ, viper_irq_handler);
> + set_irq_type(VIPER_CPLD_IRQ, IRQ_TYPE_EDGE_BOTH);
> +
> + /* Peripheral IRQs
> + * Ethernet has been moved to resources */
> + set_irq_type(VIPER_USB_IRQ, IRQ_TYPE_EDGE_RISING);
> + set_irq_type(VIPER_UARTA_IRQ, IRQ_TYPE_EDGE_RISING);
> + set_irq_type(VIPER_UARTB_IRQ, IRQ_TYPE_EDGE_RISING);
These should really be specified by the corresponding driver's
request_irq() with appropriate IRQF_* flags.
> +
> + /* GPIO9 and 10 control FB backlight. Initialise to off */
> + if (gpio_request(VIPER_BCKLIGHT_EN_GPIO, "Backlight"))
> + goto err_request_bckl;
> +
> + if (gpio_request(VIPER_LCD_EN_GPIO, "LCD"))
> + goto err_request_lcd;
> +
> + /* Setup Backlight control on PWM0 */
> + if (gpio_request(VIPER_PWM0_GPIO, "Backlight control"))
> + goto err_request_bc;
> +
> + if (gpio_direction_output(VIPER_BCKLIGHT_EN_GPIO, 0) ||
> + gpio_direction_output(VIPER_LCD_EN_GPIO, 0) ||
> + gpio_direction_output(VIPER_PWM0_GPIO, 0))
> + goto err_dir;
> +
> + PWM_CTRL1 = 4; /* 1 Msec. */
Please don't, viper_init_irq() isn't supposed to handle the
initializations of these GPIO, and viper_init_irq() isn't supposed
to fail.
Move this block of code elsewhere please.
> +
> + return;
> +
> +err_dir:
> + gpio_free(VIPER_PWM0_GPIO);
> +err_request_bc:
> + gpio_free(VIPER_LCD_EN_GPIO);
> +err_request_lcd:
> + gpio_free(VIPER_BCKLIGHT_EN_GPIO);
> +err_request_bckl:
> + printk(KERN_ERR "viper: Failed to setup LCD GPIOs\n");
> +}
> +
> +static void viper_power_off(void)
> +{
> + printk(KERN_NOTICE "Shutting off UPS\n");
> + local_irq_disable();
I doubt this is necessary here.
> + gpio_set_value(VIPER_UPS_GPIO, 1);
> + while (1) {
> + /*
> + * Spin
> + */
> + }
braces isn't necessary, while (1) ; will do.
> +}
> +
> +/* Audio */
> +static struct platform_device audio_device = {
> + .name = "pxa2xx-ac97",
> + .id = -1,
> +};
> +
Recent changes have moved ac97 device to a central place so
board code doesn't have to declare this invididually. And use
the corresponding pxa_set_ac97_info() please.
> +/* Flat Panel */
> +static void viper_lcd_power(int on, struct fb_var_screeninfo *var)
> +{
> + /* fb_var_screeninfo is currently unused */
> + if (on)
> + gpio_set_value(VIPER_LCD_EN_GPIO, 1);
> + else
> + gpio_set_value(VIPER_LCD_EN_GPIO, 0);
> +}
Again, simpler, gpio_set_value(VIPER_LCD_EN_GPIO, on)
> +
> +static void viper_backlight_power(int on)
> +{
> + if (on) {
> + gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, 1);
> + /* Set full brightness */
> + gpio_set_value(VIPER_PWM0_GPIO, 0);
> + } else {
> + gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, 0);
> + gpio_set_value(VIPER_PWM0_GPIO, 1);
> + }
> +}
I'd suggest to use the generic PWM-based backlight driver, please
see drivers/video/backlight/pwm-bl.c and arch/arm/mach-pxa/pwm.c,
along with zylonite/mainstone for the sample usage.
> +
> +static struct pxafb_mode_info fb_mode_info = {
> + .pixclock = 157500,
> +
> + .xres = 320,
> + .yres = 240,
> +
> + .bpp = 16,
> +
> + .hsync_len = 63,
> + .left_margin = 7,
> + .right_margin = 13,
> +
> + .vsync_len = 20,
> + .upper_margin = 1,
> + .lower_margin = 1,
> +
> + .sync = 0,
> +};
> +
> +static struct pxafb_mach_info fb_info = {
> + .modes = &fb_mode_info,
> + .num_modes = 1,
> + .lccr0 = LCCR0_Act | LCCR0_Color,
> + .lccr3 = LCCR3_OutEnH | LCCR3_PixFlEdg | LCCR3_Acb(0xFF),
> +
Use "lcd_conn" type please.
> + .pxafb_lcd_power = viper_lcd_power,
> + .pxafb_backlight_power = viper_backlight_power,
> +};
> +
> +/* Ethernet */
> +static struct resource smc91x_resources[] = {
> + [0] = {
> + .name = "smc91x-regs",
> + .start = VIPER_ETH_PHYS + 0x300,
> + .end = VIPER_ETH_PHYS + 0x30f,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = {
> + .start = VIPER_ETH_IRQ,
> + .end = VIPER_ETH_IRQ,
> + .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),
No parentheses please
> + },
> + [2] = {
> + .name = "smc91x-data32",
> + .start = VIPER_ETH_DATA_PHYS,
> + .end = VIPER_ETH_DATA_PHYS + 3,
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
> +static struct smc91x_platdata viper_smc91x_info = {
> + .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
> +};
> +
> +static struct platform_device smc91x_device = {
> + .name = "smc91x",
> + .id = -1,
> + .num_resources = ARRAY_SIZE(smc91x_resources),
> + .resource = smc91x_resources,
> + .dev = {
> + .platform_data = &viper_smc91x_info,
> + },
> +};
> +
> +/* i2c */
> +static struct i2c_gpio_platform_data i2c_bus_data = {
> + .sda_pin = VIPER_RTC_I2C_SDA_GPIO,
> + .scl_pin = VIPER_RTC_I2C_SCL_GPIO,
> + .udelay = 10,
> + .timeout = 100,
> +};
> +
> +static struct platform_device i2c_bus_device = {
> + .name = "i2c-gpio",
> + .id = 1, /* pxa2xx-i2c is bus 0, so start at 1 */
> + .dev = {
> + .platform_data = &i2c_bus_data,
> + }
> +};
> +
> +static struct i2c_board_info __initdata viper_i2c_devices[] = {
> + {
> + I2C_BOARD_INFO("ds1338", 0x68),
> + },
> +};
> +
> +/* serial */
> +static struct resource viper_serial_resources[] = {
> + {
> + .start = 0x40100000,
> + .end = 0x4010001f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = 0x40200000,
> + .end = 0x4020001f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = 0x40700000,
> + .end = 0x4070001f,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = VIPER_UARTA_PHYS,
> + .end = VIPER_UARTA_PHYS + 0xf,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = VIPER_UARTB_PHYS,
> + .end = VIPER_UARTB_PHYS + 0xf,
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
> +static struct plat_serial8250_port serial_platform_data[] = {
> + /* Internal UARTs */
> + {
> + .membase = (void *)&FFUART,
> + .mapbase = __PREG(FFUART),
> + .irq = IRQ_FFUART,
> + .uartclk = 921600 * 16,
> + .regshift = 2,
> + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> + .iotype = UPIO_MEM,
> + },
> + {
> + .membase = (void *)&BTUART,
> + .mapbase = __PREG(BTUART),
> + .irq = IRQ_BTUART,
> + .uartclk = 921600 * 16,
> + .regshift = 2,
> + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> + .iotype = UPIO_MEM,
> + },
> + {
> + .membase = (void *)&STUART,
> + .mapbase = __PREG(STUART),
> + .irq = IRQ_STUART,
> + .uartclk = 921600 * 16,
> + .regshift = 2,
> + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> + .iotype = UPIO_MEM,
> + },
> + /* External UARTs */
> + {
> + .mapbase = VIPER_UARTA_PHYS,
> + .irq = VIPER_UARTA_IRQ,
> + .uartclk = 1843200,
> + .regshift = 1,
> + .iotype = UPIO_MEM,
> + .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
> + UPF_SKIP_TEST,
> + },
> + {
> + .mapbase = VIPER_UARTB_PHYS,
> + .irq = VIPER_UARTB_IRQ,
> + .uartclk = 1843200,
> + .regshift = 1,
> + .iotype = UPIO_MEM,
> + .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
> + UPF_SKIP_TEST,
> + },
> + { },
> +};
> +
> +static struct platform_device serial_device = {
> + .name = "serial8250",
> + .id = 0,
> + .dev = {
> + .platform_data = serial_platform_data,
> + },
> + .num_resources = ARRAY_SIZE(viper_serial_resources),
> + .resource = viper_serial_resources,
> +};
We now have dedicated pxa serial driver, please use that
driver for internal UARTs.
> +
> +/* USB */
> +static void isp116x_delay(struct device *dev, int delay)
> +{
> + /* On this platform, we work with 200MHz clock, giving
> + 5 ns per instruction. The cycle below involves 2
> + instructions and we lose 2 more instruction times due
> + to pipeline flush at a jump. I.e., we consume 20 ns
> + per cycle.
> + */
> + int cyc = delay/20 + 1;
> + cyc <<= 2; /* actually, 400MHz */
> +
> + __asm__ volatile ("0:\n"
> + " subs %0, %1, #1\n"
> + " bge 0b\n"
> + : "=r" (cyc)
> + : "0" (cyc)
> + );
Isn't ndelay/udelay/mdelay not precise enough? Provided that they
use loops per jiffy so they work with different CPU frequencies??
> +}
> +
> +static struct resource isp116x_resources[] = {
> + [0] = { /* DATA */
> + .start = VIPER_USB_PHYS + 0,
> + .end = VIPER_USB_PHYS + 1,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = { /* ADDR */
> + .start = VIPER_USB_PHYS + 2,
> + .end = VIPER_USB_PHYS + 3,
> + .flags = IORESOURCE_MEM,
> + },
> + [2] = {
> + .start = VIPER_USB_IRQ,
> + .end = VIPER_USB_IRQ,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> +/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
> +static struct isp116x_platform_data isp116x_platform_data = {
> + /* Enable internal resistors on downstream ports */
> + .sel15Kres = 1,
> + /* On-chip overcurrent protection */
> + .oc_enable = 1,
> + /* INT output polarity */
> + .int_act_high = 1,
> + /* INT edge or level triggered */
> + .int_edge_triggered = 0,
> +
> + /* WAKEUP pin connected - NOT SUPPORTED */
> + /* .remote_wakeup_connected = 0, */
> + /* Wakeup by devices on usb bus enabled */
> + .remote_wakeup_enable = 0,
> + .delay = isp116x_delay,
> +};
> +
> +static struct platform_device isp116x_device = {
> + .name = "isp116x-hcd",
> + .id = -1,
> + .num_resources = ARRAY_SIZE(isp116x_resources),
> + .resource = isp116x_resources,
> + .dev = {
> + .platform_data = &isp116x_platform_data,
> + },
> +
> +};
> +
> +static struct resource sram_resource = {
> + .start = _VIPER_SRAM_BASE,
> + .end = _VIPER_SRAM_BASE + SZ_256K - 1,
> + .flags = IORESOURCE_MEM,
> +};
> +
> +static struct platform_device sram_device = {
> + .name = "pxa2xx-8bit-sram",
> + .id = 0,
> + .num_resources = 1,
> + .resource = &sram_resource,
> +};
> +
External SRAM can be directly mapped if necessary, it's
usually no need to create a dedicated device for it.
> +static struct resource flash_resources[] = {
> + [0] = { /* RedBoot config + filesystem flash */
> + .start = VIPER_FLASH_PHYS,
> + .end = VIPER_FLASH_PHYS + SZ_32M - 1,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = { /* Boot flash */
> + .start = VIPER_BOOT_PHYS,
> + .end = VIPER_BOOT_PHYS + SZ_1M - 1,
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
> +static struct mtd_partition viper_boot_flash_partition = {
> + .name = "RedBoot",
> + .size = SZ_1M,
> + .offset = 0,
> + .mask_flags = MTD_WRITEABLE, /* force R/O */
> +};
> +
> +static struct flash_platform_data viper_flash_data[] = {
> + [0] = {
> + .name = "ViperFlash",
> + .map_name = "cfi_probe",
> + .width = 2,
> + .parts = NULL,
> + .nr_parts = 0,
> + },
> + [1] = {
> + .name = "ViperBootFlash",
> + .map_name = "jedec_probe",
> + .width = 2,
> + .parts = &viper_boot_flash_partition,
> + .nr_parts = 1,
> + },
> +};
> +
> +static struct platform_device viper_flash_devices[] = {
> + {
> + .name = "pxa2xx-flash",
> + .id = 0,
> + .dev = {
> + .platform_data = &viper_flash_data[0],
> + },
> + .resource = &flash_resources[0],
> + .num_resources = 1,
> + },
> + {
> + .name = "pxa2xx-flash",
> + .id = 1,
> + .dev = {
> + .platform_data = &viper_flash_data[1],
> + },
> + .resource = &flash_resources[1],
> + .num_resources = 1,
> + },
> +};
> +
> +static struct platform_device *viper_devs[] __initdata = {
> + &smc91x_device,
> + &i2c_bus_device,
> + &serial_device,
> + &isp116x_device,
> + &audio_device,
> + &sram_device,
> + &viper_flash_devices[0],
> + &viper_flash_devices[1],
> +};
> +
> +static mfp_cfg_t viper_pin_config[] __initdata = {
> + /* Chip selects */
> + GPIO15_nCS_1,
> + GPIO78_nCS_2,
> + GPIO79_nCS_3,
> + GPIO80_nCS_4,
> + GPIO33_nCS_5,
> +
> + /* FP Backlight */
> + VIPER_BCKLIGHT_EN_GPIO | MFP_DIR_OUT,
> + VIPER_LCD_EN_GPIO | MFP_DIR_OUT,
> + VIPER_PWM0_GPIO | MFP_DIR_OUT,
> +
No, MFP_DIR_OUT isn't supposed to be used externally, use
gpio_direction_output() please.
> + /* Compact-Flash / PC104 */
> + VIPER_CF_POWER_GPIO | MFP_DIR_OUT,
ditto
> + VIPER_CF_CD_GPIO,
> + VIPER_CF_RDY_GPIO,
> +
> + /* Integrated UPS control */
> + VIPER_UPS_GPIO | MFP_DIR_OUT,
> +
ditto
> + /* Vcc regulator control */
> + VIPER_PSU_DATA_GPIO | MFP_DIR_OUT,
> + VIPER_PSU_CLK_GPIO | MFP_DIR_OUT,
> + VIPER_PSU_nCS_LD_GPIO | MFP_DIR_OUT,
> +
ditto
> + /* i2c busses */
> + VIPER_TPM_I2C_SDA_GPIO,
> + VIPER_TPM_I2C_SCL_GPIO | MFP_DIR_OUT,
> + VIPER_RTC_I2C_SDA_GPIO,
> + VIPER_RTC_I2C_SCL_GPIO | MFP_DIR_OUT,
ditto
> +};
> +
> +static unsigned long viper_tpm;
> +
> +static int __init viper_tpm_setup(char *str)
> +{
> + strict_strtoul(str, 10, &viper_tpm);
> + return 1;
> +}
> +
> +__setup("tpm=", viper_tpm_setup);
> +
> +static void __init viper_init(void)
> +{
> + u8 version;
> +
> + pm_power_off = viper_power_off;
> +
> + pxa2xx_mfp_config(ARRAY_AND_SIZE(viper_pin_config));
> +
> + set_pxa_fb_info(&fb_info);
> +
> + /* v1 hardware cannot use the datacs line */
> + version = viper_hw_version();
> + if (version == 0)
> + smc91x_device.num_resources--;
> +
> + pxa_set_i2c_info(NULL);
> + platform_add_devices(viper_devs, ARRAY_SIZE(viper_devs));
> +
> + viper_init_cpufreq();
> + /* c/should assume redboot set the correct level ??? */
> + viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1);
> +
> + sysdev_driver_register(&cpu_sysdev_class, &viper_cpu_sysdev_driver);
> +
> + if (version) {
> + printk(KERN_INFO "viper: hardware v%di%d detected. "
> + "CPLD revision %d.\n",
> + VIPER_BOARD_VERSION(version),
> + VIPER_BOARD_ISSUE(version),
> + VIPER_CPLD_REVISION(version));
> + system_rev = (VIPER_BOARD_VERSION(version) << 8) |
> + (VIPER_BOARD_ISSUE(version) << 4) |
> + VIPER_CPLD_REVISION(version);
> + } else {
> + printk(KERN_INFO "viper: No version register.\n");
> + }
pr_info??
> +
> + i2c_register_board_info(1, viper_i2c_devices,
> + ARRAY_SIZE(viper_i2c_devices));
> +
ARRAY_AND_SIZE() if you like it
> + /* Allocate TPM i2c bus if requested */
> + if (viper_tpm) {
> + struct platform_device *tpm_device;
> + struct i2c_gpio_platform_data i2c_tpm_data = {
> + .sda_pin = VIPER_TPM_I2C_SDA_GPIO,
> + .scl_pin = VIPER_TPM_I2C_SCL_GPIO,
> + .udelay = 10,
> + .timeout = 100,
> + };
> + char *errstr;
> +
> + tpm_device = platform_device_alloc("i2c-gpio", 2);
> + if (tpm_device) {
> + if (!platform_device_add_data(tpm_device,
> + &i2c_tpm_data,
> + sizeof(i2c_tpm_data))) {
> + if (platform_device_add(tpm_device)) {
> + errstr = "register TPM i2c bus";
> + goto error_free_tpm;
> + }
> + } else {
> + errstr = "allocate TPM i2c bus data";
> + goto error_free_tpm;
> + }
> +
> + goto no_error_tpm;
> + }
> +
> + errstr = "allocate TPM i2c device";
> + goto error_tpm;
> +
> +error_free_tpm:
> + kfree(tpm_device);
> +error_tpm:
> + printk(KERN_ERR "viper: Couldn't %s, giving up\n", errstr);
> + }
make a dedicated viper_init_i2c() for this block of code please.
> +
> +no_error_tpm:
> +
> + return;
> +}
> +
> +static struct map_desc viper_io_desc[] __initdata = {
> + {
> + .virtual = VIPER_CPLD_BASE,
> + .pfn = __phys_to_pfn(VIPER_CPLD_PHYS),
> + .length = 0x00300000,
> + .type = MT_DEVICE,
> + },
> + {
> + .virtual = VIPER_PC104IO_BASE,
> + .pfn = __phys_to_pfn(_PCMCIA1IO),
> + .length = 0x00800000,
> + .type = MT_DEVICE,
> + },
> +};
> +
> +static void __init viper_map_io(void)
> +{
> + pxa_map_io();
> +
> + iotable_init(viper_io_desc, ARRAY_SIZE(viper_io_desc));
> +
> + /* setup sleep mode values */
> + /* FIXME : to be removed once completly converted to mfp */
> + PWER = 0x00000002;
> + PFER = 0x00000000;
> + PRER = 0x00000002;
If you have wakeup on GPIO1, please refer to mainstone for
a sample of using gpio-keys to specifiy the wakeup source.
> + PGSR0 = 0x00008000;
> + PGSR1 = 0x003F0202;
> + PGSR2 = 0x0001C000;
These are not necessary, they are encoded in GPIOxx_* macros,
which means you have to modify the MFP table.
> + PCFR |= PCFR_OPDE;
> +}
> +
> +MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")
> + /* Maintainer: Arcom Control Systems Ltd. */
Give your name and email address here please, so maybe years
later, I can still find someone to verify this code :)
> + .phys_io = 0x40000000,
> + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
> + .boot_params = 0xa0000100,
> + .map_io = viper_map_io,
> + .init_irq = viper_init_irq,
> + .timer = &pxa_timer,
> + .init_machine = viper_init,
> +MACHINE_END
> diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h
> index 9413121..583c300 100644
> --- a/include/asm-arm/arch-pxa/irqs.h
> +++ b/include/asm-arm/arch-pxa/irqs.h
> @@ -179,6 +179,7 @@
> #elif defined(CONFIG_SHARP_LOCOMO)
> #define NR_IRQS (IRQ_LOCOMO_SPI_TEND + 1)
> #elif defined(CONFIG_ARCH_LUBBOCK) || \
> + defined(CONFIG_ARCH_VIPER) || \
> defined(CONFIG_MACH_LOGICPD_PXA270) || \
> defined(CONFIG_MACH_TOSA) || \
> defined(CONFIG_MACH_MAINSTONE) || \
> @@ -232,6 +233,28 @@
> #define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2)
> #define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3)
>
> +/* ARCOM VIPER */
> +#define VIPER_ETH_IRQ IRQ_GPIO(VIPER_ETH_GPIO)
> +#define VIPER_CPLD_IRQ IRQ_GPIO(VIPER_CPLD_GPIO)
> +#define VIPER_USB_IRQ IRQ_GPIO(VIPER_USB_GPIO)
> +
> +#define VIPER_UARTA_IRQ IRQ_GPIO(VIPER_UARTA_GPIO)
> +#define VIPER_UARTB_IRQ IRQ_GPIO(VIPER_UARTB_GPIO)
> +
> +#define VIPER_CF_CD_IRQ IRQ_GPIO(VIPER_CF_CD_GPIO)
> +#define VIPER_CF_RDY_IRQ IRQ_GPIO(VIPER_CF_RDY_GPIO)
> +
> +#define VIPER_IRQ(x) (IRQ_BOARD_START + (x))
> +
> +#define VIPER_ISA_IRQ3 VIPER_IRQ(0)
> +#define VIPER_ISA_IRQ4 VIPER_IRQ(1)
> +#define VIPER_ISA_IRQ5 VIPER_IRQ(2)
> +#define VIPER_ISA_IRQ6 VIPER_IRQ(3)
> +#define VIPER_ISA_IRQ7 VIPER_IRQ(4)
> +#define VIPER_ISA_IRQ10 VIPER_IRQ(5)
> +#define VIPER_ISA_IRQ11 VIPER_IRQ(6)
> +#define VIPER_ISA_IRQ14 VIPER_IRQ(7)
> +
> /* phyCORE-PXA270 (PCM027) Interrupts */
> #define PCM027_IRQ(x) (IRQ_BOARD_START + (x))
> #define PCM027_BTDET_IRQ PCM027_IRQ(0)
> diff --git a/include/asm-arm/arch-pxa/viper.h b/include/asm-arm/arch-pxa/viper.h
> new file mode 100644
> index 0000000..f8b3630
> --- /dev/null
> +++ b/include/asm-arm/arch-pxa/viper.h
> @@ -0,0 +1,91 @@
> +/*
> + * linux/include/asm-arm/arch-pxa/viper.h
> + *
> + * Author: Ian Campbell
> + * Created: Feb 03, 2003
> + * Copyright: Arcom Control Systems.
> + *
> + * Created based on lubbock.h:
> + * Author: Nicolas Pitre
> + * Created: Jun 15, 2001
> + * Copyright: MontaVista Software Inc.
> + *
> + * 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.
> + */
> +
> +#ifndef ARCH_VIPER_H
> +#define ARCH_VIPER_H
> +
> +#define VIPER_BOOT_PHYS PXA_CS0_PHYS
> +#define VIPER_FLASH_PHYS PXA_CS1_PHYS
> +#define VIPER_ETH_PHYS PXA_CS2_PHYS
> +#define VIPER_USB_PHYS PXA_CS3_PHYS
> +#define VIPER_ETH_DATA_PHYS PXA_CS4_PHYS
> +#define VIPER_CPLD_PHYS PXA_CS5_PHYS
> +
> +#define VIPER_CPLD_BASE (0xf0000000)
> +#define VIPER_PC104IO_BASE (0xf1000000)
> +#define VIPER_USB_BASE (0xf1800000)
> +
> +#define VIPER_ETH_GPIO (0)
> +#define VIPER_CPLD_GPIO (1)
> +#define VIPER_USB_GPIO (2)
> +#define VIPER_UARTA_GPIO (4)
> +#define VIPER_UARTB_GPIO (3)
> +#define VIPER_CF_CD_GPIO (32)
> +#define VIPER_CF_RDY_GPIO (8)
> +#define VIPER_BCKLIGHT_EN_GPIO (9)
> +#define VIPER_LCD_EN_GPIO (10)
> +#define VIPER_PSU_DATA_GPIO (6)
> +#define VIPER_PSU_CLK_GPIO (11)
> +#define VIPER_PWM0_GPIO (16)
> +#define VIPER_PSU_nCS_LD_GPIO (19)
> +#define VIPER_UPS_GPIO (20)
> +#define VIPER_CF_POWER_GPIO (82)
> +#define VIPER_TPM_I2C_SDA_GPIO (26)
> +#define VIPER_TPM_I2C_SCL_GPIO (27)
> +#define VIPER_RTC_I2C_SDA_GPIO (83)
> +#define VIPER_RTC_I2C_SCL_GPIO (84)
> +
> +#define VIPER_CPLD_P2V(x) ((x) - VIPER_CPLD_PHYS + VIPER_CPLD_BASE)
> +#define VIPER_CPLD_V2P(x) ((x) - VIPER_CPLD_BASE + VIPER_CPLD_PHYS)
> +
> +#ifndef __ASSEMBLY__
> +# define __VIPER_CPLD_REG(x) (*((volatile u16 *)VIPER_CPLD_P2V(x)))
> +#endif
> +
> +/* board level registers in the CPLD: (offsets from CPLD_BASE) ... */
> +
> +/* ... Physical addresses */
> +#define _VIPER_LO_IRQ_STATUS (VIPER_CPLD_PHYS + 0x100000)
> +#define _VIPER_ICR_PHYS (VIPER_CPLD_PHYS + 0x100002)
> +#define _VIPER_HI_IRQ_STATUS (VIPER_CPLD_PHYS + 0x100004)
> +#define _VIPER_VERSION_PHYS (VIPER_CPLD_PHYS + 0x100006)
> +#define VIPER_UARTA_PHYS (VIPER_CPLD_PHYS + 0x300010)
> +#define VIPER_UARTB_PHYS (VIPER_CPLD_PHYS + 0x300000)
> +#define _VIPER_SRAM_BASE (VIPER_CPLD_PHYS + 0x800000)
> +
> +/* ... Virtual addresses */
> +#define VIPER_LO_IRQ_STATUS __VIPER_CPLD_REG(_VIPER_LO_IRQ_STATUS)
> +#define VIPER_HI_IRQ_STATUS __VIPER_CPLD_REG(_VIPER_HI_IRQ_STATUS)
> +
> +/* Decode VIPER_VERSION register */
> +#define VIPER_CPLD_REVISION(x) (((x) >> 5) & 0x7)
> +#define VIPER_BOARD_VERSION(x) (((x) >> 3) & 0x3)
> +#define VIPER_BOARD_ISSUE(x) (((x) >> 0) & 0x7)
> +
> +/* Interrupt and Configuration Register (VIPER_ICR) */
> +/* This is a write only register. Only CF_RST is used under Linux */
> +
> +extern void viper_icr_set_bit(unsigned int bit);
> +extern void viper_icr_clear_bit(unsigned int bit);
> +
> +#define VIPER_ICR_RETRIG (1 << 0)
> +#define VIPER_ICR_AUTO_CLR (1 << 1)
> +#define VIPER_ICR_R_DIS (1 << 2)
> +#define VIPER_ICR_CF_RST (1 << 3)
> +
> +#endif
> +
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Cheers
- eric
You may want to use
if (machine_is_viper())
do_some_quirks();
instead of modifying the generic ops structure.
On Wed, Aug 6, 2008 at 9:19 PM, Marc Zyngier <[email protected]> wrote:
> Some platforms, namely the Arcom/Eurotech Viper, need some extra care
> to run (on this board, the PC104 connector is actually wired to the
> second PCMCIA slot, and needs to be powered on despite not being managed
> by the PCMCIA code...).
>
> Add a quirks field to the pcmcia_low_level structure that the SOC
> dependant code can inspect.
>
> Introduce a PXA2XX_QUIRK_NEEDS_MECR_NOS that can be used by the offending
> board.
>
> Signed-off-by: Marc Zyngier <[email protected]>
> ---
> drivers/pcmcia/pxa2xx_base.c | 20 ++++++++++++++++++--
> drivers/pcmcia/pxa2xx_base.h | 7 +++++++
> drivers/pcmcia/soc_common.h | 2 ++
> 3 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
> index ccfdf19..9e61f21 100644
> --- a/drivers/pcmcia/pxa2xx_base.c
> +++ b/drivers/pcmcia/pxa2xx_base.c
> @@ -195,7 +195,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
> MECR |= MECR_CIT;
>
> /* Set MECR:NOS (Number Of Sockets) */
> - if (nr > 1)
> + if (nr > 1 || (ops->quirks & PXA2XX_QUIRK_NEEDS_MECR_NOS))
> MECR |= MECR_NOS;
> else
> MECR &= ~MECR_NOS;
> @@ -226,7 +226,23 @@ static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)
> struct pcmcia_low_level *ops = dev->dev.platform_data;
> int nr = ops ? ops->nr : 0;
>
> - MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
> + if (nr > 0) {
> + u32 quirks = ops ? ops->quirks : 0;
> + int v;
> +
> + /*
> + * We have at least one socket, so set MECR:CIT
> + * (Card Is There)
> + */
> + v = MECR_CIT;
> +
> + /* Set MECR:NOS (Number Of Sockets) */
> + if (nr > 1 || (quirks & PXA2XX_QUIRK_NEEDS_MECR_NOS))
> + v |= MECR_NOS;
> +
> + MECR = v;
> + } else
> + MECR = 0;
>
> return pcmcia_socket_dev_resume(&dev->dev);
> }
> diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h
> index 235d681..956ee9d 100644
> --- a/drivers/pcmcia/pxa2xx_base.h
> +++ b/drivers/pcmcia/pxa2xx_base.h
> @@ -1,3 +1,10 @@
> +#ifndef PXA2XX_BASE
> +#define PXA2XX_BASE
> +
> +#define PXA2XX_QUIRK_NEEDS_MECR_NOS (1 << 0)
> +
> /* temporary measure */
> extern int __pxa2xx_drv_pcmcia_probe(struct device *);
>
> +#endif
> +
> diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
> index 91ef6a0..9e288fc 100644
> --- a/drivers/pcmcia/soc_common.h
> +++ b/drivers/pcmcia/soc_common.h
> @@ -76,6 +76,8 @@ struct pcmcia_low_level {
> int first;
> /* nr of sockets */
> int nr;
> + /* Quirks required by this system, SOC dependant */
> + u32 quirks;
>
> int (*hw_init)(struct soc_pcmcia_socket *);
> void (*hw_shutdown)(struct soc_pcmcia_socket *);
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Cheers
- eric
Consider merging this to the following code in the front of smc91x.h
#if defined(CONFIG_ARCH_LUBBOCK) ||\
defined(CONFIG_MACH_MAINSTONE) ||\
defined(CONFIG_MACH_ZYLONITE) ||\
defined(CONFIG_MACH_LITTLETON)
#include <asm/mach-types.h>
/* Now the bus width is specified in the platform data
* pretend here to support all I/O access types
*/
#define SMC_CAN_USE_8BIT 1
#define SMC_CAN_USE_16BIT 1
#define SMC_CAN_USE_32BIT 1
#define SMC_NOWAIT 1
#define SMC_IO_SHIFT (lp->io_shift)
....
#else
On Wed, Aug 6, 2008 at 9:19 PM, Marc Zyngier <[email protected]> wrote:
> Signed-off-by: Marc Zyngier <[email protected]>
> ---
> drivers/net/smc91x.h | 21 +++++++++++++++++++++
> 1 files changed, 21 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
> index 22209b6..9481412 100644
> --- a/drivers/net/smc91x.h
> +++ b/drivers/net/smc91x.h
> @@ -185,6 +185,27 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
>
> #define SMC_IRQ_FLAGS (-1)
>
> +#elif defined(CONFIG_ARCH_VIPER)
> +
> +/* We can only do 16-bit reads and writes in the static memory space. */
> +#define SMC_CAN_USE_8BIT 0
> +#define SMC_CAN_USE_16BIT 1
> +#define SMC_CAN_USE_32BIT 0
> +#define SMC_CAN_USE_DATACS 1
> +#define SMC_NOWAIT 1
> +
> +#define SMC_IO_SHIFT 0
> +
> +#define SMC_inw(a, r) readw((a) + (r))
> +#define SMC_outw(v, a, r) writew(v, (a) + (r))
> +#define SMC_insw(a, r, p, l) insw((a) + (r), p, l)
> +#define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l)
> +
> +#define RPC_LSA_DEFAULT RPC_LED_100_10
> +#define RPC_LSB_DEFAULT RPC_LED_TX_RX
> +
> +#define SMC_IRQ_FLAGS (-1) /* from resource */
> +
> #elif defined(CONFIG_SA1100_ASSABET)
>
> #include <asm/arch/neponset.h>
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Cheers
- eric
On Thu, 7 Aug 2008 11:50:57 +0800
"Eric Miao" <[email protected]> wrote:
Eric,
First, thanks for this in-depth review. I strongly agree with most of
your remarks. I just happend to have some questions regarding the
serial stuff:
> > +static struct plat_serial8250_port serial_platform_data[] = {
> > + /* Internal UARTs */
> > + {
> > + .membase = (void *)&FFUART,
> > + .mapbase = __PREG(FFUART),
> > + .irq = IRQ_FFUART,
> > + .uartclk = 921600 * 16,
> > + .regshift = 2,
> > + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> > + .iotype = UPIO_MEM,
> > + },
> > + {
> > + .membase = (void *)&BTUART,
> > + .mapbase = __PREG(BTUART),
> > + .irq = IRQ_BTUART,
> > + .uartclk = 921600 * 16,
> > + .regshift = 2,
> > + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> > + .iotype = UPIO_MEM,
> > + },
> > + {
> > + .membase = (void *)&STUART,
> > + .mapbase = __PREG(STUART),
> > + .irq = IRQ_STUART,
> > + .uartclk = 921600 * 16,
> > + .regshift = 2,
> > + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
> > + .iotype = UPIO_MEM,
> > + },
> > + /* External UARTs */
> > + {
> > + .mapbase = VIPER_UARTA_PHYS,
> > + .irq = VIPER_UARTA_IRQ,
> > + .uartclk = 1843200,
> > + .regshift = 1,
> > + .iotype = UPIO_MEM,
> > + .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
> > + UPF_SKIP_TEST,
> > + },
> > + {
> > + .mapbase = VIPER_UARTB_PHYS,
> > + .irq = VIPER_UARTB_IRQ,
> > + .uartclk = 1843200,
> > + .regshift = 1,
> > + .iotype = UPIO_MEM,
> > + .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP |
> > + UPF_SKIP_TEST,
> > + },
> > + { },
> > +};
> > +
> > +static struct platform_device serial_device = {
> > + .name = "serial8250",
> > + .id = 0,
> > + .dev = {
> > + .platform_data = serial_platform_data,
> > + },
> > + .num_resources =
> > ARRAY_SIZE(viper_serial_resources),
> > + .resource = viper_serial_resources,
> > +};
>
> We now have dedicated pxa serial driver, please use that
> driver for internal UARTs.
- Having both the pxa (for internal UARTs) and 8250 (for external
UARTs) serial drivers have a memory footprint impact. Ok, that's not
much.
- People using their old user-space with a new kernel will see their
serial port names shuffled (going from an all-ttyS? world to a mix of
ttySA? and ttyS?). Is there a way to avoid the confusion?
Thanks again,
M.
--
A rat a day keeps the plague away.
> - People using their old user-space with a new kernel will see their
> serial port names shuffled (going from an all-ttyS? world to a mix of
> ttySA? and ttyS?). Is there a way to avoid the confusion?
This can be solved in user-space, "udev" is probably what you want.