diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 7c3007d..ce2c700 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c @@ -388,6 +388,26 @@ static struct pxafb_mach_info sharp_lcd .pxafb_backlight_power = board_backlight_power, }; +static struct pxafb_mach_info toshiba_lcd __initdata = { + .pixclock = 39720, + .xres = 640, + .yres = 480, + .bpp = 8, + .hsync_len = 63, + .left_margin = 12, + .right_margin = 12, + .vsync_len = 4, + .upper_margin = 32, + .lower_margin = 10, + .sync = 0, + .cmap_greyscale = 0, + .cmap_inverse = 0, + .cmap_static = 0, + .lccr0 = LCCR0_Color | LCCR0_Act, + .lccr3 = 0x03400002, + .pxafb_backlight_power = board_backlight_power, +}; + static void __init trizeps4_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { } @@ -396,7 +416,8 @@ static void __init trizeps4_init(void) { platform_add_devices(trizeps4_devices, ARRAY_SIZE(trizeps4_devices)); - set_pxa_fb_info(&sharp_lcd); +/* set_pxa_fb_info(&sharp_lcd); */ + set_pxa_fb_info(&toshiba_lcd); pxa_set_mci_info(&trizeps4_mci_platform_data); pxa_set_ficp_info(&trizeps4_ficp_platform_data); diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index b6fb167..3208112 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -799,6 +799,16 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ default "128" depends BLK_DEV_IDE_AU1XXX +config IDE_PXA_CF + bool "IDE on CF interface support" + depends on ARCH_PXA && MACH_TRIZEPS4 + select IDE_ARM + help + On PXA2xx Systems with PCMCIA Sockets which are configured by + bootloader you can access the drive (p.e. CF-Card) directly + without using cardmanager/ide-cs. + If you are unsure, say N to this. + config IDE_ARM def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 569fae7..10f0555 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile @@ -25,6 +25,7 @@ ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide # built-in only drivers from arm/ ide-core-$(CONFIG_IDE_ARM) += arm/ide_arm.o +ide-core-$(CONFIG_IDE_PXA_CF) += arm/ide_arm.o # built-in only drivers from legacy/ ide-core-$(CONFIG_BLK_DEV_BUDDHA) += legacy/buddha.o diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c index 23488c4..96d1cb3 100644 --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -22,11 +23,17 @@ #ifdef CONFIG_ARCH_CLPS7500 # include -# # define IDE_ARM_IO (ISASLOT_IO + 0x1f0) +# define IDE_ARM_CTL (ISASLOT_IO + 0x1f0 + 0x206); # define IDE_ARM_IRQ IRQ_ISA_14 +#elif CONFIG_MACH_TRIZEPS4 +# include +# define IDE_ARM_IO ((unsigned long)ioremap(0x20000000, 7)) +# define IDE_ARM_CTL ((unsigned long)ioremap(0x2000000e, 1)) +# define IDE_ARM_IRQ TRIZEPS4_READY_NINT #else # define IDE_ARM_IO 0x1f0 +# define IDE_ARM_CTL (0x1f0 + 0x206) # define IDE_ARM_IRQ IRQ_HARDDISK #endif @@ -36,8 +43,10 @@ void __init ide_arm_init(void) hw_regs_t hw; memset(&hw, 0, sizeof(hw)); - ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); + ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_CTL); hw.irq = IDE_ARM_IRQ; + hw.chipset = ide_generic; ide_register_hw(&hw, NULL); + set_irq_type(hw.irq, IRQT_RISING); } } diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index fc3c885..900f05f 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -3,7 +3,7 @@ # menu "Multimedia Capabilities Port drivers" - depends on ARCH_SA1100 + depends on ARCH_SA1100 || ARCH_PXA config MCP tristate @@ -23,4 +23,13 @@ config MCP_UCB1200_TS tristate "Touchscreen interface support" depends on MCP_UCB1200 && INPUT +config UCB1400 + tristate + +config UCB1400_TS + tristate "UCB1400 Touchscreen support" + depends on ARCH_LUBBOCK || MACH_MAINSTONE || MACH_TRIZEPS4 + select UCB1400 + select SND_AC97_BUS + endmenu diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index adb29b5..24429d1 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -10,3 +10,10 @@ obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00- ifeq ($(CONFIG_SA1100_ASSABET),y) obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o endif + +ucb1400-core-y := ucb1x00-core.o mcp-ac97.o +obj-$(CONFIG_UCB1400_TS) += ucb1400-core.o ucb1x00-ts.o + +ucb1400-core-$(CONFIG_UCB1400) := ucb1x00-core.o mcp-ac97.o +obj-$(CONFIG_UCB1400_TS) += ucb1400-core.o ucb1x00-ts.o + diff --git a/drivers/mfd/mcp-ac97.c b/drivers/mfd/mcp-ac97.c new file mode 100644 index 0000000..917a819 --- /dev/null +++ b/drivers/mfd/mcp-ac97.c @@ -0,0 +1,155 @@ +/* + * linux/drivers/misc/mcp-ac97.c + * + * Author: Nicolas Pitre + * Created: Jan 14, 2005 + * Copyright: (C) 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. + * + * This module provides the minimum replacement for mcp-core.c allowing for + * the UCB1400 chip to be driven by the ucb1x00 driver over an AC97 link. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "mcp.h" + +/* ucb1x00 SIB register to ucb1400 AC-link register mapping */ + +static const unsigned char regmap[] = { + 0x5a, /* UCB_IO_DATA */ + 0X5C, /* UCB_IO_DIR */ + 0X5E, /* UCB_IE_RIS */ + 0x60, /* UCB_IE_FAL */ + 0x62, /* UCB_IE_STATUS */ + 0, /* UCB_TC_A */ + 0, /* UCB_TC_B */ + 0, /* UCB_AC_A */ + 0, /* UCB_AC_B */ + 0x64, /* UCB_TS_CR */ + 0x66, /* UCB_ADC_CR */ + 0x68, /* UCB_ADC_DATA */ + 0x7e, /* UCB_ID */ + 0, /* UCB_MODE */ + 0x6a, /* UCB_CSR1 */ + 0x6c, /* UCB_CSR2 */ +}; + +unsigned int mcp_reg_read(struct mcp *mcp, unsigned int reg) +{ + ac97_t *ac97 = to_ac97_t(mcp->dev); + if (reg < ARRAY_SIZE(regmap)) { + reg = regmap[reg]; + if (reg) + return ac97->bus->ops->read(ac97, reg); + } + return -1; +} +EXPORT_SYMBOL(mcp_reg_read); + +void mcp_reg_write(struct mcp *mcp, unsigned int reg, unsigned int val) +{ + ac97_t *ac97 = to_ac97_t(mcp->dev); + if (reg < ARRAY_SIZE(regmap)) { + reg = regmap[reg]; + if (reg) + ac97->bus->ops->write(ac97, reg, val); + } +} +EXPORT_SYMBOL(mcp_reg_write); + +void mcp_enable(struct mcp *mcp) +{ +} +EXPORT_SYMBOL(mcp_enable); + +void mcp_disable(struct mcp *mcp) +{ +} +EXPORT_SYMBOL(mcp_disable); + +#define to_mcp_driver(d) container_of(d, struct mcp_driver, drv) + +static int mcp_probe(struct device *dev) +{ + struct mcp_driver *drv = to_mcp_driver(dev->driver); + struct mcp *mcp; + int ret; + + ret = -ENOMEM; + mcp = kmalloc(sizeof(*mcp), GFP_KERNEL); + if (mcp) { + memset(mcp, 0, sizeof(*mcp)); + mcp->owner = THIS_MODULE; + mcp->dev = dev; + ret = drv->probe(mcp); + if (ret) + kfree(mcp); + } + if (!ret) + dev_set_drvdata(dev, mcp); + return ret; +} + +static int mcp_remove(struct device *dev) +{ + struct mcp_driver *drv = to_mcp_driver(dev->driver); + struct mcp *mcp = dev_get_drvdata(dev); + + drv->remove(mcp); + dev_set_drvdata(dev, NULL); + kfree(mcp); + return 0; +} + +static int mcp_suspend(struct device *dev, pm_message_t state) +{ + struct mcp_driver *drv = to_mcp_driver(dev->driver); + struct mcp *mcp = dev_get_drvdata(dev); + int ret = 0; + + if (drv->suspend) + ret = drv->suspend(mcp, state); + return ret; +} + +static int mcp_resume(struct device *dev) +{ + struct mcp_driver *drv = to_mcp_driver(dev->driver); + struct mcp *mcp = dev_get_drvdata(dev); + int ret = 0; + + if (drv->resume) + ret = drv->resume(mcp); + return ret; +} + +int mcp_driver_register(struct mcp_driver *mcpdrv) +{ + mcpdrv->drv.owner = THIS_MODULE; + mcpdrv->drv.bus = &ac97_bus_type; + mcpdrv->drv.probe = mcp_probe; + mcpdrv->drv.remove = mcp_remove; + mcpdrv->drv.suspend = mcp_suspend; + mcpdrv->drv.resume = mcp_resume; + return driver_register(&mcpdrv->drv); +} + +void mcp_driver_unregister(struct mcp_driver *mcpdrv) +{ + driver_unregister(&mcpdrv->drv); +} + +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index 75f401d..2a7c176 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c @@ -208,6 +208,7 @@ struct mcp *mcp_host_alloc(struct device mcp->attached_device.bus = &mcp_bus_type; mcp->attached_device.dma_mask = parent->dma_mask; mcp->attached_device.release = mcp_release; + mcp->dev = &mcp->attached_device; } return mcp; } diff --git a/drivers/mfd/mcp.h b/drivers/mfd/mcp.h index c093a93..2dd89f3 100644 --- a/drivers/mfd/mcp.h +++ b/drivers/mfd/mcp.h @@ -24,6 +24,7 @@ struct mcp { dma_device_t dma_telco_rd; dma_device_t dma_telco_wr; struct device attached_device; + struct device *dev; }; struct mcp_ops { diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 2bf3272..7452e5b 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -30,6 +31,14 @@ #include "ucb1x00.h" +#if (defined CONFIG_UCB1400) || (defined CONFIG_UCB1400_MODULE) +#define UCB_IS_1400(id) ((id) == UCB_ID_1400) +#define UCB_X_CSR1 0xe /* this fake entry will be translated by mcp */ +#define UCB_X_CSR2 0xf /* this fake entry will be translated by mcp */ +#else +#define UCB_IS_1400(id) (0) +#endif + static DEFINE_MUTEX(ucb1x00_mutex); static LIST_HEAD(ucb1x00_drivers); static LIST_HEAD(ucb1x00_devices); @@ -57,9 +66,9 @@ void ucb1x00_io_set_dir(struct ucb1x00 * spin_lock_irqsave(&ucb->io_lock, flags); ucb->io_dir |= out; ucb->io_dir &= ~in; + spin_unlock_irqrestore(&ucb->io_lock, flags); ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir); - spin_unlock_irqrestore(&ucb->io_lock, flags); } /** @@ -85,9 +94,9 @@ void ucb1x00_io_write(struct ucb1x00 *uc spin_lock_irqsave(&ucb->io_lock, flags); ucb->io_out |= set; ucb->io_out &= ~clear; + spin_unlock_irqrestore(&ucb->io_lock, flags); ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out); - spin_unlock_irqrestore(&ucb->io_lock, flags); } /** @@ -177,7 +186,7 @@ unsigned int ucb1x00_adc_read(struct ucb schedule_timeout(1); } - return UCB_ADC_DAT(val); + return UCB_IS_1400(ucb->id) ? (val & 0x3ff) : ((val & 0x7fe0) >> 5); } /** @@ -222,6 +231,47 @@ static irqreturn_t ucb1x00_irq(int irqnr return IRQ_HANDLED; } +/* + * A restriction with interrupts exists when using the ucb1400, as + * the codec read/write routines may sleep while waiting for codec + * access completion and uses semaphores for access control to the + * AC97 bus. A complete codec read cycle could take anywhere from + * 60 to 100uSec so we *definitely* don't want to spin inside the + * interrupt handler waiting for codec access. So, we handle the + * interrupt by scheduling a RT kernel thread to run in process + * context instead of interrupt context. + */ +static int ucb1x00_thread(void *_ucb) +{ + struct task_struct *tsk = current; + struct ucb1x00 *ucb = _ucb; + + tsk->policy = SCHED_FIFO; + tsk->rt_priority = 1; + + while (!kthread_should_stop()) { + wait_for_completion_interruptible(&ucb->irq_wait); + if (try_to_freeze()) + continue; + ucb1x00_irq(ucb->irq, ucb, NULL); + enable_irq(ucb->irq); + } + + ucb->irq_task = NULL; + return 0; +} + +static irqreturn_t ucb1x00_threaded_irq(int irqnr, void *devid, struct pt_regs *regs) +{ + struct ucb1x00 *ucb = devid; + if (irqnr == ucb->irq) { + disable_irq(ucb->irq); + complete(&ucb->irq_wait); + return IRQ_HANDLED; + } + return IRQ_NONE; +} + /** * ucb1x00_hook_irq - hook a UCB1x00 interrupt * @ucb: UCB1x00 structure describing chip @@ -275,18 +325,22 @@ void ucb1x00_enable_irq(struct ucb1x00 * if (idx < 16) { spin_lock_irqsave(&ucb->lock, flags); - - ucb1x00_enable(ucb); - if (edges & UCB_RISING) { + if (edges & UCB_RISING) ucb->irq_ris_enbl |= 1 << idx; - ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); - } - if (edges & UCB_FALLING) { + if (edges & UCB_FALLING) ucb->irq_fal_enbl |= 1 << idx; - ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); - } - ucb1x00_disable(ucb); spin_unlock_irqrestore(&ucb->lock, flags); + + ucb1x00_enable(ucb); + + /* This prevents spurious interrupts on the UCB1400 */ + ucb1x00_reg_write(ucb, UCB_IE_CLEAR, 1 << idx); + ucb1x00_reg_write(ucb, UCB_IE_CLEAR, 0); + + ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); + ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); + + ucb1x00_disable(ucb); } } @@ -304,18 +358,16 @@ void ucb1x00_disable_irq(struct ucb1x00 if (idx < 16) { spin_lock_irqsave(&ucb->lock, flags); - - ucb1x00_enable(ucb); - if (edges & UCB_RISING) { + if (edges & UCB_RISING) ucb->irq_ris_enbl &= ~(1 << idx); - ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); - } - if (edges & UCB_FALLING) { + if (edges & UCB_FALLING) ucb->irq_fal_enbl &= ~(1 << idx); - ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); - } - ucb1x00_disable(ucb); spin_unlock_irqrestore(&ucb->lock, flags); + + ucb1x00_enable(ucb); + ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); + ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); + ucb1x00_disable(ucb); } } @@ -348,16 +400,17 @@ int ucb1x00_free_irq(struct ucb1x00 *ucb ucb->irq_ris_enbl &= ~(1 << idx); ucb->irq_fal_enbl &= ~(1 << idx); - ucb1x00_enable(ucb); - ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); - ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); - ucb1x00_disable(ucb); - irq->fn = NULL; irq->devid = NULL; ret = 0; } spin_unlock_irq(&ucb->lock); + + ucb1x00_enable(ucb); + ucb1x00_reg_write(ucb, UCB_IE_RIS, ucb->irq_ris_enbl); + ucb1x00_reg_write(ucb, UCB_IE_FAL, ucb->irq_fal_enbl); + ucb1x00_disable(ucb); + return ret; bad: @@ -492,12 +545,13 @@ static int ucb1x00_probe(struct mcp *mcp memset(ucb, 0, sizeof(struct ucb1x00)); ucb->cdev.class = &ucb1x00_class; - ucb->cdev.dev = &mcp->attached_device; + ucb->cdev.dev = mcp->dev; strlcpy(ucb->cdev.class_id, "ucb1x00", sizeof(ucb->cdev.class_id)); spin_lock_init(&ucb->lock); spin_lock_init(&ucb->io_lock); sema_init(&ucb->adc_sem, 1); + init_completion(&ucb->irq_wait); ucb->id = id; ucb->mcp = mcp; @@ -532,6 +586,8 @@ static int ucb1x00_probe(struct mcp *mcp goto out; err_irq: + if (UCB_IS_1400(id) && ucb->irq_task) + kthread_stop(ucb->irq_task); free_irq(ucb->irq, ucb); err_free: kfree(ucb); @@ -554,6 +610,8 @@ static void ucb1x00_remove(struct mcp *m } mutex_unlock(&ucb1x00_mutex); + if (UCB_IS_1400(ucb->id) && ucb->irq_task) + kthread_stop(ucb->irq_task); free_irq(ucb->irq, ucb); class_device_unregister(&ucb->cdev); } diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 0277681..b8553ab 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c @@ -34,7 +34,6 @@ #include #include -#include #include #include "ucb1x00.h" @@ -44,7 +43,7 @@ struct ucb1x00_ts { struct input_dev *idev; struct ucb1x00 *ucb; - wait_queue_head_t irq_wait; + struct completion irq_wait; struct task_struct *rtask; u16 x_res; u16 y_res; @@ -89,7 +88,7 @@ static inline void ucb1x00_ts_mode_int(s static inline unsigned int ucb1x00_ts_read_pressure(struct ucb1x00_ts *ts) { if (machine_is_collie()) { - ucb1x00_io_write(ts->ucb, COLLIE_TC35143_GPIO_TBL_CHK, 0); + ucb1x00_io_write(ts->ucb, UCB_IO_1, 0); ucb1x00_reg_write(ts->ucb, UCB_TS_CR, UCB_TS_CR_TSPX_POW | UCB_TS_CR_TSMX_POW | UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA); @@ -116,7 +115,7 @@ static inline unsigned int ucb1x00_ts_re static inline unsigned int ucb1x00_ts_read_xpos(struct ucb1x00_ts *ts) { if (machine_is_collie()) - ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK); + ucb1x00_io_write(ts->ucb, 0, UCB_IO_1); else { ucb1x00_reg_write(ts->ucb, UCB_TS_CR, UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW | @@ -143,7 +142,7 @@ static inline unsigned int ucb1x00_ts_re static inline unsigned int ucb1x00_ts_read_ypos(struct ucb1x00_ts *ts) { if (machine_is_collie()) - ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK); + ucb1x00_io_write(ts->ucb, 0, UCB_IO_1); else { ucb1x00_reg_write(ts->ucb, UCB_TS_CR, UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW | @@ -204,7 +203,6 @@ static int ucb1x00_thread(void *_ts) { struct ucb1x00_ts *ts = _ts; struct task_struct *tsk = current; - DECLARE_WAITQUEUE(wait, tsk); int valid; /* @@ -216,10 +214,8 @@ static int ucb1x00_thread(void *_ts) valid = 0; - add_wait_queue(&ts->irq_wait, &wait); while (!kthread_should_stop()) { unsigned int x, y, p; - signed long timeout; ts->restart = 0; @@ -241,8 +237,6 @@ static int ucb1x00_thread(void *_ts) if (ucb1x00_ts_pen_down(ts)) { - set_task_state(tsk, TASK_INTERRUPTIBLE); - ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING); ucb1x00_disable(ts->ucb); @@ -255,7 +249,15 @@ static int ucb1x00_thread(void *_ts) valid = 0; } - timeout = MAX_SCHEDULE_TIMEOUT; + /* + * Since ucb1x00_enable_irq() might sleep due + * to the way the UCB1400 regs are accessed, we + * can't use set_task_state() before that call, + * and not changing state before enabling the + * interrupt is racy. A completion handler avoids + * the issue. + */ + wait_for_completion_interruptible(&ts->irq_wait); } else { ucb1x00_disable(ts->ucb); @@ -270,16 +272,12 @@ static int ucb1x00_thread(void *_ts) } set_task_state(tsk, TASK_INTERRUPTIBLE); - timeout = HZ / 100; + schedule_timeout(HZ/100); } try_to_freeze(); - - schedule_timeout(timeout); } - remove_wait_queue(&ts->irq_wait, &wait); - ts->rtask = NULL; return 0; } @@ -292,7 +290,7 @@ static void ucb1x00_ts_irq(int idx, void { struct ucb1x00_ts *ts = id; ucb1x00_disable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_FALLING); - wake_up(&ts->irq_wait); + complete(&ts->irq_wait); } static int ucb1x00_ts_open(struct input_dev *idev) @@ -302,7 +300,7 @@ static int ucb1x00_ts_open(struct input_ BUG_ON(ts->rtask); - init_waitqueue_head(&ts->irq_wait); + init_completion(&ts->irq_wait); ret = ucb1x00_hook_irq(ts->ucb, UCB_IRQ_TSPX, ucb1x00_ts_irq, ts); if (ret < 0) goto out; @@ -357,7 +355,7 @@ static int ucb1x00_ts_resume(struct ucb1 * after sleep. */ ts->restart = 1; - wake_up(&ts->irq_wait); + complete(&ts->irq_wait); } return 0; } diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h index ca8df80..f31fa82 100644 --- a/drivers/mfd/ucb1x00.h +++ b/drivers/mfd/ucb1x00.h @@ -94,6 +94,7 @@ #define UCB_ID 0x0c #define UCB_ID_1200 0x1004 #define UCB_ID_1300 0x1005 +#define UCB_ID_1400 0x4304 #define UCB_ID_TC35143 0x9712 #define UCB_MODE 0x0d @@ -111,6 +112,8 @@ struct ucb1x00 { spinlock_t lock; struct mcp *mcp; unsigned int irq; + struct task_struct *irq_task; + struct completion irq_wait; struct semaphore adc_sem; spinlock_t io_lock; u16 id; @@ -123,6 +126,7 @@ struct ucb1x00 { struct class_device cdev; struct list_head node; struct list_head devs; + }; struct ucb1x00_driver; diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index ef35090..4c070b9 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -239,8 +239,10 @@ static int pxamci_cmd_done(struct pxamci cmd->opcode == MMC_SEND_CID) { /* a bogus CRC error can appear if the msb of the 15 byte response is a one */ +#ifndef MACH_TRIZEPS4 if ((cmd->resp[0] & 0x80000000) == 0) cmd->error = MMC_ERR_BADCRC; +#endif } else { pr_debug("ignoring CRC from command %d - *risky*\n",cmd->opcode); } diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 64d1b6a..3523929 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -137,6 +137,14 @@ config MTD_MAINSTONE This provides a driver for the on-board flash of the Intel 'Mainstone PXA27x evaluation board. +config MTD_TRIZEPS4 + tristate "CFI Flash device mapped on Keith und Koep Trizeps4 DIMM module" + depends on MACH_TRIZEPS4 && MTD_CFI_INTELEXT + select MTD_PARTITIONS + help + This provides a driver for the on-board flash of the + Keith und Koep DIMM module. + config MTD_OCTAGON tristate "JEDEC Flash device mapped on Octagon 5066 SBC" depends on X86 && MTD_JEDEC && MTD_COMPLEX_MAPPINGS diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index a860ebb..0ca6e51 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -431,6 +431,8 @@ dm9000_probe(struct platform_device *pde ndev->base_addr = base; ndev->irq = pdev->resource[1].start; + + db->irq_res = &pdev->resource[1]; db->io_addr = (void __iomem *)base; db->io_data = (void __iomem *)(base + 4); @@ -614,10 +616,11 @@ static int dm9000_open(struct net_device *dev) { board_info_t *db = (board_info_t *) dev->priv; + unsigned long flags = db->irq_res->flags & IRQF_TRIGGER_MASK; PRINTK2("entering dm9000_open\n"); - if (request_irq(dev->irq, &dm9000_interrupt, IRQF_SHARED, dev->name, dev)) + if (request_irq(dev->irq, &dm9000_interrupt, IRQF_SHARED | flags, dev->name, dev)) return -EAGAIN; /* Initialize DM9000 board */ diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 4276965..143f193 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -69,4 +69,5 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa 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_TRIZEPS4) += pxa2xx_trizeps4.o diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c new file mode 100644 index 0000000..dd219a7 --- /dev/null +++ b/drivers/pcmcia/pxa2xx_trizeps4.c @@ -0,0 +1,234 @@ +/* + * linux/drivers/pcmcia/pxa2xx_trizeps4.c + * + * TRIZEPS4 PCMCIA specific routines. + * + * Author: Jürgen Schindele + * Created: 20 02, 2006 + * Copyright: Jürgen Schindele + * + * 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 +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +#include "soc_common.h" + +extern void board_pcmcia_power(int power); + +static struct pcmcia_irqs irqs[] = { + { 0, TRIZEPS4_CD_IRQ, "PCMCIA0 CD" } +}; + +static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) +{ + /* we dont have voltage/card/ready detection + * so we dont need interrupts for it + * TODO set default state on power + */ + /* + * Setup default state of GPIO outputs + * before we enable them as outputs. + */ + GPSR(GPIO48_nPOE) = + GPIO_bit(GPIO48_nPOE) | + GPIO_bit(GPIO49_nPWE) | + GPIO_bit(GPIO50_nPIOR) | + GPIO_bit(GPIO51_nPIOW) | + GPIO_bit(GPIO54_nPCE_2); + + GPSR(GPIO102_nPCE_1) = GPIO102_nPCE_1; + + pxa_gpio_mode(GPIO48_nPOE_MD); + pxa_gpio_mode(GPIO49_nPWE_MD); + pxa_gpio_mode(GPIO50_nPIOR_MD); + pxa_gpio_mode(GPIO51_nPIOW_MD); + pxa_gpio_mode(GPIO102_nPCE_1_MD); + pxa_gpio_mode(GPIO54_nPCE_2_MD); + pxa_gpio_mode(GPIO104_pSKTSEL_MD); + pxa_gpio_mode(GPIO55_nPREG_MD); + pxa_gpio_mode(GPIO56_nPWAIT_MD); + pxa_gpio_mode(GPIO57_nIOIS16_MD); + /* card detect */ + pxa_gpio_mode(GPIO_PCD | GPIO_IN); + /* card interrupt */ + pxa_gpio_mode(GPIO_PRDY | GPIO_IN); + + switch (skt->nr) { + case 0: + skt->irq = TRIZEPS4_READY_NINT; + break; + + case 1: + default: + break; + } + /* release the reset of this card */ + /* FIXME Remove Card Reset ?? */ + printk(KERN_DEBUG "%s: sock %d irq %d\n", __FUNCTION__, skt->nr, skt->irq); + + /* supplementory irqs for the socket */ + /* FIXME are interrupts delivered by ConXS Board ?? */ + return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); +} + +static void trizeps_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) +{ + /* nothing to do */ +} + +static unsigned long trizeps_pcmcia_status[2]; + +static void trizeps_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state) +{ + unsigned short status=0, change; +#ifdef CONFIG_MACH_TRIZEPS4_CONXS + status = ConXS_CFSR; + change = (status ^ trizeps_pcmcia_status[skt->nr]) & ConXS_CFSR_BVD_MASK; + + if (change) { + trizeps_pcmcia_status[skt->nr] = status; + if (status & ConXS_CFSR_BVD1) { + /* enable_irq empty */ + } + else { + /* disable_irq empty */ + } + } + + switch (skt->nr) { + case 0: + /* just fill in fix states */ + state->detect = (GPLR(GPIO_PCD) & GPIO_bit(GPIO_PCD)) ? 0 : 1; + state->ready = (GPLR(GPIO_PRDY) & GPIO_bit(GPIO_PRDY)) ? 1 : 0; + state->bvd1 = (status & ConXS_CFSR_BVD1) ? 1 : 0; + state->bvd2 = (status & ConXS_CFSR_BVD2) ? 1 : 0; + state->vs_3v = (status & ConXS_CFSR_VS1) ? 0 : 1; + state->vs_Xv = (status & ConXS_CFSR_VS2) ? 0 : 1; + state->wrprot = 0; /* not available */ + break; + + case 1: + /* on ConXS we only have one slot second is inactive */ + state->detect = 0; + state->ready = 0; + state->bvd1 = 0; + state->bvd2 = 0; + state->vs_3v = 0; + state->vs_Xv = 0; + state->wrprot = 0; + break; + + } +#endif +} + +static int trizeps_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) +{ + int ret = 0; + unsigned short power = 0; + + /* we do nothing here just check a bit */ + switch (state->Vcc) { + case 0: power &= 0xfc; break; + case 33: power |= ConXS_BCR_S0_VCC_3V3; break; + case 50: + printk(KERN_ERR "%s(): Vcc 5V not supported in socket\n", __FUNCTION__); + break; + default: + printk(KERN_ERR "%s(): bad Vcc %u\n", __FUNCTION__, state->Vcc); + ret = -1; + } + + switch (state->Vpp) { + case 0: power &= 0xf3; break; + case 33: power |= ConXS_BCR_S0_VPP_3V3; break; + case 120: + printk(KERN_ERR "%s(): Vpp 12V not supported in socket\n", __FUNCTION__); + break; + default: + if(state->Vpp != state->Vcc) { + printk(KERN_ERR "%s(): bad Vpp %u\n", __FUNCTION__, state->Vpp); + ret = -1; + } + } + + switch (skt->nr) { + case 0: /* ony have one socket */ + board_pcmcia_power(power); + break; + + case 1: /* do nothing */ + default: + break; + } + + return ret; +} + +static void trizeps_pcmcia_socket_init(struct soc_pcmcia_socket *skt) +{ + /* default is on */ + board_pcmcia_power(0x9); +} + +static void trizeps_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) +{ +} + +static struct pcmcia_low_level trizeps_pcmcia_ops = { + .owner = THIS_MODULE, + .hw_init = trizeps_pcmcia_hw_init, + .hw_shutdown = trizeps_pcmcia_hw_shutdown, + .socket_state = trizeps_pcmcia_socket_state, + .configure_socket = trizeps_pcmcia_configure_socket, + .socket_init = trizeps_pcmcia_socket_init, + .socket_suspend = trizeps_pcmcia_socket_suspend, + .nr = 2, + .first = 0, +}; + +static struct platform_device *trizeps_pcmcia_device; + +static int __init trizeps_pcmcia_init(void) +{ + int ret; + + trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); + if (!trizeps_pcmcia_device) + return -ENOMEM; + + trizeps_pcmcia_device->dev.platform_data = &trizeps_pcmcia_ops; + + ret = platform_device_add(trizeps_pcmcia_device); + + if (ret) + platform_device_put(trizeps_pcmcia_device); + + return ret; +} + +static void __exit trizeps_pcmcia_exit(void) +{ + platform_device_unregister(trizeps_pcmcia_device); +} + +fs_initcall(trizeps_pcmcia_init); +module_exit(trizeps_pcmcia_exit); + +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index ce3de10..152491d 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c @@ -15,8 +15,6 @@ #include #include -#include -#include #include #ifndef CONFIG_SA1111 @@ -41,7 +39,6 @@ static void sa1111_start_hc(struct sa111 #endif if (machine_is_xp860() || - machine_has_neponset() || machine_is_pfs168() || machine_is_badge4()) usb_rst = USB_RESET_PWRSENSELOW | USB_RESET_PWRCTRLLOW; diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index bbb0710..d0081c1 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -21,6 +21,7 @@ * linux-arm-kernel@lists.arm.linux.org.uk * */ +#define DEBUG 1 #include #include diff --git a/include/asm-arm/arch-pxa/dma.h b/include/asm-arm/arch-pxa/dma.h index a008150..18d38ae 100644 --- a/include/asm-arm/arch-pxa/dma.h +++ b/include/asm-arm/arch-pxa/dma.h @@ -12,6 +12,9 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H +/* note, we don't really use dma_device_t at the moment */ +typedef unsigned long dma_device_t; + /* * Descriptor structure for PXA's DMA engine * Note: this structure must always be aligned to a 16-byte boundary. diff --git a/include/linux/ioport.h b/include/linux/ioport.h index d42c833..2c0e4e4 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -57,6 +57,12 @@ struct resource_list { #define IORESOURCE_IRQ_LOWLEVEL (1<<3) #define IORESOURCE_IRQ_SHAREABLE (1<<4) +/* this macro gets back SA_TRIGGER_* bits + * defined in include/linux/signal.h from + * resource->flags which are the same as + * IORESOURCE_IRQ_* bits */ +#define resource_sa_flags(res) ((res)->flags & 0xf) + /* ISA PnP DMA specific bits (IORESOURCE_BITS) */ #define IORESOURCE_DMA_TYPE_MASK (3<<0) #define IORESOURCE_DMA_8BIT (0<<0) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 851aa1b..dd6fe9a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -212,7 +212,7 @@ extern void dump_stack(void); #ifdef DEBUG /* If you are writing a driver, please use dev_dbg instead */ #define pr_debug(fmt,arg...) \ - printk(KERN_DEBUG fmt,##arg) + printk(KERN_ERR fmt,##arg) #else #define pr_debug(fmt,arg...) \ do { } while (0) diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 51e83d7..3dc778c 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -151,7 +151,7 @@ static const struct ac97_codec_id snd_ac { 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, // only guess --jk { 0x4e534331, 0xffffffff, "LM4549", NULL, NULL }, { 0x4e534350, 0xffffffff, "LM4550", patch_lm4550, NULL }, // volume wrap fix -{ 0x50534304, 0xffffffff, "UCB1400", NULL, NULL }, +{ 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, { 0x54524106, 0xffffffff, "TR28026", NULL, NULL }, diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 094cfc1..ffa5dee 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -2872,3 +2872,33 @@ int patch_lm4550(struct snd_ac97 *ac97) ac97->res_table = lm4550_restbl; return 0; } + +/* + * UCB1400 codec + */ +static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = { +AC97_SINGLE("Headphone driver", 0x6a, 6, 1, 0), +AC97_SINGLE("DC filter", 0x6a, 4, 1, 0), +AC97_SINGLE("Smart power mode", 0x6c, 4, 3, 0), +}; + +static int patch_ucb1400_specific(struct snd_ac97 * ac97) +{ + int idx, err; + for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++) + if ((err = snd_ctl_add(ac97->bus->card, snd_ctl_new1(&snd_ac97_controls_ucb1400[idx], ac97))) < 0) + return err; + return 0; +} + +static struct snd_ac97_build_ops patch_ucb1400_ops = { + .build_specific = patch_ucb1400_specific, +}; + +int patch_ucb1400(struct snd_ac97 * ac97) +{ + ac97->build_ops = &patch_ucb1400_ops; + snd_ac97_write(ac97, 0x6a, 0x0050); + snd_ac97_write(ac97, 0x6c, 0x0030); + return 0; +} diff --git a/sound/pci/ac97/ac97_patch.h b/sound/pci/ac97/ac97_patch.h index adcaa04..7419792 100644 --- a/sound/pci/ac97/ac97_patch.h +++ b/sound/pci/ac97/ac97_patch.h @@ -58,5 +58,6 @@ int patch_cm9780(struct snd_ac97 * ac97) int patch_vt1616(struct snd_ac97 * ac97); int patch_vt1617a(struct snd_ac97 * ac97); int patch_it2646(struct snd_ac97 * ac97); +int patch_ucb1400(struct snd_ac97 * ac97); int mpatch_si3036(struct snd_ac97 * ac97); int patch_lm4550(struct snd_ac97 * ac97);