1 files changed, 40 insertions, 21 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 4e0dcaef6eb2..181ef1ead5b8 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -121,6 +121,13 @@ static struct locomo_dev_info locomo_devices[] = {
                 .offset         = 0,
                 .length         = 0,
         },
+        {
+                .devid          = LOCOMO_DEVID_SPI,
+                .irq            = {},
+                .name           = "locomo-spi",
+                .offset         = LOCOMO_SPI,
+                .length         = 0x30,
+        },
 };
 
 
@@ -374,7 +381,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
         struct irqdesc *d;
         void __iomem *mapbase = get_irq_chipdata(irq);
 
-        req = locomo_readl(mapbase + LOCOMO_SPIIR) & 0x000F;
+        req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;
         if (req) {
                 irq = LOCOMO_IRQ_SPI_START;
                 d = irq_desc + irq;
@@ -391,35 +398,35 @@ static void locomo_spi_ack_irq(unsigned int irq)
 {
         void __iomem *mapbase = get_irq_chipdata(irq);
         unsigned int r;
-        r = locomo_readl(mapbase + LOCOMO_SPIWE);
+        r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-        locomo_writel(r, mapbase + LOCOMO_SPIWE);
+        locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
 
-        r = locomo_readl(mapbase + LOCOMO_SPIIS);
+        r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIS);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-        locomo_writel(r, mapbase + LOCOMO_SPIIS);
+        locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIIS);
 
-        r = locomo_readl(mapbase + LOCOMO_SPIWE);
+        r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-        locomo_writel(r, mapbase + LOCOMO_SPIWE);
+        locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
 }
 
 static void locomo_spi_mask_irq(unsigned int irq)
 {
         void __iomem *mapbase = get_irq_chipdata(irq);
         unsigned int r;
-        r = locomo_readl(mapbase + LOCOMO_SPIIE);
+        r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-        locomo_writel(r, mapbase + LOCOMO_SPIIE);
+        locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
 }
 
 static void locomo_spi_unmask_irq(unsigned int irq)
 {
         void __iomem *mapbase = get_irq_chipdata(irq);
         unsigned int r;
-        r = locomo_readl(mapbase + LOCOMO_SPIIE);
+        r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-        locomo_writel(r, mapbase + LOCOMO_SPIIE);
+        locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
 }
 
 static struct irq_chip locomo_spi_chip = {
@@ -814,12 +821,15 @@ static inline struct locomo *locomo_chip_driver(struct locomo_dev *ldev)
         return (struct locomo *)dev_get_drvdata(ldev->dev.parent);
 }
 
-void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned int dir)
+void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int r;
 
+        if (!lchip)
+                return;
+
         spin_lock_irqsave(&lchip->lock, flags);
 
         r = locomo_readl(lchip->base + LOCOMO_GPD);
@@ -836,12 +846,15 @@ void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned in
         spin_unlock_irqrestore(&lchip->lock, flags);
 }
 
-unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits)
+int locomo_gpio_read_level(struct device *dev, unsigned int bits)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int ret;
 
+        if (!lchip)
+                return -ENODEV;
+
         spin_lock_irqsave(&lchip->lock, flags);
         ret = locomo_readl(lchip->base + LOCOMO_GPL);
         spin_unlock_irqrestore(&lchip->lock, flags);
@@ -850,12 +863,15 @@ unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits)
         return ret;
 }
 
-unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits)
+int locomo_gpio_read_output(struct device *dev, unsigned int bits)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int ret;
 
+        if (!lchip)
+                return -ENODEV;
+
         spin_lock_irqsave(&lchip->lock, flags);
         ret = locomo_readl(lchip->base + LOCOMO_GPO);
         spin_unlock_irqrestore(&lchip->lock, flags);
@@ -864,12 +880,15 @@ unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits)
         return ret;
 }
 
-void locomo_gpio_write(struct locomo_dev *ldev, unsigned int bits, unsigned int set)
+void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int r;
 
+        if (!lchip)
+                return;
+
         spin_lock_irqsave(&lchip->lock, flags);
 
         r = locomo_readl(lchip->base + LOCOMO_GPO);
@@ -1058,9 +1077,9 @@ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)
         struct locomo *lchip = locomo_chip_driver(dev);
 
         if (vr)
-                locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 1);
+                locomo_gpio_write(dev->dev.parent, LOCOMO_GPIO_FL_VR, 1);
         else
-                locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 0);
+                locomo_gpio_write(dev->dev.parent, LOCOMO_GPIO_FL_VR, 0);
 
         spin_lock_irqsave(&lchip->lock, flags);
         locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);