* [PATCH 02/15] GPIO: port LoCoMo gpio support from old driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:01 ` Dmitry Eremin-Solenikov
2014-10-31 7:48 ` Linus Walleij
2014-10-28 0:01 ` [PATCH 03/15] leds: port locomo leds driver to new locomo core Dmitry Eremin-Solenikov
` (9 subsequent siblings)
10 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:01 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Add gpiolib driver for gpio pins placed on the LoCoMo GA.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/gpio/Kconfig | 7 ++
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-locomo.c | 228 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 236 insertions(+)
create mode 100644 drivers/gpio/gpio-locomo.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 0959ca9..11c03d4 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -457,6 +457,13 @@ config GPIO_TB10X
select GENERIC_IRQ_CHIP
select OF_GPIO
+config GPIO_LOCOMO
+ bool "Sharp LoCoMo GPIO support"
+ depends on MFD_LOCOMO
+ help
+ Select this to support GPIO pins on Sharp LoCoMo Grid Array found
+ in Sharp Zaurus collie and poodle models.
+
comment "I2C GPIO expanders:"
config GPIO_ARIZONA
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index e5d346c..ed73f63 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o
+obj-$(CONFIG_GPIO_LOCOMO) += gpio-locomo.o
obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
diff --git a/drivers/gpio/gpio-locomo.c b/drivers/gpio/gpio-locomo.c
new file mode 100644
index 0000000..3b54b07
--- /dev/null
+++ b/drivers/gpio/gpio-locomo.c
@@ -0,0 +1,228 @@
+/*
+ * Sharp LoCoMo support for GPIO
+ *
+ * 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 file contains all generic LoCoMo support.
+ *
+ * All initialization functions provided here are intended to be called
+ * from machine specific code with proper arguments when required.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
+#include <linux/spinlock.h>
+#include <linux/mfd/locomo.h>
+
+struct locomo_gpio {
+ void __iomem *regs;
+
+ spinlock_t lock;
+ struct gpio_chip gpio;
+
+ u16 rising_edge;
+ u16 falling_edge;
+
+ u16 save_gpo;
+ u16 save_gpe;
+};
+
+static int locomo_gpio_get(struct gpio_chip *chip,
+ unsigned offset)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+
+ return readw(lg->regs + LOCOMO_GPL) & (1 << offset);
+}
+
+static void __locomo_gpio_set(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+ u16 r;
+
+ r = readw(lg->regs + LOCOMO_GPO);
+ if (value)
+ r |= 1 << offset;
+ else
+ r &= ~(1 << offset);
+ writew(r, lg->regs + LOCOMO_GPO);
+}
+
+static void locomo_gpio_set(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+ unsigned long flags;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ __locomo_gpio_set(chip, offset, value);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+}
+
+static int locomo_gpio_direction_input(struct gpio_chip *chip,
+ unsigned offset)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ r = readw(lg->regs + LOCOMO_GPD);
+ r |= (1 << offset);
+ writew(r, lg->regs + LOCOMO_GPD);
+
+ r = readw(lg->regs + LOCOMO_GPE);
+ r |= (1 << offset);
+ writew(r, lg->regs + LOCOMO_GPE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+
+ return 0;
+}
+
+static int locomo_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ __locomo_gpio_set(chip, offset, value);
+
+ r = readw(lg->regs + LOCOMO_GPD);
+ r &= ~(1 << offset);
+ writew(r, lg->regs + LOCOMO_GPD);
+
+ r = readw(lg->regs + LOCOMO_GPE);
+ r &= ~(1 << offset);
+ writew(r, lg->regs + LOCOMO_GPE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int locomo_gpio_suspend(struct device *dev)
+{
+ struct locomo_gpio *lg = dev_get_drvdata(dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ lg->save_gpo = readw(lg->regs + LOCOMO_GPO);
+ writew(0x00, lg->regs + LOCOMO_GPO);
+
+ lg->save_gpo = readw(lg->regs + LOCOMO_GPE);
+ writew(0x00, lg->regs + LOCOMO_GPE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+ return 0;
+}
+
+static int locomo_gpio_resume(struct device *dev)
+{
+ struct locomo_gpio *lg = dev_get_drvdata(dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ writew(lg->save_gpo, lg->regs + LOCOMO_GPO);
+
+ writew(lg->save_gpe, lg->regs + LOCOMO_GPE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+ return 0;
+}
+static SIMPLE_DEV_PM_OPS(locomo_gpio_pm,
+ locomo_gpio_suspend, locomo_gpio_resume);
+#define LOCOMO_GPIO_PM (&locomo_gpio_pm)
+#else
+#define LOCOMO_GPIO_PM NULL
+#endif
+
+static int locomo_gpio_probe(struct platform_device *pdev)
+{
+ struct resource *res;
+ struct locomo_gpio *lg;
+ int ret;
+ struct locomo_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ lg = devm_kzalloc(&pdev->dev, sizeof(struct locomo_gpio),
+ GFP_KERNEL);
+ if (!lg)
+ return -ENOMEM;
+
+ lg->regs = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(lg->regs))
+ return PTR_ERR(lg->regs);
+
+ spin_lock_init(&lg->lock);
+
+ platform_set_drvdata(pdev, lg);
+
+ writew(0, lg->regs + LOCOMO_GPO);
+ writew(0, lg->regs + LOCOMO_GPE);
+ writew(0, lg->regs + LOCOMO_GPD);
+ writew(0, lg->regs + LOCOMO_GIE);
+
+ lg->gpio.base = pdata ? pdata->gpio_base : -1;
+ lg->gpio.label = "locomo-gpio";
+ lg->gpio.ngpio = 16;
+ lg->gpio.set = locomo_gpio_set;
+ lg->gpio.get = locomo_gpio_get;
+ lg->gpio.direction_input = locomo_gpio_direction_input;
+ lg->gpio.direction_output = locomo_gpio_direction_output;
+
+ ret = gpiochip_add(&lg->gpio);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int locomo_gpio_remove(struct platform_device *pdev)
+{
+ struct locomo_gpio *lg = platform_get_drvdata(pdev);
+ int ret;
+
+ ret = gpiochip_remove(&lg->gpio);
+ if (ret) {
+ dev_err(&pdev->dev, "Can't remove gpio chip: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static struct platform_driver locomo_gpio_driver = {
+ .probe = locomo_gpio_probe,
+ .remove = locomo_gpio_remove,
+ .driver = {
+ .name = "locomo-gpio",
+ .owner = THIS_MODULE,
+ .pm = LOCOMO_GPIO_PM,
+ },
+};
+module_platform_driver(locomo_gpio_driver);
+
+MODULE_DESCRIPTION("Sharp LoCoMo GPIO driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
+MODULE_ALIAS("platform:locomo-gpio");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 02/15] GPIO: port LoCoMo gpio support from old driver
2014-10-28 0:01 ` [PATCH 02/15] GPIO: port LoCoMo gpio support from old driver Dmitry Eremin-Solenikov
@ 2014-10-31 7:48 ` Linus Walleij
[not found] ` <CACRpkdY7tRadod2vQfEytmw-ubaMAvr_=XTczD5bUMkqie0xkg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 52+ messages in thread
From: Linus Walleij @ 2014-10-31 7:48 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
Linux Input, linux-leds@vger.kernel.org,
linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org, Andrea Adami, Russell King,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo
On Tue, Oct 28, 2014 at 1:01 AM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> Add gpiolib driver for gpio pins placed on the LoCoMo GA.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
(...)
> +static int locomo_gpio_get(struct gpio_chip *chip,
> + unsigned offset)
> +{
> + struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
> +
> + return readw(lg->regs + LOCOMO_GPL) & (1 << offset);
Do this:
#include <linux/bitops.h>
return !!(readw(lg->regs + LOCOMO_GPL) & BIT(offset));
So you clamp the returned value to a bool.
> +static void __locomo_gpio_set(struct gpio_chip *chip,
> + unsigned offset, int value)
> +{
> + struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
> + u16 r;
> +
> + r = readw(lg->regs + LOCOMO_GPO);
> + if (value)
> + r |= 1 << offset;
r |= BIT(offset);
> + else
> + r &= ~(1 << offset);
r &= BIT(offset);
(etc, everywhere this pattern occurs).
> +static void locomo_gpio_set(struct gpio_chip *chip,
> + unsigned offset, int value)
> +{
> + struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&lg->lock, flags);
> +
> + __locomo_gpio_set(chip, offset, value);
> +
> + spin_unlock_irqrestore(&lg->lock, flags);
If you actually always have to be getting and releasing a spin lock around
the register writes, contemplate using regmap-mmio because that
is part of what it does.
But is this locking really necessary?
> +static int locomo_gpio_remove(struct platform_device *pdev)
> +{
> + struct locomo_gpio *lg = platform_get_drvdata(pdev);
> + int ret;
> +
> + ret = gpiochip_remove(&lg->gpio);
> + if (ret) {
> + dev_err(&pdev->dev, "Can't remove gpio chip: %d\n", ret);
> + return ret;
> + }
The return value from gpiochip_remove() has been removed in v3.18-rc1
so this will not compile.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 03/15] leds: port locomo leds driver to new locomo core
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
2014-10-28 0:01 ` [PATCH 02/15] GPIO: port LoCoMo gpio support from old driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:01 ` Dmitry Eremin-Solenikov
2014-10-28 0:01 ` [PATCH 05/15] video: backlight: add new locomo backlight driver Dmitry Eremin-Solenikov
` (8 subsequent siblings)
10 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:01 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Adapt locomo leds driver to new locomo core setup.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/leds/Kconfig | 1 -
drivers/leds/leds-locomo.c | 104 +++++++++++++++++++++++++++------------------
2 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index a210338..22ebf1c 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -69,7 +69,6 @@ config LEDS_LM3642
config LEDS_LOCOMO
tristate "LED Support for Locomo device"
depends on LEDS_CLASS
- depends on SHARP_LOCOMO
help
This option enables support for the LEDs on Sharp Locomo.
Zaurus models SL-5500 and SL-5600.
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 80ba048..acb288f 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -11,87 +11,107 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/leds.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/mfd/locomo.h>
-#include <mach/hardware.h>
-#include <asm/hardware/locomo.h>
+struct locomo_led {
+ struct led_classdev led;
+ void __iomem *reg;
+};
static void locomoled_brightness_set(struct led_classdev *led_cdev,
- enum led_brightness value, int offset)
+ enum led_brightness value)
{
- struct locomo_dev *locomo_dev = LOCOMO_DEV(led_cdev->dev->parent);
+ struct locomo_led *led = container_of(led_cdev, struct locomo_led, led);
unsigned long flags;
local_irq_save(flags);
if (value)
- locomo_writel(LOCOMO_LPT_TOFH, locomo_dev->mapbase + offset);
+ writew(LOCOMO_LPT_TOFH, led->reg);
else
- locomo_writel(LOCOMO_LPT_TOFL, locomo_dev->mapbase + offset);
+ writew(LOCOMO_LPT_TOFL, led->reg);
local_irq_restore(flags);
}
-static void locomoled_brightness_set0(struct led_classdev *led_cdev,
- enum led_brightness value)
+static int locomo_led_register(
+ struct locomo_led *led,
+ struct device *dev,
+ const char *name,
+ const char *trigger,
+ void __iomem *reg)
{
- locomoled_brightness_set(led_cdev, value, LOCOMO_LPT0);
+ led->led.name = name;
+ led->led.default_trigger = trigger;
+ led->led.brightness_set = locomoled_brightness_set;
+ led->reg = reg;
+
+ return led_classdev_register(dev, &led->led);
}
-static void locomoled_brightness_set1(struct led_classdev *led_cdev,
- enum led_brightness value)
+static int locomoled_probe(struct platform_device *pdev)
{
- locomoled_brightness_set(led_cdev, value, LOCOMO_LPT1);
-}
+ int ret;
+ struct resource *mem;
+ void __iomem *regs;
+ struct locomo_led *leds;
-static struct led_classdev locomo_led0 = {
- .name = "locomo:amber:charge",
- .default_trigger = "main-battery-charging",
- .brightness_set = locomoled_brightness_set0,
-};
+ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!mem)
+ return -EINVAL;
-static struct led_classdev locomo_led1 = {
- .name = "locomo:green:mail",
- .default_trigger = "nand-disk",
- .brightness_set = locomoled_brightness_set1,
-};
+ regs = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(regs))
+ return PTR_ERR(regs);
-static int locomoled_probe(struct locomo_dev *ldev)
-{
- int ret;
+ leds = devm_kzalloc(&pdev->dev, 2 * sizeof(*leds), GFP_KERNEL);
+ if (!leds)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, leds);
- ret = led_classdev_register(&ldev->dev, &locomo_led0);
+ ret = locomo_led_register(leds,
+ &pdev->dev,
+ "locomo:amber:charge",
+ "main-battery-charging",
+ regs + LOCOMO_LPT0);
if (ret < 0)
return ret;
- ret = led_classdev_register(&ldev->dev, &locomo_led1);
+ ret = locomo_led_register(leds + 1,
+ &pdev->dev,
+ "locomo:green:mail",
+ "nand-disk",
+ regs + LOCOMO_LPT1);
if (ret < 0)
- led_classdev_unregister(&locomo_led0);
+ led_classdev_unregister(&leds[0].led);
return ret;
}
-static int locomoled_remove(struct locomo_dev *dev)
+static int locomoled_remove(struct platform_device *pdev)
{
- led_classdev_unregister(&locomo_led0);
- led_classdev_unregister(&locomo_led1);
+ struct locomo_led *leds = platform_get_drvdata(pdev);
+
+ led_classdev_unregister(&leds[0].led);
+ led_classdev_unregister(&leds[1].led);
+
return 0;
}
-static struct locomo_driver locomoled_driver = {
- .drv = {
- .name = "locomoled"
+static struct platform_driver locomoled_driver = {
+ .driver = {
+ .name = "locomo-led"
},
- .devid = LOCOMO_DEVID_LED,
.probe = locomoled_probe,
.remove = locomoled_remove,
};
-static int __init locomoled_init(void)
-{
- return locomo_driver_register(&locomoled_driver);
-}
-module_init(locomoled_init);
+module_platform_driver(locomoled_driver);
MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
MODULE_DESCRIPTION("Locomo LED driver");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:locomo-led");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCH 05/15] video: backlight: add new locomo backlight driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
2014-10-28 0:01 ` [PATCH 02/15] GPIO: port LoCoMo gpio support from old driver Dmitry Eremin-Solenikov
2014-10-28 0:01 ` [PATCH 03/15] leds: port locomo leds driver to new locomo core Dmitry Eremin-Solenikov
@ 2014-10-28 0:01 ` Dmitry Eremin-Solenikov
2014-10-28 0:24 ` Jingoo Han
2014-10-28 0:01 ` [PATCH 06/15] video: lcd: add LoCoMo LCD driver Dmitry Eremin-Solenikov
` (7 subsequent siblings)
10 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:01 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Add new simple backlight driver - it cares only about PWM/frontlight
part of LoCoMo, it does not touch TFT settings and does not export TFT
power control.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/video/backlight/Kconfig | 6 +-
drivers/video/backlight/Makefile | 2 +-
drivers/video/backlight/locomo_bl.c | 171 ++++++++++++++++++++++++++++++++++++
3 files changed, 175 insertions(+), 4 deletions(-)
create mode 100644 drivers/video/backlight/locomo_bl.c
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 8d03924..03b77b33 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -218,12 +218,12 @@ config BACKLIGHT_LM3533
levels.
config BACKLIGHT_LOCOMO
- tristate "Sharp LOCOMO LCD/Backlight Driver"
- depends on SHARP_LOCOMO
+ tristate "Sharp LOCOMO Backlight Driver"
+ depends on MFD_LOCOMO
default y
help
If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
- enable the LCD/backlight driver.
+ enable the backlight driver.
config BACKLIGHT_OMAP1
tristate "OMAP1 PWL-based LCD Backlight"
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index fcd50b73..2a61b7e 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO) += ipaq_micro_bl.o
obj-$(CONFIG_BACKLIGHT_LM3533) += lm3533_bl.o
obj-$(CONFIG_BACKLIGHT_LM3630A) += lm3630a_bl.o
obj-$(CONFIG_BACKLIGHT_LM3639) += lm3639_bl.o
-obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
+obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomo_bl.o
obj-$(CONFIG_BACKLIGHT_LP855X) += lp855x_bl.o
obj-$(CONFIG_BACKLIGHT_LP8788) += lp8788_bl.o
obj-$(CONFIG_BACKLIGHT_LV5207LP) += lv5207lp.o
diff --git a/drivers/video/backlight/locomo_bl.c b/drivers/video/backlight/locomo_bl.c
new file mode 100644
index 0000000..cec1b51
--- /dev/null
+++ b/drivers/video/backlight/locomo_bl.c
@@ -0,0 +1,171 @@
+/*
+ * Backlight control code for Sharp Zaurus SL-5500
+ *
+ * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
+ * Maintainer: Pavel Machek <pavel@ucw.cz> (unless John wants to :-)
+ * GPL v2
+ *
+ * This driver assumes single CPU. That's okay, because collie is
+ * slightly old hardware, and no one is going to retrofit second CPU to
+ * old PDA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mfd/locomo.h>
+
+struct locomo_bl {
+ void __iomem *regs;
+ int current_intensity;
+ int gpio_fl_vr;
+};
+
+static const struct {
+ u16 duty, bpwf;
+ bool vr;
+} locomo_bl_pwm[] = {
+ { 0, 161, false },
+ { 117, 161, false },
+ { 163, 148, false },
+ { 194, 161, false },
+ { 194, 161, true },
+};
+
+static int locomo_bl_set_intensity(struct backlight_device *bd)
+{
+ int intensity = bd->props.brightness;
+ struct locomo_bl *bl = dev_get_drvdata(&bd->dev);
+
+ if (bd->props.power != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (bd->props.state & BL_CORE_SUSPENDED)
+ intensity = 0;
+
+ gpio_set_value(bl->gpio_fl_vr, locomo_bl_pwm[intensity].vr);
+
+ writew(locomo_bl_pwm[intensity].bpwf, bl->regs + LOCOMO_ALS);
+ udelay(100);
+ writew(locomo_bl_pwm[intensity].duty, bl->regs + LOCOMO_ALD);
+ udelay(100);
+ writew(locomo_bl_pwm[intensity].bpwf | LOCOMO_ALC_EN,
+ bl->regs + LOCOMO_ALS);
+
+ bl->current_intensity = intensity;
+ if (bd->props.state & BL_CORE_SUSPENDED)
+ writew(0x00, bl->regs + LOCOMO_ALS);
+
+ return 0;
+}
+
+static int locomo_bl_get_intensity(struct backlight_device *bd)
+{
+ struct locomo_bl *bl = dev_get_drvdata(&bd->dev);
+
+ return bl->current_intensity;
+}
+
+static const struct backlight_ops locomo_bl_ops = {
+ .options = BL_CORE_SUSPENDRESUME,
+ .get_brightness = locomo_bl_get_intensity,
+ .update_status = locomo_bl_set_intensity,
+};
+
+static int locomo_bl_probe(struct platform_device *dev)
+{
+ struct backlight_properties props;
+ struct resource *res;
+ struct locomo_bl_platform_data *pdata;
+ struct locomo_bl *bl;
+ struct backlight_device *locomo_bl_device;
+ int rc;
+
+ bl = devm_kmalloc(&dev->dev, sizeof(struct locomo_bl), GFP_KERNEL);
+ if (!bl)
+ return -ENOMEM;
+
+ res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+ bl->regs = devm_ioremap_resource(&dev->dev, res);
+ if (!bl->regs)
+ return -EINVAL;
+
+ pdata = dev_get_platdata(&dev->dev);
+ if (!pdata)
+ return -EINVAL;
+
+ bl->gpio_fl_vr = pdata->gpio_fl_vr;
+ rc = devm_gpio_request_one(&dev->dev, bl->gpio_fl_vr,
+ GPIOF_OUT_INIT_LOW, "FL VR");
+ if (rc)
+ return rc;
+
+ writew(0, bl->regs + LOCOMO_ALS);
+ writew(0, bl->regs + LOCOMO_ALD);
+
+ memset(&props, 0, sizeof(struct backlight_properties));
+ props.type = BACKLIGHT_RAW;
+ props.max_brightness = ARRAY_SIZE(locomo_bl_pwm) - 1;
+ props.brightness = props.max_brightness / 2;
+ locomo_bl_device = backlight_device_register("locomo-bl",
+ &dev->dev, bl,
+ &locomo_bl_ops, &props);
+
+ if (IS_ERR(locomo_bl_device))
+ return PTR_ERR(locomo_bl_device);
+
+ platform_set_drvdata(dev, locomo_bl_device);
+
+ /* Set up frontlight so that screen is readable */
+ backlight_update_status(locomo_bl_device);
+
+ return 0;
+}
+
+static int locomo_bl_remove(struct platform_device *dev)
+{
+ struct backlight_device *locomo_bl_device = platform_get_drvdata(dev);
+
+ locomo_bl_device->props.brightness = 0;
+ locomo_bl_device->props.power = 0;
+ locomo_bl_set_intensity(locomo_bl_device);
+
+ backlight_device_unregister(locomo_bl_device);
+
+ return 0;
+}
+
+static void locomo_bl_shutdown(struct platform_device *dev)
+{
+ struct backlight_device *locomo_bl_device = platform_get_drvdata(dev);
+
+ locomo_bl_device->props.brightness = 0;
+ locomo_bl_device->props.power = 0;
+ locomo_bl_set_intensity(locomo_bl_device);
+}
+
+static struct platform_driver locomo_bl_driver = {
+ .driver = {
+ .name = "locomo-backlight",
+ .owner = THIS_MODULE,
+ },
+ .probe = locomo_bl_probe,
+ .remove = locomo_bl_remove,
+ /* Turn off bl on power off/reboot */
+ .shutdown = locomo_bl_shutdown,
+};
+
+module_platform_driver(locomo_bl_driver);
+
+MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@ucw.cz>");
+MODULE_DESCRIPTION("Collie Backlight driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:locomo-backlight");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 05/15] video: backlight: add new locomo backlight driver
2014-10-28 0:01 ` [PATCH 05/15] video: backlight: add new locomo backlight driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:24 ` Jingoo Han
0 siblings, 0 replies; 52+ messages in thread
From: Jingoo Han @ 2014-10-28 0:24 UTC (permalink / raw)
To: 'Dmitry Eremin-Solenikov'
Cc: 'Andrea Adami', 'Russell King',
'Daniel Mack', 'Haojian Zhuang',
'Robert Jarzmik', 'Linus Walleij',
linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel, 'Alexandre Courbot',
'Dmitry Torokhov', 'Bryan Wu',
'Richard Purdie', 'Samuel Ortiz',
'Lee Jones', 'Mark Brown',
'Liam Girdwood', 'Jingoo Han'
On Tuesday, October 28, 2014 9:02 AM, Dmitry Eremin-Solenikov wrote:
>
> Add new simple backlight driver - it cares only about PWM/frontlight
> part of LoCoMo, it does not touch TFT settings and does not export TFT
> power control.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> drivers/video/backlight/Kconfig | 6 +-
> drivers/video/backlight/Makefile | 2 +-
> drivers/video/backlight/locomo_bl.c | 171 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 175 insertions(+), 4 deletions(-)
> create mode 100644 drivers/video/backlight/locomo_bl.c
>
> diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
> index 8d03924..03b77b33 100644
> --- a/drivers/video/backlight/Kconfig
> +++ b/drivers/video/backlight/Kconfig
> @@ -218,12 +218,12 @@ config BACKLIGHT_LM3533
> levels.
>
> config BACKLIGHT_LOCOMO
> - tristate "Sharp LOCOMO LCD/Backlight Driver"
> - depends on SHARP_LOCOMO
> + tristate "Sharp LOCOMO Backlight Driver"
> + depends on MFD_LOCOMO
> default y
> help
> If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
> - enable the LCD/backlight driver.
> + enable the backlight driver.
>
> config BACKLIGHT_OMAP1
> tristate "OMAP1 PWL-based LCD Backlight"
> diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
> index fcd50b73..2a61b7e 100644
> --- a/drivers/video/backlight/Makefile
> +++ b/drivers/video/backlight/Makefile
> @@ -39,7 +39,7 @@ obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO) += ipaq_micro_bl.o
> obj-$(CONFIG_BACKLIGHT_LM3533) += lm3533_bl.o
> obj-$(CONFIG_BACKLIGHT_LM3630A) += lm3630a_bl.o
> obj-$(CONFIG_BACKLIGHT_LM3639) += lm3639_bl.o
> -obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
> +obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomo_bl.o
> obj-$(CONFIG_BACKLIGHT_LP855X) += lp855x_bl.o
> obj-$(CONFIG_BACKLIGHT_LP8788) += lp8788_bl.o
> obj-$(CONFIG_BACKLIGHT_LV5207LP) += lv5207lp.o
> diff --git a/drivers/video/backlight/locomo_bl.c b/drivers/video/backlight/locomo_bl.c
> new file mode 100644
> index 0000000..cec1b51
> --- /dev/null
> +++ b/drivers/video/backlight/locomo_bl.c
> @@ -0,0 +1,171 @@
> +/*
> + * Backlight control code for Sharp Zaurus SL-5500
> + *
> + * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
> + * Maintainer: Pavel Machek <pavel@ucw.cz> (unless John wants to :-)
> + * GPL v2
> + *
> + * This driver assumes single CPU. That's okay, because collie is
> + * slightly old hardware, and no one is going to retrofit second CPU to
> + * old PDA.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/fb.h>
> +#include <linux/backlight.h>
> +#include <linux/err.h>
> +#include <linux/gpio.h>
> +#include <linux/delay.h>
> +#include <linux/mfd/locomo.h>
Please, re-order these headers alphabetically.
It enhances the readability.
> +
> +struct locomo_bl {
> + void __iomem *regs;
> + int current_intensity;
> + int gpio_fl_vr;
> +};
> +
> +static const struct {
> + u16 duty, bpwf;
> + bool vr;
> +} locomo_bl_pwm[] = {
> + { 0, 161, false },
> + { 117, 161, false },
> + { 163, 148, false },
> + { 194, 161, false },
> + { 194, 161, true },
> +};
> +
> +static int locomo_bl_set_intensity(struct backlight_device *bd)
> +{
> + int intensity = bd->props.brightness;
> + struct locomo_bl *bl = dev_get_drvdata(&bd->dev);
> +
> + if (bd->props.power != FB_BLANK_UNBLANK)
> + intensity = 0;
> + if (bd->props.fb_blank != FB_BLANK_UNBLANK)
> + intensity = 0;
> + if (bd->props.state & BL_CORE_SUSPENDED)
> + intensity = 0;
> +
> + gpio_set_value(bl->gpio_fl_vr, locomo_bl_pwm[intensity].vr);
> +
> + writew(locomo_bl_pwm[intensity].bpwf, bl->regs + LOCOMO_ALS);
> + udelay(100);
> + writew(locomo_bl_pwm[intensity].duty, bl->regs + LOCOMO_ALD);
> + udelay(100);
How about changing udelay() to usleep_range()?
> + writew(locomo_bl_pwm[intensity].bpwf | LOCOMO_ALC_EN,
> + bl->regs + LOCOMO_ALS);
> +
> + bl->current_intensity = intensity;
> + if (bd->props.state & BL_CORE_SUSPENDED)
> + writew(0x00, bl->regs + LOCOMO_ALS);
> +
> + return 0;
> +}
> +
> +static int locomo_bl_get_intensity(struct backlight_device *bd)
> +{
> + struct locomo_bl *bl = dev_get_drvdata(&bd->dev);
> +
> + return bl->current_intensity;
> +}
> +
> +static const struct backlight_ops locomo_bl_ops = {
> + .options = BL_CORE_SUSPENDRESUME,
> + .get_brightness = locomo_bl_get_intensity,
> + .update_status = locomo_bl_set_intensity,
> +};
> +
> +static int locomo_bl_probe(struct platform_device *dev)
> +{
> + struct backlight_properties props;
> + struct resource *res;
> + struct locomo_bl_platform_data *pdata;
> + struct locomo_bl *bl;
> + struct backlight_device *locomo_bl_device;
> + int rc;
> +
> + bl = devm_kmalloc(&dev->dev, sizeof(struct locomo_bl), GFP_KERNEL);
> + if (!bl)
> + return -ENOMEM;
> +
> + res = platform_get_resource(dev, IORESOURCE_MEM, 0);
> + if (!res)
> + return -EINVAL;
There is no need to check this, because devm_ioremap_resource()
will check this.
> + bl->regs = devm_ioremap_resource(&dev->dev, res);
> + if (!bl->regs)
> + return -EINVAL;
The correct usage is as follows.
if (IS_ERR(base))
return PTR_ERR(base);
Please change it as below.
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
bl->regs = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(bl->regs))
return PTR_ERR(bl->regs);
> +
> + pdata = dev_get_platdata(&dev->dev);
> + if (!pdata)
> + return -EINVAL;
> +
> + bl->gpio_fl_vr = pdata->gpio_fl_vr;
> + rc = devm_gpio_request_one(&dev->dev, bl->gpio_fl_vr,
> + GPIOF_OUT_INIT_LOW, "FL VR");
> + if (rc)
> + return rc;
> +
> + writew(0, bl->regs + LOCOMO_ALS);
> + writew(0, bl->regs + LOCOMO_ALD);
> +
> + memset(&props, 0, sizeof(struct backlight_properties));
> + props.type = BACKLIGHT_RAW;
> + props.max_brightness = ARRAY_SIZE(locomo_bl_pwm) - 1;
> + props.brightness = props.max_brightness / 2;
> + locomo_bl_device = backlight_device_register("locomo-bl",
Please use devm_backlight_device_register().
> + &dev->dev, bl,
> + &locomo_bl_ops, &props);
> +
> + if (IS_ERR(locomo_bl_device))
> + return PTR_ERR(locomo_bl_device);
> +
> + platform_set_drvdata(dev, locomo_bl_device);
> +
> + /* Set up frontlight so that screen is readable */
> + backlight_update_status(locomo_bl_device);
> +
> + return 0;
> +}
> +
> +static int locomo_bl_remove(struct platform_device *dev)
> +{
> + struct backlight_device *locomo_bl_device = platform_get_drvdata(dev);
> +
> + locomo_bl_device->props.brightness = 0;
> + locomo_bl_device->props.power = 0;
> + locomo_bl_set_intensity(locomo_bl_device);
> +
> + backlight_device_unregister(locomo_bl_device);
If devm_backlight_device_register() is used in probe(),
there is no need to call backlight_device_unregister() in remove().
> +
> + return 0;
> +}
> +
> +static void locomo_bl_shutdown(struct platform_device *dev)
> +{
> + struct backlight_device *locomo_bl_device = platform_get_drvdata(dev);
> +
> + locomo_bl_device->props.brightness = 0;
> + locomo_bl_device->props.power = 0;
> + locomo_bl_set_intensity(locomo_bl_device);
> +}
> +
> +static struct platform_driver locomo_bl_driver = {
> + .driver = {
> + .name = "locomo-backlight",
> + .owner = THIS_MODULE,
> + },
> + .probe = locomo_bl_probe,
> + .remove = locomo_bl_remove,
> + /* Turn off bl on power off/reboot */
> + .shutdown = locomo_bl_shutdown,
> +};
> +
> +module_platform_driver(locomo_bl_driver);
> +
> +MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@ucw.cz>");
This might make checkpatch warning.
Please split these authors to lines as below.
MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
MODULE_AUTHOR("Pavel Machek <pavel@ucw.cz>");
> +MODULE_DESCRIPTION("Collie Backlight driver");
What does mean 'Collie'? 'Locomo' looks better.
> +MODULE_LICENSE("GPL");
How about using "GPL v2"?
Thank you.
Best regards,
Jingoo Han
> +MODULE_ALIAS("platform:locomo-backlight");
> --
> 2.1.1
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 06/15] video: lcd: add LoCoMo LCD driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (2 preceding siblings ...)
2014-10-28 0:01 ` [PATCH 05/15] video: backlight: add new locomo backlight driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:01 ` Dmitry Eremin-Solenikov
2014-10-28 0:30 ` Jingoo Han
2014-10-28 0:02 ` [PATCH 07/15] video: backlight: drop old locomo bl/lcd driver Dmitry Eremin-Solenikov
` (6 subsequent siblings)
10 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:01 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
LoCoMo has some special handling for TFT screens attached to Collie and
Poodle. Implement that as a separate driver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/video/backlight/Kconfig | 8 ++
drivers/video/backlight/Makefile | 1 +
drivers/video/backlight/locomo_lcd.c | 224 +++++++++++++++++++++++++++++++++++
3 files changed, 233 insertions(+)
create mode 100644 drivers/video/backlight/locomo_lcd.c
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 03b77b33..bc5c671 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -48,6 +48,14 @@ config LCD_LMS283GF05
SPI driver for Samsung LMS283GF05. This provides basic support
for powering the LCD up/down through a sysfs interface.
+config LCD_LOCOMO
+ tristate "Sharp LOCOMO LCD Driver"
+ depends on MFD_LOCOMO
+ default y
+ help
+ If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
+ enable the LCD driver.
+
config LCD_LTV350QV
tristate "Samsung LTV350QV LCD Panel"
depends on SPI_MASTER
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 2a61b7e..b2580e7 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_LCD_ILI922X) += ili922x.o
obj-$(CONFIG_LCD_ILI9320) += ili9320.o
obj-$(CONFIG_LCD_L4F00242T03) += l4f00242t03.o
obj-$(CONFIG_LCD_LD9040) += ld9040.o
+obj-$(CONFIG_LCD_LOCOMO) += locomo_lcd.o
obj-$(CONFIG_LCD_LMS283GF05) += lms283gf05.o
obj-$(CONFIG_LCD_LMS501KF03) += lms501kf03.o
obj-$(CONFIG_LCD_LTV350QV) += ltv350qv.o
diff --git a/drivers/video/backlight/locomo_lcd.c b/drivers/video/backlight/locomo_lcd.c
new file mode 100644
index 0000000..245efb8
--- /dev/null
+++ b/drivers/video/backlight/locomo_lcd.c
@@ -0,0 +1,224 @@
+/*
+ * Backlight control code for Sharp Zaurus SL-5500
+ *
+ * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
+ * Maintainer: Pavel Machek <pavel@ucw.cz> (unless John wants to :-)
+ * GPL v2
+ *
+ * This driver assumes single CPU. That's okay, because collie is
+ * slightly old hardware, and no one is going to retrofit second CPU to
+ * old PDA.
+ */
+
+/* LCD power functions */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/lcd.h>
+#include <linux/mfd/locomo.h>
+
+static struct platform_device *locomolcd_dev;
+static struct locomo_lcd_platform_data lcd_data;
+static bool locomolcd_is_on;
+static bool locomolcd_is_suspended;
+static void __iomem *locomolcd_regs;
+static struct lcd_device *lcd_dev;
+
+static struct gpio locomo_gpios[] = {
+ { 0, GPIOF_OUT_INIT_LOW, "LCD VSHA on" },
+ { 0, GPIOF_OUT_INIT_LOW, "LCD VSHD on" },
+ { 0, GPIOF_OUT_INIT_LOW, "LCD Vee on" },
+ { 0, GPIOF_OUT_INIT_LOW, "LCD MOD" },
+};
+
+static void locomolcd_on(void)
+{
+ gpio_set_value(lcd_data.gpio_lcd_vsha_on, 1);
+ mdelay(2);
+
+ gpio_set_value(lcd_data.gpio_lcd_vshd_on, 1);
+ mdelay(2);
+
+ locomo_m62332_senddata(locomolcd_dev->dev.parent, lcd_data.comadj, 0);
+ mdelay(5);
+
+ gpio_set_value(lcd_data.gpio_lcd_vee_on, 1);
+ mdelay(10);
+
+ /* TFTCRST | CPSOUT=0 | CPSEN */
+ writew(0x01, locomolcd_regs + LOCOMO_TC);
+
+ /* Set CPSD */
+ writew(6, locomolcd_regs + LOCOMO_CPSD);
+
+ /* TFTCRST | CPSOUT=0 | CPSEN */
+ writew((0x04 | 0x01), locomolcd_regs + LOCOMO_TC);
+ mdelay(10);
+
+ gpio_set_value(lcd_data.gpio_lcd_mod, 1);
+}
+
+static void locomolcd_off(void)
+{
+ /* TFTCRST=1 | CPSOUT=1 | CPSEN = 0 */
+ writew(0x06, locomolcd_regs + LOCOMO_TC);
+ mdelay(1);
+
+ gpio_set_value(lcd_data.gpio_lcd_vsha_on, 0);
+ mdelay(110);
+
+ gpio_set_value(lcd_data.gpio_lcd_vee_on, 0);
+ mdelay(700);
+
+ locomo_m62332_senddata(locomolcd_dev->dev.parent, 0, 0);
+ mdelay(5);
+
+ /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
+ writew(0, locomolcd_regs + LOCOMO_TC);
+ gpio_set_value(lcd_data.gpio_lcd_mod, 0);
+ gpio_set_value(lcd_data.gpio_lcd_vshd_on, 0);
+}
+
+int locomo_lcd_set_power(struct lcd_device *lcd, int power)
+{
+ dev_dbg(&lcd->dev, "LCD power %d (is %d)\n", power, locomolcd_is_on);
+ if (power = 0 && !locomolcd_is_on) {
+ locomolcd_is_on = 1;
+ locomolcd_on();
+ }
+ if (power != 0 && locomolcd_is_on) {
+ locomolcd_is_on = 0;
+ locomolcd_off();
+ }
+ return 0;
+}
+
+static int locomo_lcd_get_power(struct lcd_device *lcd)
+{
+ return !locomolcd_is_on;
+}
+
+static struct lcd_ops locomo_lcd_ops = {
+ .set_power = locomo_lcd_set_power,
+ .get_power = locomo_lcd_get_power,
+};
+
+#ifdef CONFIG_PM_SLEEP
+static int locomolcd_suspend(struct device *dev)
+{
+ locomolcd_is_suspended = true;
+ locomolcd_off();
+
+ return 0;
+}
+
+static int locomolcd_resume(struct device *dev)
+{
+ locomolcd_is_suspended = false;
+
+ if (locomolcd_is_on)
+ locomolcd_on();
+
+ return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(locomolcd_pm, locomolcd_suspend, locomolcd_resume);
+#define LOCOMOLCD_PM (&locomolcd_pm)
+#else
+#define LOCOMOLCD_PM NULL
+#endif
+
+static int locomolcd_probe(struct platform_device *dev)
+{
+ unsigned long flags;
+ struct resource *res;
+ struct locomo_lcd_platform_data *pdata;
+ int rc;
+
+ res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+ locomolcd_regs = devm_ioremap_resource(&dev->dev, res);
+ if (!locomolcd_regs)
+ return -EINVAL;
+
+ pdata = dev_get_platdata(&dev->dev);
+ if (!pdata)
+ return -EINVAL;
+
+ lcd_data = *pdata;
+
+ locomo_gpios[0].gpio = lcd_data.gpio_lcd_vsha_on;
+ locomo_gpios[1].gpio = lcd_data.gpio_lcd_vshd_on;
+ locomo_gpios[2].gpio = lcd_data.gpio_lcd_vee_on;
+ locomo_gpios[3].gpio = lcd_data.gpio_lcd_mod;
+ dev_info(&dev->dev, "GPIOs: %d %d %d %d\n",
+ locomo_gpios[0].gpio,
+ locomo_gpios[1].gpio,
+ locomo_gpios[2].gpio,
+ locomo_gpios[3].gpio);
+
+ rc = gpio_request_array(locomo_gpios, ARRAY_SIZE(locomo_gpios));
+ if (rc)
+ return rc;
+
+ local_irq_save(flags);
+ locomolcd_dev = dev;
+
+ locomolcd_is_on = 1;
+ if (locomolcd_is_on)
+ locomolcd_on();
+
+ local_irq_restore(flags);
+
+ lcd_dev = lcd_device_register("locomo", &dev->dev, NULL,
+ &locomo_lcd_ops);
+
+ return 0;
+}
+
+static int locomolcd_remove(struct platform_device *dev)
+{
+ unsigned long flags;
+
+ lcd_device_unregister(lcd_dev);
+
+ local_irq_save(flags);
+
+ locomolcd_off();
+ locomolcd_dev = NULL;
+
+ local_irq_restore(flags);
+
+ gpio_free_array(locomo_gpios, ARRAY_SIZE(locomo_gpios));
+
+ return 0;
+}
+
+static void locomolcd_shutdown(struct platform_device *dev)
+{
+ locomolcd_off();
+}
+
+static struct platform_driver locomolcd_driver = {
+ .driver = {
+ .name = "locomo-lcd",
+ .owner = THIS_MODULE,
+ .pm = LOCOMOLCD_PM,
+ },
+ .probe = locomolcd_probe,
+ .remove = locomolcd_remove,
+ .shutdown = locomolcd_shutdown,
+};
+
+module_platform_driver(locomolcd_driver);
+
+MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@ucw.cz>");
+MODULE_DESCRIPTION("Collie LCD driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:locomo-lcd");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 06/15] video: lcd: add LoCoMo LCD driver
2014-10-28 0:01 ` [PATCH 06/15] video: lcd: add LoCoMo LCD driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:30 ` Jingoo Han
2014-10-28 16:47 ` Dmitry Eremin-Solenikov
0 siblings, 1 reply; 52+ messages in thread
From: Jingoo Han @ 2014-10-28 0:30 UTC (permalink / raw)
To: 'Dmitry Eremin-Solenikov'
Cc: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel, 'Andrea Adami',
'Russell King', 'Daniel Mack',
'Haojian Zhuang', 'Robert Jarzmik',
'Linus Walleij', 'Alexandre Courbot',
'Dmitry Torokhov', 'Bryan Wu',
'Richard Purdie', 'Samuel Ortiz',
'Lee Jones', 'Mark Brown',
'Liam Girdwood', 'Jingoo Han'
On Tuesday, October 28, 2014 9:02 AM, Dmitry Eremin-Solenikov wrote:
>
> LoCoMo has some special handling for TFT screens attached to Collie and
> Poodle. Implement that as a separate driver.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> drivers/video/backlight/Kconfig | 8 ++
> drivers/video/backlight/Makefile | 1 +
> drivers/video/backlight/locomo_lcd.c | 224 +++++++++++++++++++++++++++++++++++
> 3 files changed, 233 insertions(+)
> create mode 100644 drivers/video/backlight/locomo_lcd.c
>
> diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
> index 03b77b33..bc5c671 100644
> --- a/drivers/video/backlight/Kconfig
> +++ b/drivers/video/backlight/Kconfig
> @@ -48,6 +48,14 @@ config LCD_LMS283GF05
> SPI driver for Samsung LMS283GF05. This provides basic support
> for powering the LCD up/down through a sysfs interface.
>
> +config LCD_LOCOMO
> + tristate "Sharp LOCOMO LCD Driver"
> + depends on MFD_LOCOMO
> + default y
> + help
> + If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
> + enable the LCD driver.
> +
> config LCD_LTV350QV
> tristate "Samsung LTV350QV LCD Panel"
> depends on SPI_MASTER
> diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
> index 2a61b7e..b2580e7 100644
> --- a/drivers/video/backlight/Makefile
> +++ b/drivers/video/backlight/Makefile
> @@ -9,6 +9,7 @@ obj-$(CONFIG_LCD_ILI922X) += ili922x.o
> obj-$(CONFIG_LCD_ILI9320) += ili9320.o
> obj-$(CONFIG_LCD_L4F00242T03) += l4f00242t03.o
> obj-$(CONFIG_LCD_LD9040) += ld9040.o
> +obj-$(CONFIG_LCD_LOCOMO) += locomo_lcd.o
Please insert this alphabetically for the readability.
> obj-$(CONFIG_LCD_LMS283GF05) += lms283gf05.o
> obj-$(CONFIG_LCD_LMS501KF03) += lms501kf03.o
> obj-$(CONFIG_LCD_LTV350QV) += ltv350qv.o
> diff --git a/drivers/video/backlight/locomo_lcd.c b/drivers/video/backlight/locomo_lcd.c
> new file mode 100644
> index 0000000..245efb8
> --- /dev/null
> +++ b/drivers/video/backlight/locomo_lcd.c
> @@ -0,0 +1,224 @@
> +/*
> + * Backlight control code for Sharp Zaurus SL-5500
> + *
> + * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
> + * Maintainer: Pavel Machek <pavel@ucw.cz> (unless John wants to :-)
> + * GPL v2
> + *
> + * This driver assumes single CPU. That's okay, because collie is
> + * slightly old hardware, and no one is going to retrofit second CPU to
> + * old PDA.
> + */
> +
> +/* LCD power functions */
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/fb.h>
> +#include <linux/backlight.h>
> +#include <linux/err.h>
> +#include <linux/gpio.h>
> +#include <linux/delay.h>
> +#include <linux/lcd.h>
> +#include <linux/mfd/locomo.h>
Please, re-order these headers alphabetically.
It enhances the readability.
> +
> +static struct platform_device *locomolcd_dev;
> +static struct locomo_lcd_platform_data lcd_data;
> +static bool locomolcd_is_on;
> +static bool locomolcd_is_suspended;
> +static void __iomem *locomolcd_regs;
> +static struct lcd_device *lcd_dev;
> +
> +static struct gpio locomo_gpios[] = {
> + { 0, GPIOF_OUT_INIT_LOW, "LCD VSHA on" },
> + { 0, GPIOF_OUT_INIT_LOW, "LCD VSHD on" },
> + { 0, GPIOF_OUT_INIT_LOW, "LCD Vee on" },
> + { 0, GPIOF_OUT_INIT_LOW, "LCD MOD" },
> +};
> +
> +static void locomolcd_on(void)
> +{
> + gpio_set_value(lcd_data.gpio_lcd_vsha_on, 1);
> + mdelay(2);
> +
> + gpio_set_value(lcd_data.gpio_lcd_vshd_on, 1);
> + mdelay(2);
> +
> + locomo_m62332_senddata(locomolcd_dev->dev.parent, lcd_data.comadj, 0);
> + mdelay(5);
> +
> + gpio_set_value(lcd_data.gpio_lcd_vee_on, 1);
> + mdelay(10);
How about changing mdelay() to usleep_range()?
> +
> + /* TFTCRST | CPSOUT=0 | CPSEN */
> + writew(0x01, locomolcd_regs + LOCOMO_TC);
> +
> + /* Set CPSD */
> + writew(6, locomolcd_regs + LOCOMO_CPSD);
> +
> + /* TFTCRST | CPSOUT=0 | CPSEN */
> + writew((0x04 | 0x01), locomolcd_regs + LOCOMO_TC);
> + mdelay(10);
> +
> + gpio_set_value(lcd_data.gpio_lcd_mod, 1);
> +}
> +
> +static void locomolcd_off(void)
> +{
> + /* TFTCRST=1 | CPSOUT=1 | CPSEN = 0 */
> + writew(0x06, locomolcd_regs + LOCOMO_TC);
> + mdelay(1);
> +
> + gpio_set_value(lcd_data.gpio_lcd_vsha_on, 0);
> + mdelay(110);
> +
> + gpio_set_value(lcd_data.gpio_lcd_vee_on, 0);
> + mdelay(700);
> +
> + locomo_m62332_senddata(locomolcd_dev->dev.parent, 0, 0);
> + mdelay(5);
How about changing mdelay() to usleep_range() or msleep()?
> +
> + /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
> + writew(0, locomolcd_regs + LOCOMO_TC);
> + gpio_set_value(lcd_data.gpio_lcd_mod, 0);
> + gpio_set_value(lcd_data.gpio_lcd_vshd_on, 0);
> +}
> +
> +int locomo_lcd_set_power(struct lcd_device *lcd, int power)
> +{
> + dev_dbg(&lcd->dev, "LCD power %d (is %d)\n", power, locomolcd_is_on);
> + if (power = 0 && !locomolcd_is_on) {
> + locomolcd_is_on = 1;
> + locomolcd_on();
> + }
> + if (power != 0 && locomolcd_is_on) {
> + locomolcd_is_on = 0;
> + locomolcd_off();
> + }
> + return 0;
> +}
> +
> +static int locomo_lcd_get_power(struct lcd_device *lcd)
> +{
> + return !locomolcd_is_on;
> +}
> +
> +static struct lcd_ops locomo_lcd_ops = {
> + .set_power = locomo_lcd_set_power,
> + .get_power = locomo_lcd_get_power,
> +};
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int locomolcd_suspend(struct device *dev)
> +{
> + locomolcd_is_suspended = true;
> + locomolcd_off();
> +
> + return 0;
> +}
> +
> +static int locomolcd_resume(struct device *dev)
> +{
> + locomolcd_is_suspended = false;
> +
> + if (locomolcd_is_on)
> + locomolcd_on();
> +
> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(locomolcd_pm, locomolcd_suspend, locomolcd_resume);
> +#define LOCOMOLCD_PM (&locomolcd_pm)
> +#else
> +#define LOCOMOLCD_PM NULL
> +#endif
> +
> +static int locomolcd_probe(struct platform_device *dev)
> +{
> + unsigned long flags;
> + struct resource *res;
> + struct locomo_lcd_platform_data *pdata;
> + int rc;
> +
> + res = platform_get_resource(dev, IORESOURCE_MEM, 0);
> + if (!res)
> + return -EINVAL;
> + locomolcd_regs = devm_ioremap_resource(&dev->dev, res);
> + if (!locomolcd_regs)
> + return -EINVAL;
Please change it as below.
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
locomolcd_regs = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(locomolcd_regs))
return PTR_ERR(locomolcd_regs);
> +
> + pdata = dev_get_platdata(&dev->dev);
> + if (!pdata)
> + return -EINVAL;
> +
> + lcd_data = *pdata;
> +
> + locomo_gpios[0].gpio = lcd_data.gpio_lcd_vsha_on;
> + locomo_gpios[1].gpio = lcd_data.gpio_lcd_vshd_on;
> + locomo_gpios[2].gpio = lcd_data.gpio_lcd_vee_on;
> + locomo_gpios[3].gpio = lcd_data.gpio_lcd_mod;
> + dev_info(&dev->dev, "GPIOs: %d %d %d %d\n",
> + locomo_gpios[0].gpio,
> + locomo_gpios[1].gpio,
> + locomo_gpios[2].gpio,
> + locomo_gpios[3].gpio);
> +
> + rc = gpio_request_array(locomo_gpios, ARRAY_SIZE(locomo_gpios));
> + if (rc)
> + return rc;
> +
> + local_irq_save(flags);
> + locomolcd_dev = dev;
> +
> + locomolcd_is_on = 1;
> + if (locomolcd_is_on)
> + locomolcd_on();
> +
> + local_irq_restore(flags);
> +
> + lcd_dev = lcd_device_register("locomo", &dev->dev, NULL,
Please use devm_lcd_device_register().
> + &locomo_lcd_ops);
> +
> + return 0;
> +}
> +
> +static int locomolcd_remove(struct platform_device *dev)
> +{
> + unsigned long flags;
> +
> + lcd_device_unregister(lcd_dev);
If devm_lcd_device_register() is used in probe(),
there is no need to call lcd_device_unregister() in remove().
> +
> + local_irq_save(flags);
> +
> + locomolcd_off();
> + locomolcd_dev = NULL;
> +
> + local_irq_restore(flags);
> +
> + gpio_free_array(locomo_gpios, ARRAY_SIZE(locomo_gpios));
> +
> + return 0;
> +}
> +
> +static void locomolcd_shutdown(struct platform_device *dev)
> +{
> + locomolcd_off();
> +}
> +
> +static struct platform_driver locomolcd_driver = {
> + .driver = {
> + .name = "locomo-lcd",
> + .owner = THIS_MODULE,
> + .pm = LOCOMOLCD_PM,
> + },
> + .probe = locomolcd_probe,
> + .remove = locomolcd_remove,
> + .shutdown = locomolcd_shutdown,
> +};
> +
> +module_platform_driver(locomolcd_driver);
> +
> +MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@ucw.cz>");
Please split these authors to lines as below.
MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
MODULE_AUTHOR("Pavel Machek <pavel@ucw.cz>");
> +MODULE_DESCRIPTION("Collie LCD driver");
What does mean 'Collie'? 'Locomo' looks better.
> +MODULE_LICENSE("GPL");
How about using "GPL v2"?
Thank you.
Best regards,
Jingoo Han
> +MODULE_ALIAS("platform:locomo-lcd");
> --
> 2.1.1
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH 06/15] video: lcd: add LoCoMo LCD driver
2014-10-28 0:30 ` Jingoo Han
@ 2014-10-28 16:47 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 16:47 UTC (permalink / raw)
To: Jingoo Han
Cc: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel, 'Andrea Adami',
'Russell King', 'Daniel Mack',
'Haojian Zhuang', 'Robert Jarzmik',
'Linus Walleij', 'Alexandre Courbot',
'Dmitry Torokhov', 'Bryan Wu',
'Richard Purdie', 'Samuel Ortiz',
'Lee Jones', 'Mark Brown',
'Liam Girdwood'
On 10/28/2014 03:30 AM, Jingoo Han wrote:
> On Tuesday, October 28, 2014 9:02 AM, Dmitry Eremin-Solenikov wrote:
>>
>> LoCoMo has some special handling for TFT screens attached to Collie and
>> Poodle. Implement that as a separate driver.
Thanks for the review, changes for both LCD and Backlight will be
implemented in V2.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 07/15] video: backlight: drop old locomo bl/lcd driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (3 preceding siblings ...)
2014-10-28 0:01 ` [PATCH 06/15] video: lcd: add LoCoMo LCD driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-28 0:02 ` [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
` (5 subsequent siblings)
10 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Old locomolcd driver is now completely obsolete by new locomo_bl and
locomo_lcd drivers, so let's drop it.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/video/backlight/locomolcd.c | 255 ------------------------------------
1 file changed, 255 deletions(-)
delete mode 100644 drivers/video/backlight/locomolcd.c
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
deleted file mode 100644
index 6c3ec42..0000000
--- a/drivers/video/backlight/locomolcd.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Backlight control code for Sharp Zaurus SL-5500
- *
- * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
- * Maintainer: Pavel Machek <pavel@ucw.cz> (unless John wants to :-)
- * GPL v2
- *
- * This driver assumes single CPU. That's okay, because collie is
- * slightly old hardware, and no one is going to retrofit second CPU to
- * old PDA.
- */
-
-/* LCD power functions */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
-#include <linux/fb.h>
-#include <linux/backlight.h>
-
-#include <asm/hardware/locomo.h>
-#include <asm/irq.h>
-#include <asm/mach/sharpsl_param.h>
-#include <asm/mach-types.h>
-
-#include "../../../arch/arm/mach-sa1100/generic.h"
-
-static struct backlight_device *locomolcd_bl_device;
-static struct locomo_dev *locomolcd_dev;
-static unsigned long locomolcd_flags;
-#define LOCOMOLCD_SUSPENDED 0x01
-
-static void locomolcd_on(int comadj)
-{
- locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 1);
- mdelay(2);
-
- locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 1);
- mdelay(2);
-
- locomo_m62332_senddata(locomolcd_dev, comadj, 0);
- mdelay(5);
-
- locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 1);
- mdelay(10);
-
- /* TFTCRST | CPSOUT=0 | CPSEN */
- locomo_writel(0x01, locomolcd_dev->mapbase + LOCOMO_TC);
-
- /* Set CPSD */
- locomo_writel(6, locomolcd_dev->mapbase + LOCOMO_CPSD);
-
- /* TFTCRST | CPSOUT=0 | CPSEN */
- locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC);
- mdelay(10);
-
- locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 1);
-}
-
-static void locomolcd_off(int comadj)
-{
- /* TFTCRST=1 | CPSOUT=1 | CPSEN = 0 */
- locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC);
- mdelay(1);
-
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0);
- mdelay(110);
-
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0);
- mdelay(700);
-
- /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
- locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0);
- locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0);
-}
-
-void locomolcd_power(int on)
-{
- int comadj = sharpsl_param.comadj;
- unsigned long flags;
-
- local_irq_save(flags);
-
- if (!locomolcd_dev) {
- local_irq_restore(flags);
- return;
- }
-
- /* read comadj */
- if (comadj = -1 && machine_is_collie())
- comadj = 128;
- if (comadj = -1 && machine_is_poodle())
- comadj = 118;
-
- if (on)
- locomolcd_on(comadj);
- else
- locomolcd_off(comadj);
-
- local_irq_restore(flags);
-}
-EXPORT_SYMBOL(locomolcd_power);
-
-static int current_intensity;
-
-static int locomolcd_set_intensity(struct backlight_device *bd)
-{
- int intensity = bd->props.brightness;
-
- if (bd->props.power != FB_BLANK_UNBLANK)
- intensity = 0;
- if (bd->props.fb_blank != FB_BLANK_UNBLANK)
- intensity = 0;
- if (locomolcd_flags & LOCOMOLCD_SUSPENDED)
- intensity = 0;
-
- switch (intensity) {
- /*
- * AC and non-AC are handled differently,
- * but produce same results in sharp code?
- */
- case 0:
- locomo_frontlight_set(locomolcd_dev, 0, 0, 161);
- break;
- case 1:
- locomo_frontlight_set(locomolcd_dev, 117, 0, 161);
- break;
- case 2:
- locomo_frontlight_set(locomolcd_dev, 163, 0, 148);
- break;
- case 3:
- locomo_frontlight_set(locomolcd_dev, 194, 0, 161);
- break;
- case 4:
- locomo_frontlight_set(locomolcd_dev, 194, 1, 161);
- break;
- default:
- return -ENODEV;
- }
- current_intensity = intensity;
- return 0;
-}
-
-static int locomolcd_get_intensity(struct backlight_device *bd)
-{
- return current_intensity;
-}
-
-static const struct backlight_ops locomobl_data = {
- .get_brightness = locomolcd_get_intensity,
- .update_status = locomolcd_set_intensity,
-};
-
-#ifdef CONFIG_PM_SLEEP
-static int locomolcd_suspend(struct device *dev)
-{
- locomolcd_flags |= LOCOMOLCD_SUSPENDED;
- locomolcd_set_intensity(locomolcd_bl_device);
- return 0;
-}
-
-static int locomolcd_resume(struct device *dev)
-{
- locomolcd_flags &= ~LOCOMOLCD_SUSPENDED;
- locomolcd_set_intensity(locomolcd_bl_device);
- return 0;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(locomolcd_pm_ops, locomolcd_suspend, locomolcd_resume);
-
-static int locomolcd_probe(struct locomo_dev *ldev)
-{
- struct backlight_properties props;
- unsigned long flags;
-
- local_irq_save(flags);
- locomolcd_dev = ldev;
-
- locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0);
-
- /*
- * the poodle_lcd_power function is called for the first time
- * from fs_initcall, which is before locomo is activated.
- * We need to recall poodle_lcd_power here
- */
- if (machine_is_poodle())
- locomolcd_power(1);
-
- local_irq_restore(flags);
-
- memset(&props, 0, sizeof(struct backlight_properties));
- props.type = BACKLIGHT_RAW;
- props.max_brightness = 4;
- locomolcd_bl_device = backlight_device_register("locomo-bl",
- &ldev->dev, NULL,
- &locomobl_data, &props);
-
- if (IS_ERR(locomolcd_bl_device))
- return PTR_ERR(locomolcd_bl_device);
-
- /* Set up frontlight so that screen is readable */
- locomolcd_bl_device->props.brightness = 2;
- locomolcd_set_intensity(locomolcd_bl_device);
-
- return 0;
-}
-
-static int locomolcd_remove(struct locomo_dev *dev)
-{
- unsigned long flags;
-
- locomolcd_bl_device->props.brightness = 0;
- locomolcd_bl_device->props.power = 0;
- locomolcd_set_intensity(locomolcd_bl_device);
-
- backlight_device_unregister(locomolcd_bl_device);
- local_irq_save(flags);
- locomolcd_dev = NULL;
- local_irq_restore(flags);
- return 0;
-}
-
-static struct locomo_driver poodle_lcd_driver = {
- .drv = {
- .name = "locomo-backlight",
- .pm = &locomolcd_pm_ops,
- },
- .devid = LOCOMO_DEVID_BACKLIGHT,
- .probe = locomolcd_probe,
- .remove = locomolcd_remove,
-};
-
-static int __init locomolcd_init(void)
-{
- return locomo_driver_register(&poodle_lcd_driver);
-}
-
-static void __exit locomolcd_exit(void)
-{
- locomo_driver_unregister(&poodle_lcd_driver);
-}
-
-module_init(locomolcd_init);
-module_exit(locomolcd_exit);
-
-MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@ucw.cz>");
-MODULE_DESCRIPTION("Collie LCD driver");
-MODULE_LICENSE("GPL");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (4 preceding siblings ...)
2014-10-28 0:02 ` [PATCH 07/15] video: backlight: drop old locomo bl/lcd driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-31 7:50 ` Linus Walleij
2014-10-28 0:02 ` [PATCH 10/15] ARM: pxa: poodle: use new LoCoMo driver Dmitry Eremin-Solenikov
` (4 subsequent siblings)
10 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
As new locomo driver properly supports SPARSE_IRQ, stop playing with
NR_IRQS on sa1100 (locomo was the last chip requiring NR_IRQ tricks).
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
arch/arm/mach-sa1100/include/mach/irqs.h | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 3790298..99e7202 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -68,22 +68,7 @@
#define IRQ_BOARD_START 49
#define IRQ_BOARD_END 65
-/*
- * Figure out the MAX IRQ number.
- *
- * Neponset, SA1111 and UCB1x00 are sparse IRQ aware, so can dynamically
- * allocate their IRQs above NR_IRQS.
- *
- * LoCoMo has 4 additional IRQs, but is not sparse IRQ aware, and so has
- * to be included in the NR_IRQS calculation.
- */
-#ifdef CONFIG_SHARP_LOCOMO
-#define NR_IRQS_LOCOMO 4
-#else
-#define NR_IRQS_LOCOMO 0
-#endif
-
#ifndef NR_IRQS
-#define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO)
+#define NR_IRQS IRQ_BOARD_START
#endif
-#define SA1100_NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO)
+#define SA1100_NR_IRQS IRQ_BOARD_START
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo
2014-10-28 0:02 ` [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
@ 2014-10-31 7:50 ` Linus Walleij
2014-10-31 9:33 ` Dmitry Eremin-Solenikov
0 siblings, 1 reply; 52+ messages in thread
From: Linus Walleij @ 2014-10-31 7:50 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
Linux Input, linux-leds@vger.kernel.org,
linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org, Andrea Adami, Russell King,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo
On Tue, Oct 28, 2014 at 1:02 AM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> As new locomo driver properly supports SPARSE_IRQ, stop playing with
> NR_IRQS on sa1100 (locomo was the last chip requiring NR_IRQ tricks).
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
That's right! By moving to irqdomain things get even better :)
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo
2014-10-31 7:50 ` Linus Walleij
@ 2014-10-31 9:33 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-31 9:33 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
Linux Input, linux-leds@vger.kernel.org,
linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org, Andrea Adami, Russell King,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo
2014-10-31 10:50 GMT+03:00 Linus Walleij <linus.walleij@linaro.org>:
> On Tue, Oct 28, 2014 at 1:02 AM, Dmitry Eremin-Solenikov
> <dbaryshkov@gmail.com> wrote:
>
>> As new locomo driver properly supports SPARSE_IRQ, stop playing with
>> NR_IRQS on sa1100 (locomo was the last chip requiring NR_IRQ tricks).
>>
>> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
>
> That's right! By moving to irqdomain things get even better :)
That is a separate topic in my repo. I'll push that after finishing with LoCoMo.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 10/15] ARM: pxa: poodle: use new LoCoMo driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (5 preceding siblings ...)
2014-10-28 0:02 ` [PATCH 09/15] ARM: sa1100: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-28 0:02 ` [PATCH 11/15] sound: soc: poodle: make use of new locomo GPIO interface Dmitry Eremin-Solenikov
` (3 subsequent siblings)
10 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Convert poodle to use new mfd-based LoCoMo driver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
arch/arm/mach-pxa/Kconfig | 1 -
arch/arm/mach-pxa/include/mach/poodle.h | 14 +++++++++-----
arch/arm/mach-pxa/poodle.c | 19 +++++++++++++++----
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e6690a4..1da3e8f 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -473,7 +473,6 @@ config MACH_POODLE
bool "Enable Sharp SL-5600 (Poodle) Support"
depends on PXA_SHARPSL
select PXA25x
- select SHARP_LOCOMO
config MACH_CORGI
bool "Enable Sharp SL-C700 (Corgi) Support"
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index b56b193..e8eb51e 100644
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -81,11 +81,15 @@
#define POODLE_GPIO_L_LCLK (POODLE_SCOOP_GPIO_BASE + 10)
#define POODLE_GPIO_HS_OUT (POODLE_SCOOP_GPIO_BASE + 11)
-#define POODLE_LOCOMO_GPIO_AMP_ON LOCOMO_GPIO(8)
-#define POODLE_LOCOMO_GPIO_MUTE_L LOCOMO_GPIO(10)
-#define POODLE_LOCOMO_GPIO_MUTE_R LOCOMO_GPIO(11)
-#define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12)
-#define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13)
+#define POODLE_LOCOMO_GPIO_BASE (PXA_NR_BUILTIN_GPIO + 12)
+#define POODLE_GPIO_LCD_VSHA_ON (POODLE_LOCOMO_GPIO_BASE + 4)
+#define POODLE_GPIO_LCD_VSHD_ON (POODLE_LOCOMO_GPIO_BASE + 5)
+#define POODLE_GPIO_LCD_VEE_ON (POODLE_LOCOMO_GPIO_BASE + 6)
+#define POODLE_GPIO_LCD_MOD (POODLE_LOCOMO_GPIO_BASE + 7)
+#define POODLE_GPIO_AMP_ON (POODLE_LOCOMO_GPIO_BASE + 8)
+#define POODLE_GPIO_FL_VR (POODLE_LOCOMO_GPIO_BASE + 9)
+#define POODLE_GPIO_MUTE_L (POODLE_LOCOMO_GPIO_BASE + 10)
+#define POODLE_GPIO_MUTE_R (POODLE_LOCOMO_GPIO_BASE + 11)
#define POODLE_NR_IRQS (IRQ_BOARD_START + 4) /* 4 for LoCoMo */
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 1319916..3041d83 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -30,6 +30,7 @@
#include <linux/spi/pxa2xx_spi.h>
#include <linux/mtd/sharpsl.h>
#include <linux/memblock.h>
+#include <linux/mfd/locomo.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -48,7 +49,6 @@
#include <linux/platform_data/video-pxafb.h>
#include <asm/hardware/scoop.h>
-#include <asm/hardware/locomo.h>
#include <asm/mach/sharpsl_param.h>
#include "generic.h"
@@ -178,7 +178,17 @@ static struct resource locomo_resources[] = {
};
static struct locomo_platform_data locomo_info = {
- .irq_base = IRQ_BOARD_START,
+ .gpio_data = {
+ .gpio_base = POODLE_LOCOMO_GPIO_BASE,
+ },
+ .bl_data = {
+ .comadj = 118,
+ .gpio_lcd_vsha_on = POODLE_GPIO_LCD_VSHA_ON,
+ .gpio_lcd_vshd_on = POODLE_GPIO_LCD_VSHD_ON,
+ .gpio_lcd_vee_on = POODLE_GPIO_LCD_VEE_ON,
+ .gpio_lcd_mod = POODLE_GPIO_LCD_MOD,
+ .gpio_fl_vr = POODLE_GPIO_FL_VR,
+ },
};
struct platform_device poodle_locomo_device = {
@@ -191,8 +201,6 @@ struct platform_device poodle_locomo_device = {
},
};
-EXPORT_SYMBOL(poodle_locomo_device);
-
#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
static struct pxa2xx_spi_master poodle_spi_info = {
.num_chipselect = 1,
@@ -444,6 +452,9 @@ static void __init poodle_init(void)
platform_scoop_config = &poodle_pcmcia_config;
+ if (sharpsl_param.comadj != -1)
+ locomo_info.bl_data.comadj = sharpsl_param.comadj;
+
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if (ret)
pr_warning("poodle: Unable to register LoCoMo device\n");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCH 11/15] sound: soc: poodle: make use of new locomo GPIO interface
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (6 preceding siblings ...)
2014-10-28 0:02 ` [PATCH 10/15] ARM: pxa: poodle: use new LoCoMo driver Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
[not found] ` <1414454528-24240-12-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
` (2 subsequent siblings)
10 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Since LoCoMo driver has been converted to provide proper gpiolib
interface, make poodle ASoC platform driver use gpiolib API.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
sound/soc/pxa/poodle.c | 51 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 21f3400..a593bff 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -20,12 +20,12 @@
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
+#include <linux/gpio.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
#include <asm/mach-types.h>
-#include <asm/hardware/locomo.h>
#include <mach/poodle.h>
#include <mach/audio.h>
@@ -48,16 +48,12 @@ static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
/* set up jack connection */
if (poodle_jack_func = POODLE_HP) {
/* set = unmute headphone */
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_L, 1);
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_R, 1);
+ gpio_set_value(POODLE_GPIO_MUTE_L, 1);
+ gpio_set_value(POODLE_GPIO_MUTE_R, 1);
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
} else {
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_L, 0);
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_R, 0);
+ gpio_set_value(POODLE_GPIO_MUTE_L, 0);
+ gpio_set_value(POODLE_GPIO_MUTE_R, 0);
snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
}
@@ -85,10 +81,8 @@ static int poodle_startup(struct snd_pcm_substream *substream)
static void poodle_shutdown(struct snd_pcm_substream *substream)
{
/* set = unmute headphone */
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_L, 1);
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_R, 1);
+ gpio_set_value(POODLE_GPIO_MUTE_L, 1);
+ gpio_set_value(POODLE_GPIO_MUTE_R, 1);
}
static int poodle_hw_params(struct snd_pcm_substream *substream,
@@ -178,12 +172,7 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol,
static int poodle_amp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event)
{
- if (SND_SOC_DAPM_EVENT_ON(event))
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_AMP_ON, 0);
- else
- locomo_gpio_write(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_AMP_ON, 1);
+ gpio_set_value(POODLE_GPIO_AMP_ON, !(SND_SOC_DAPM_EVENT_ON(event)));
return 0;
}
@@ -263,25 +252,32 @@ static struct snd_soc_card poodle = {
.num_dapm_routes = ARRAY_SIZE(poodle_audio_map),
};
+struct gpio poodle_gpios[] = {
+ { POODLE_GPIO_AMP_ON, GPIOF_OUT_INIT_HIGH, "Amplifier" },
+ { POODLE_GPIO_MUTE_L, GPIOF_OUT_INIT_LOW, "Mute left" },
+ { POODLE_GPIO_MUTE_R, GPIOF_OUT_INIT_LOW, "Mute right" },
+};
+
static int poodle_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &poodle;
int ret;
- locomo_gpio_set_dir(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_AMP_ON, 0);
- /* should we mute HP at startup - burning power ?*/
- locomo_gpio_set_dir(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_L, 0);
- locomo_gpio_set_dir(&poodle_locomo_device.dev,
- POODLE_LOCOMO_GPIO_MUTE_R, 0);
+ ret = gpio_request_array(poodle_gpios, ARRAY_SIZE(poodle_gpios));
+ if (ret) {
+ dev_err(&pdev->dev, "gpio_request_array() failed: %d\n",
+ ret);
+ return ret;
+ }
card->dev = &pdev->dev;
ret = snd_soc_register_card(card);
- if (ret)
+ if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
+ gpio_free_array(poodle_gpios, ARRAY_SIZE(poodle_gpios));
+ }
return ret;
}
@@ -290,6 +286,7 @@ static int poodle_remove(struct platform_device *pdev)
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
+ gpio_free_array(poodle_gpios, ARRAY_SIZE(poodle_gpios));
return 0;
}
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread[parent not found: <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* [PATCH 04/15] input: convert LoCoMo keyboard driver to use new locomo core
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2014-10-28 0:01 ` Dmitry Eremin-Solenikov
2014-10-28 0:09 ` Dmitry Torokhov
2014-10-28 0:02 ` [PATCH 08/15] ARM: sa1100: make collie use new locomo drivers Dmitry Eremin-Solenikov
` (3 subsequent siblings)
4 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:01 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
As LoCoMo is switching to new device model, adapt keyboard driver to
support new locomo core driver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/input/keyboard/Kconfig | 1 -
drivers/input/keyboard/locomokbd.c | 165 ++++++++++++++++++++-----------------
2 files changed, 91 insertions(+), 75 deletions(-)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index a3958c6..b660516 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -337,7 +337,6 @@ config KEYBOARD_LM8333
config KEYBOARD_LOCOMO
tristate "LoCoMo Keyboard Support"
- depends on SHARP_LOCOMO
help
Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index c94d610..c2fabf3 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -28,16 +28,10 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/interrupt.h>
-#include <linux/ioport.h>
-
-#include <asm/hardware/locomo.h>
-#include <asm/irq.h>
-
-MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
-MODULE_DESCRIPTION("LoCoMo keyboard driver");
-MODULE_LICENSE("GPL");
+#include <linux/io.h>
+#include <linux/mfd/locomo.h>
#define LOCOMOKBD_NUMKEYS 128
@@ -75,7 +69,8 @@ struct locomokbd {
struct input_dev *input;
char phys[32];
- unsigned long base;
+ void __iomem *base;
+ int irq;
spinlock_t lock;
struct timer_list timer;
@@ -84,37 +79,37 @@ struct locomokbd {
};
/* helper functions for reading the keyboard matrix */
-static inline void locomokbd_charge_all(unsigned long membase)
+static inline void locomokbd_charge_all(void __iomem *membase)
{
- locomo_writel(0x00FF, membase + LOCOMO_KSC);
+ writew(0x00FF, membase + LOCOMO_KSC);
}
-static inline void locomokbd_activate_all(unsigned long membase)
+static inline void locomokbd_activate_all(void __iomem *membase)
{
unsigned long r;
- locomo_writel(0, membase + LOCOMO_KSC);
- r = locomo_readl(membase + LOCOMO_KIC);
+ writew(0, membase + LOCOMO_KSC);
+ r = readw(membase + LOCOMO_KIC);
r &= 0xFEFF;
- locomo_writel(r, membase + LOCOMO_KIC);
+ writew(r, membase + LOCOMO_KIC);
}
-static inline void locomokbd_activate_col(unsigned long membase, int col)
+static inline void locomokbd_activate_col(void __iomem *membase, int col)
{
unsigned short nset;
unsigned short nbset;
nset = 0xFF & ~(1 << col);
nbset = (nset << 8) + nset;
- locomo_writel(nbset, membase + LOCOMO_KSC);
+ writew(nbset, membase + LOCOMO_KSC);
}
-static inline void locomokbd_reset_col(unsigned long membase, int col)
+static inline void locomokbd_reset_col(void __iomem *membase, int col)
{
unsigned short nbset;
nbset = ((0xFF & ~(1 << col)) << 8) + 0xFF;
- locomo_writel(nbset, membase + LOCOMO_KSC);
+ writew(nbset, membase + LOCOMO_KSC);
}
/*
@@ -129,7 +124,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
unsigned int row, col, rowd;
unsigned long flags;
unsigned int num_pressed;
- unsigned long membase = locomokbd->base;
+ void __iomem *membase = locomokbd->base;
spin_lock_irqsave(&locomokbd->lock, flags);
@@ -141,7 +136,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
locomokbd_activate_col(membase, col);
udelay(KB_DELAY);
- rowd = ~locomo_readl(membase + LOCOMO_KIB);
+ rowd = ~readw(membase + LOCOMO_KIB);
for (row = 0; row < KB_ROWS; row++) {
unsigned int scancode, pressed, key;
@@ -194,11 +189,11 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
struct locomokbd *locomokbd = dev_id;
u16 r;
- r = locomo_readl(locomokbd->base + LOCOMO_KIC);
+ r = readw(locomokbd->base + LOCOMO_KIC);
if ((r & 0x0001) = 0)
return IRQ_HANDLED;
- locomo_writel(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */
+ writew(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */
/** wait chattering delay **/
udelay(100);
@@ -222,8 +217,8 @@ static int locomokbd_open(struct input_dev *dev)
struct locomokbd *locomokbd = input_get_drvdata(dev);
u16 r;
- r = locomo_readl(locomokbd->base + LOCOMO_KIC) | 0x0010;
- locomo_writel(r, locomokbd->base + LOCOMO_KIC);
+ r = readw(locomokbd->base + LOCOMO_KIC) | 0x0010;
+ writew(r, locomokbd->base + LOCOMO_KIC);
return 0;
}
@@ -232,35 +227,39 @@ static void locomokbd_close(struct input_dev *dev)
struct locomokbd *locomokbd = input_get_drvdata(dev);
u16 r;
- r = locomo_readl(locomokbd->base + LOCOMO_KIC) & ~0x0010;
- locomo_writel(r, locomokbd->base + LOCOMO_KIC);
+ r = readw(locomokbd->base + LOCOMO_KIC) & ~0x0010;
+ writew(r, locomokbd->base + LOCOMO_KIC);
}
-static int locomokbd_probe(struct locomo_dev *dev)
+static int locomokbd_probe(struct platform_device *dev)
{
struct locomokbd *locomokbd;
struct input_dev *input_dev;
int i, err;
+ struct resource *res;
+
+ locomokbd = devm_kzalloc(&dev->dev, sizeof(struct locomokbd),
+ GFP_KERNEL);
+ if (!locomokbd)
+ return -ENOMEM;
- locomokbd = kzalloc(sizeof(struct locomokbd), GFP_KERNEL);
input_dev = input_allocate_device();
- if (!locomokbd || !input_dev) {
- err = -ENOMEM;
- goto err_free_mem;
- }
+ if (!input_dev)
+ return -ENOMEM;
- /* try and claim memory region */
- if (!request_mem_region((unsigned long) dev->mapbase,
- dev->length,
- LOCOMO_DRIVER_NAME(dev))) {
- err = -EBUSY;
- printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n");
- goto err_free_mem;
- }
+ res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
- locomo_set_drvdata(dev, locomokbd);
+ locomokbd->irq = platform_get_irq(dev, 0);
+ if (locomokbd->irq < 0)
+ return -ENXIO;
- locomokbd->base = (unsigned long) dev->mapbase;
+ platform_set_drvdata(dev, locomokbd);
+
+ locomokbd->base = devm_ioremap_resource(&dev->dev, res);
+ if (IS_ERR(locomokbd->base))
+ return PTR_ERR(locomokbd->base);
spin_lock_init(&locomokbd->lock);
@@ -296,11 +295,15 @@ static int locomokbd_probe(struct locomo_dev *dev)
set_bit(locomokbd->keycode[i], input_dev->keybit);
clear_bit(0, input_dev->keybit);
+ writew(0, locomokbd->base + LOCOMO_KEYBOARD + LOCOMO_KIC);
+ writew(0, locomokbd->base + LOCOMO_KEYBOARD + LOCOMO_KIC);
+
/* attempt to get the interrupt */
- err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
+ err = request_irq(locomokbd->irq, locomokbd_interrupt, 0,
+ "locomokbd", locomokbd);
if (err) {
printk(KERN_ERR "locomokbd: Can't get irq for keyboard\n");
- goto err_release_region;
+ goto err_free_mem;
}
err = input_register_device(locomokbd->input);
@@ -309,54 +312,68 @@ static int locomokbd_probe(struct locomo_dev *dev)
return 0;
- err_free_irq:
- free_irq(dev->irq[0], locomokbd);
- err_release_region:
- release_mem_region((unsigned long) dev->mapbase, dev->length);
- locomo_set_drvdata(dev, NULL);
- err_free_mem:
+err_free_irq:
+ free_irq(locomokbd->irq, locomokbd);
+err_free_mem:
+ platform_set_drvdata(dev, NULL);
input_free_device(input_dev);
- kfree(locomokbd);
return err;
}
-static int locomokbd_remove(struct locomo_dev *dev)
+static int locomokbd_remove(struct platform_device *dev)
{
- struct locomokbd *locomokbd = locomo_get_drvdata(dev);
+ struct locomokbd *locomokbd = platform_get_drvdata(dev);
- free_irq(dev->irq[0], locomokbd);
+ free_irq(locomokbd->irq, locomokbd);
del_timer_sync(&locomokbd->timer);
input_unregister_device(locomokbd->input);
- locomo_set_drvdata(dev, NULL);
+ platform_set_drvdata(dev, NULL);
+
+ return 0;
+}
- release_mem_region((unsigned long) dev->mapbase, dev->length);
+#ifdef CONFIG_PM_SLEEP
+static int locomokbd_resume(struct device *dev)
+{
+ struct locomokbd *locomokbd = dev_get_drvdata(dev);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&locomokbd->lock, flags);
+
+ writew(0, locomokbd->base + LOCOMO_KSC);
+ r = readw(locomokbd->base + LOCOMO_KIC);
+ r &= 0xFEFF;
+ writew(r, locomokbd->base + LOCOMO_KIC);
+ writew(0x1, locomokbd->base + LOCOMO_KCMD);
- kfree(locomokbd);
+ spin_unlock_irqrestore(&locomokbd->lock, flags);
return 0;
}
-static struct locomo_driver keyboard_driver = {
- .drv = {
- .name = "locomokbd"
+static SIMPLE_DEV_PM_OPS(locomo_kbd_pm, NULL, locomokbd_resume);
+#define LOCOMO_KBD_PM (&locomo_kbd_pm)
+#else
+#define LOCOMO_KBD_PM NULL
+#endif
+
+static struct platform_driver locomokbd_driver = {
+ .driver = {
+ .name = "locomo-kbd",
+ .owner = THIS_MODULE,
+ .pm = LOCOMO_KBD_PM,
},
- .devid = LOCOMO_DEVID_KEYBOARD,
.probe = locomokbd_probe,
.remove = locomokbd_remove,
};
-static int __init locomokbd_init(void)
-{
- return locomo_driver_register(&keyboard_driver);
-}
-
-static void __exit locomokbd_exit(void)
-{
- locomo_driver_unregister(&keyboard_driver);
-}
+module_platform_driver(locomokbd_driver);
-module_init(locomokbd_init);
-module_exit(locomokbd_exit);
+MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
+MODULE_DESCRIPTION("LoCoMo keyboard driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:locomo-kbd");
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 04/15] input: convert LoCoMo keyboard driver to use new locomo core
2014-10-28 0:01 ` [PATCH 04/15] input: convert LoCoMo keyboard driver to use new locomo core Dmitry Eremin-Solenikov
@ 2014-10-28 0:09 ` Dmitry Torokhov
0 siblings, 0 replies; 52+ messages in thread
From: Dmitry Torokhov @ 2014-10-28 0:09 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel, Andrea Adami, Russell King, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Linus Walleij, Alexandre Courbot,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
On Tue, Oct 28, 2014 at 03:01:57AM +0300, Dmitry Eremin-Solenikov wrote:
> As LoCoMo is switching to new device model, adapt keyboard driver to
> support new locomo core driver.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> drivers/input/keyboard/Kconfig | 1 -
> drivers/input/keyboard/locomokbd.c | 165 ++++++++++++++++++++-----------------
> 2 files changed, 91 insertions(+), 75 deletions(-)
>
> diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
> index a3958c6..b660516 100644
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@ -337,7 +337,6 @@ config KEYBOARD_LM8333
>
> config KEYBOARD_LOCOMO
> tristate "LoCoMo Keyboard Support"
> - depends on SHARP_LOCOMO
> help
> Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
>
> diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
> index c94d610..c2fabf3 100644
> --- a/drivers/input/keyboard/locomokbd.c
> +++ b/drivers/input/keyboard/locomokbd.c
> @@ -28,16 +28,10 @@
> #include <linux/init.h>
> #include <linux/input.h>
> #include <linux/delay.h>
> -#include <linux/device.h>
> +#include <linux/platform_device.h>
> #include <linux/interrupt.h>
> -#include <linux/ioport.h>
> -
> -#include <asm/hardware/locomo.h>
> -#include <asm/irq.h>
> -
> -MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
> -MODULE_DESCRIPTION("LoCoMo keyboard driver");
> -MODULE_LICENSE("GPL");
> +#include <linux/io.h>
> +#include <linux/mfd/locomo.h>
>
> #define LOCOMOKBD_NUMKEYS 128
>
> @@ -75,7 +69,8 @@ struct locomokbd {
> struct input_dev *input;
> char phys[32];
>
> - unsigned long base;
> + void __iomem *base;
> + int irq;
> spinlock_t lock;
>
> struct timer_list timer;
> @@ -84,37 +79,37 @@ struct locomokbd {
> };
>
> /* helper functions for reading the keyboard matrix */
> -static inline void locomokbd_charge_all(unsigned long membase)
> +static inline void locomokbd_charge_all(void __iomem *membase)
> {
> - locomo_writel(0x00FF, membase + LOCOMO_KSC);
> + writew(0x00FF, membase + LOCOMO_KSC);
> }
>
> -static inline void locomokbd_activate_all(unsigned long membase)
> +static inline void locomokbd_activate_all(void __iomem *membase)
> {
> unsigned long r;
>
> - locomo_writel(0, membase + LOCOMO_KSC);
> - r = locomo_readl(membase + LOCOMO_KIC);
> + writew(0, membase + LOCOMO_KSC);
> + r = readw(membase + LOCOMO_KIC);
> r &= 0xFEFF;
> - locomo_writel(r, membase + LOCOMO_KIC);
> + writew(r, membase + LOCOMO_KIC);
> }
>
> -static inline void locomokbd_activate_col(unsigned long membase, int col)
> +static inline void locomokbd_activate_col(void __iomem *membase, int col)
> {
> unsigned short nset;
> unsigned short nbset;
>
> nset = 0xFF & ~(1 << col);
> nbset = (nset << 8) + nset;
> - locomo_writel(nbset, membase + LOCOMO_KSC);
> + writew(nbset, membase + LOCOMO_KSC);
> }
>
> -static inline void locomokbd_reset_col(unsigned long membase, int col)
> +static inline void locomokbd_reset_col(void __iomem *membase, int col)
> {
> unsigned short nbset;
>
> nbset = ((0xFF & ~(1 << col)) << 8) + 0xFF;
> - locomo_writel(nbset, membase + LOCOMO_KSC);
> + writew(nbset, membase + LOCOMO_KSC);
> }
>
> /*
> @@ -129,7 +124,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
> unsigned int row, col, rowd;
> unsigned long flags;
> unsigned int num_pressed;
> - unsigned long membase = locomokbd->base;
> + void __iomem *membase = locomokbd->base;
>
> spin_lock_irqsave(&locomokbd->lock, flags);
>
> @@ -141,7 +136,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
> locomokbd_activate_col(membase, col);
> udelay(KB_DELAY);
>
> - rowd = ~locomo_readl(membase + LOCOMO_KIB);
> + rowd = ~readw(membase + LOCOMO_KIB);
> for (row = 0; row < KB_ROWS; row++) {
> unsigned int scancode, pressed, key;
>
> @@ -194,11 +189,11 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
> struct locomokbd *locomokbd = dev_id;
> u16 r;
>
> - r = locomo_readl(locomokbd->base + LOCOMO_KIC);
> + r = readw(locomokbd->base + LOCOMO_KIC);
> if ((r & 0x0001) = 0)
> return IRQ_HANDLED;
>
> - locomo_writel(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */
> + writew(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */
>
> /** wait chattering delay **/
> udelay(100);
> @@ -222,8 +217,8 @@ static int locomokbd_open(struct input_dev *dev)
> struct locomokbd *locomokbd = input_get_drvdata(dev);
> u16 r;
>
> - r = locomo_readl(locomokbd->base + LOCOMO_KIC) | 0x0010;
> - locomo_writel(r, locomokbd->base + LOCOMO_KIC);
> + r = readw(locomokbd->base + LOCOMO_KIC) | 0x0010;
> + writew(r, locomokbd->base + LOCOMO_KIC);
> return 0;
> }
>
> @@ -232,35 +227,39 @@ static void locomokbd_close(struct input_dev *dev)
> struct locomokbd *locomokbd = input_get_drvdata(dev);
> u16 r;
>
> - r = locomo_readl(locomokbd->base + LOCOMO_KIC) & ~0x0010;
> - locomo_writel(r, locomokbd->base + LOCOMO_KIC);
> + r = readw(locomokbd->base + LOCOMO_KIC) & ~0x0010;
> + writew(r, locomokbd->base + LOCOMO_KIC);
> }
>
> -static int locomokbd_probe(struct locomo_dev *dev)
> +static int locomokbd_probe(struct platform_device *dev)
> {
> struct locomokbd *locomokbd;
> struct input_dev *input_dev;
> int i, err;
> + struct resource *res;
> +
> + locomokbd = devm_kzalloc(&dev->dev, sizeof(struct locomokbd),
> + GFP_KERNEL);
> + if (!locomokbd)
> + return -ENOMEM;
>
> - locomokbd = kzalloc(sizeof(struct locomokbd), GFP_KERNEL);
> input_dev = input_allocate_device();
> - if (!locomokbd || !input_dev) {
> - err = -ENOMEM;
> - goto err_free_mem;
> - }
> + if (!input_dev)
> + return -ENOMEM;
>
> - /* try and claim memory region */
> - if (!request_mem_region((unsigned long) dev->mapbase,
> - dev->length,
> - LOCOMO_DRIVER_NAME(dev))) {
> - err = -EBUSY;
> - printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n");
> - goto err_free_mem;
> - }
> + res = platform_get_resource(dev, IORESOURCE_MEM, 0);
> + if (!res)
> + return -ENODEV;
>
> - locomo_set_drvdata(dev, locomokbd);
> + locomokbd->irq = platform_get_irq(dev, 0);
> + if (locomokbd->irq < 0)
> + return -ENXIO;
>
> - locomokbd->base = (unsigned long) dev->mapbase;
> + platform_set_drvdata(dev, locomokbd);
> +
> + locomokbd->base = devm_ioremap_resource(&dev->dev, res);
> + if (IS_ERR(locomokbd->base))
> + return PTR_ERR(locomokbd->base);
You are leaking memory (input device) here. Since you can't convert all
resources to devm* I'd rather you leave them all explicitly managed
instead of having a mix.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 08/15] ARM: sa1100: make collie use new locomo drivers
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-10-28 0:01 ` [PATCH 04/15] input: convert LoCoMo keyboard driver to use new locomo core Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-28 0:02 ` [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
` (2 subsequent siblings)
4 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
Switch collie to new mfd-based locomo driver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
arch/arm/mach-sa1100/Kconfig | 1 -
arch/arm/mach-sa1100/collie.c | 112 +++++++++++++++--------------
arch/arm/mach-sa1100/include/mach/collie.h | 25 ++++++-
3 files changed, 79 insertions(+), 59 deletions(-)
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index c6f6ed1..37af126 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -48,7 +48,6 @@ endchoice
config SA1100_COLLIE
bool "Sharp Zaurus SL5500"
# FIXME: select ARM_SA11x0_CPUFREQ
- select SHARP_LOCOMO
select SHARP_PARAM
select SHARP_SCOOP
help
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 108939f..43d3291 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -24,6 +24,7 @@
#include <linux/platform_data/sa11x0-serial.h>
#include <linux/platform_device.h>
#include <linux/mfd/ucb1x00.h>
+#include <linux/mfd/locomo.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/timer.h>
@@ -47,7 +48,6 @@
#include <asm/hardware/scoop.h>
#include <asm/mach/sharpsl_param.h>
-#include <asm/hardware/locomo.h>
#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/irqs.h>
@@ -189,36 +189,54 @@ static struct platform_device collie_power_device = {
.num_resources = ARRAY_SIZE(collie_power_resource),
};
-#ifdef CONFIG_SHARP_LOCOMO
/*
* low-level UART features.
*/
-struct platform_device collie_locomo_device;
+static struct gpio collie_uart_gpio[] = {
+ { COLLIE_GPIO_CTS, GPIOF_IN, "CTS" },
+ { COLLIE_GPIO_RTS, GPIOF_OUT_INIT_LOW, "RTS" },
+ { COLLIE_GPIO_DTR, GPIOF_OUT_INIT_LOW, "DTR" },
+ { COLLIE_GPIO_DSR, GPIOF_IN, "DSR" },
+};
+
+static bool collie_uart_gpio_ok;
static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
{
- if (mctrl & TIOCM_RTS)
- locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0);
- else
- locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1);
-
- if (mctrl & TIOCM_DTR)
- locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0);
- else
- locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1);
+ if (!collie_uart_gpio_ok) {
+ int rc = gpio_request_array(collie_uart_gpio,
+ ARRAY_SIZE(collie_uart_gpio));
+ if (rc)
+ pr_err("collie_uart_set_mctrl: gpio request %d\n", rc);
+ else
+ collie_uart_gpio_ok = true;
+ }
+
+ if (collie_uart_gpio_ok) {
+ gpio_set_value(COLLIE_GPIO_RTS, !(mctrl & TIOCM_RTS));
+ gpio_set_value(COLLIE_GPIO_DTR, !(mctrl & TIOCM_DTR));
+ }
}
static u_int collie_uart_get_mctrl(struct uart_port *port)
{
int ret = TIOCM_CD;
- unsigned int r;
- r = locomo_gpio_read_output(&collie_locomo_device.dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
- if (r = -ENODEV)
+ if (!collie_uart_gpio_ok) {
+ int rc = gpio_request_array(collie_uart_gpio,
+ ARRAY_SIZE(collie_uart_gpio));
+ if (rc)
+ pr_err("collie_uart_get_mctrl: gpio request %d\n", rc);
+ else
+ collie_uart_gpio_ok = true;
+ }
+
+ if (!collie_uart_gpio_ok)
return ret;
- if (r & LOCOMO_GPIO_CTS)
+
+ if (gpio_get_value(COLLIE_GPIO_CTS))
ret |= TIOCM_CTS;
- if (r & LOCOMO_GPIO_DSR)
+ if (gpio_get_value(COLLIE_GPIO_DSR))
ret |= TIOCM_DSR;
return ret;
@@ -229,33 +247,6 @@ static struct sa1100_port_fns collie_port_fns __initdata = {
.get_mctrl = collie_uart_get_mctrl,
};
-static int collie_uart_probe(struct locomo_dev *dev)
-{
- return 0;
-}
-
-static int collie_uart_remove(struct locomo_dev *dev)
-{
- return 0;
-}
-
-static struct locomo_driver collie_uart_driver = {
- .drv = {
- .name = "collie_uart",
- },
- .devid = LOCOMO_DEVID_UART,
- .probe = collie_uart_probe,
- .remove = collie_uart_remove,
-};
-
-static int __init collie_uart_init(void)
-{
- return locomo_driver_register(&collie_uart_driver);
-}
-device_initcall(collie_uart_init);
-
-#endif
-
static struct resource locomo_resources[] = {
[0] = DEFINE_RES_MEM(0x40000000, SZ_8K),
@@ -263,14 +254,28 @@ static struct resource locomo_resources[] = {
};
static struct locomo_platform_data locomo_info = {
- .irq_base = IRQ_BOARD_START,
+ .gpio_data = {
+ .gpio_base = COLLIE_LOCOMO_GPIO_BASE,
+ },
+ .lcd_data = {
+ .comadj = 128,
+ .gpio_lcd_vsha_on = COLLIE_GPIO_LCD_VSHA_ON,
+ .gpio_lcd_vshd_on = COLLIE_GPIO_LCD_VSHD_ON,
+ .gpio_lcd_vee_on = COLLIE_GPIO_LCD_VEE_ON,
+ .gpio_lcd_mod = COLLIE_GPIO_LCD_MOD,
+ },
+ .bl_data = {
+ .gpio_fl_vr = COLLIE_GPIO_FL_VR,
+ },
+ .gpio_amp1_on = COLLIE_GPIO_AMP1_ON,
+ .gpio_amp2_on = COLLIE_GPIO_AMP2_ON,
};
-struct platform_device collie_locomo_device = {
+static struct platform_device collie_locomo_device = {
.name = "locomo",
.id = 0,
.dev = {
- .platform_data = &locomo_info,
+ .platform_data = &locomo_info,
},
.num_resources = ARRAY_SIZE(locomo_resources),
.resource = locomo_resources,
@@ -385,10 +390,6 @@ static struct sa1100fb_mach_info collie_lcd_info = {
.lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
.lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
-
-#ifdef CONFIG_BACKLIGHT_LOCOMO
- .lcd_power = locomolcd_power
-#endif
};
static void __init collie_init(void)
@@ -420,6 +421,8 @@ static void __init collie_init(void)
GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
+ sharpsl_save_param();
+
collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN);
collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN);
@@ -428,6 +431,9 @@ static void __init collie_init(void)
platform_scoop_config = &collie_pcmcia_config;
+ if (sharpsl_param.comadj != -1)
+ locomo_info.lcd_data.comadj = sharpsl_param.comadj;
+
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if (ret) {
printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");
@@ -438,8 +444,6 @@ static void __init collie_init(void)
ARRAY_SIZE(collie_flash_resources));
sa11x0_register_mcp(&collie_mcp_data);
sa11x0_register_irda(&collie_ir_data);
-
- sharpsl_save_param();
}
static struct map_desc collie_io_desc[] __initdata = {
@@ -461,9 +465,7 @@ static void __init collie_map_io(void)
sa1100_map_io();
iotable_init(collie_io_desc, ARRAY_SIZE(collie_io_desc));
-#ifdef CONFIG_SHARP_LOCOMO
sa1100_register_uart_fns(&collie_port_fns);
-#endif
sa1100_register_uart(0, 3);
sa1100_register_uart(1, 1);
}
diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
index b478ca1..22a7c7e 100644
--- a/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/arch/arm/mach-sa1100/include/mach/collie.h
@@ -24,12 +24,12 @@ extern void locomolcd_power(int on);
#define COLLIE_SCP_MUTE_L SCOOP_GPCR_PA14
#define COLLIE_SCP_MUTE_R SCOOP_GPCR_PA15
#define COLLIE_SCP_5VON SCOOP_GPCR_PA16
-#define COLLIE_SCP_AMP_ON SCOOP_GPCR_PA17
+#define COLLIE_GPIO_AMP2_ON (COLLIE_SCOOP_GPIO_BASE + 6)
#define COLLIE_GPIO_VPEN (COLLIE_SCOOP_GPIO_BASE + 7)
#define COLLIE_SCP_LB_VOL_CHG SCOOP_GPCR_PA19
#define COLLIE_SCOOP_IO_DIR (COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
- COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | \
+ COLLIE_SCP_5VON | \
COLLIE_SCP_LB_VOL_CHG)
#define COLLIE_SCOOP_IO_OUT (COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R)
@@ -81,7 +81,7 @@ extern void locomolcd_power(int on);
#define COLLIE_TC35143_GPIO_TBL_CHK UCB_IO_1
#define COLLIE_TC35143_GPIO_VPEN_ON UCB_IO_2
#define COLLIE_GPIO_IR_ON (COLLIE_TC35143_GPIO_BASE + 3)
-#define COLLIE_TC35143_GPIO_AMP_ON UCB_IO_4
+#define COLLIE_GPIO_AMP1_ON (COLLIE_TC35143_GPIO_BASE + 4)
#define COLLIE_TC35143_GPIO_VERSION1 UCB_IO_5
#define COLLIE_TC35143_GPIO_FS8KLPF UCB_IO_5
#define COLLIE_TC35143_GPIO_BUZZER_BIAS UCB_IO_6
@@ -92,4 +92,23 @@ extern void locomolcd_power(int on);
#define COLLIE_TC35143_GPIO_OUT (UCB_IO_1 | UCB_IO_3 | UCB_IO_4 \
| UCB_IO_6)
+/* GPIOs on LoCoMo GA */
+#define COLLIE_LOCOMO_GPIO_BASE (GPIO_MAX + 23)
+#define COLLIE_GPIO_RTS (COLLIE_LOCOMO_GPIO_BASE + 0)
+#define COLLIE_GPIO_CTS (COLLIE_LOCOMO_GPIO_BASE + 1)
+#define COLLIE_GPIO_DSR (COLLIE_LOCOMO_GPIO_BASE + 2)
+#define COLLIE_GPIO_DTR (COLLIE_LOCOMO_GPIO_BASE + 3)
+#define COLLIE_GPIO_LCD_VSHA_ON (COLLIE_LOCOMO_GPIO_BASE + 4)
+#define COLLIE_GPIO_LCD_VSHD_ON (COLLIE_LOCOMO_GPIO_BASE + 5)
+#define COLLIE_GPIO_LCD_VEE_ON (COLLIE_LOCOMO_GPIO_BASE + 6)
+#define COLLIE_GPIO_LCD_MOD (COLLIE_LOCOMO_GPIO_BASE + 7)
+#define COLLIE_LOCOMO_GPIO_DAC_ON LOCOMO_GPIO(8)
+#define COLLIE_GPIO_FL_VR (COLLIE_LOCOMO_GPIO_BASE + 9)
+#define COLLIE_LOCOMO_GPIO_DAC_SDATA LOCOMO_GPIO(10)
+#define COLLIE_LOCOMO_GPIO_DAC_SCK LOCOMO_GPIO(11)
+#define COLLIE_LOCOMO_GPIO_DAC_SLOAD LOCOMO_GPIO(12)
+#define COLLIE_LOCOMO_GPIO_CARD_DETECT LOCOMO_GPIO(13)
+#define COLLIE_LOCOMO_GPIO_WRITE_PROT LOCOMO_GPIO(14)
+#define COLLIE_LOCOMO_GPIO_CARD_POWER LOCOMO_GPIO(15)
+
#endif
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-10-28 0:01 ` [PATCH 04/15] input: convert LoCoMo keyboard driver to use new locomo core Dmitry Eremin-Solenikov
2014-10-28 0:02 ` [PATCH 08/15] ARM: sa1100: make collie use new locomo drivers Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-28 19:13 ` Robert Jarzmik
2014-10-28 0:02 ` [PATCH 14/15] gpio: locomo: implement per-pin irq handling Dmitry Eremin-Solenikov
2014-10-28 0:02 ` [PATCH 15/15] spi: add locomo SPI driver Dmitry Eremin-Solenikov
4 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
As new locomo driver supports SPARSE_IRQ, don't preallocate NR_IRQS
space for it on poodle.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
arch/arm/mach-pxa/include/mach/poodle.h | 2 +-
arch/arm/mach-pxa/poodle.c | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index e8eb51e..105410a 100644
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -91,7 +91,7 @@
#define POODLE_GPIO_MUTE_L (POODLE_LOCOMO_GPIO_BASE + 10)
#define POODLE_GPIO_MUTE_R (POODLE_LOCOMO_GPIO_BASE + 11)
-#define POODLE_NR_IRQS (IRQ_BOARD_START + 4) /* 4 for LoCoMo */
+#define POODLE_NR_IRQS IRQ_BOARD_START
extern struct platform_device poodle_locomo_device;
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 3041d83..97eced9 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -181,14 +181,18 @@ static struct locomo_platform_data locomo_info = {
.gpio_data = {
.gpio_base = POODLE_LOCOMO_GPIO_BASE,
},
- .bl_data = {
+ .lcd_data = {
.comadj = 118,
.gpio_lcd_vsha_on = POODLE_GPIO_LCD_VSHA_ON,
.gpio_lcd_vshd_on = POODLE_GPIO_LCD_VSHD_ON,
.gpio_lcd_vee_on = POODLE_GPIO_LCD_VEE_ON,
.gpio_lcd_mod = POODLE_GPIO_LCD_MOD,
+ },
+ .bl_data = {
.gpio_fl_vr = POODLE_GPIO_FL_VR,
},
+ .gpio_amp1_on = -1,
+ .gpio_amp2_on = -1,
};
struct platform_device poodle_locomo_device = {
@@ -453,7 +457,7 @@ static void __init poodle_init(void)
platform_scoop_config = &poodle_pcmcia_config;
if (sharpsl_param.comadj != -1)
- locomo_info.bl_data.comadj = sharpsl_param.comadj;
+ locomo_info.lcd_data.comadj = sharpsl_param.comadj;
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if (ret)
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo
2014-10-28 0:02 ` [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
@ 2014-10-28 19:13 ` Robert Jarzmik
0 siblings, 0 replies; 52+ messages in thread
From: Robert Jarzmik @ 2014-10-28 19:13 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: Alexandre Courbot, linux-fbdev, Bryan Wu, Russell King,
Samuel Ortiz, Liam Girdwood, Linus Walleij, Dmitry Torokhov,
alsa-devel, Haojian Zhuang, linux-spi, linux-gpio, Mark Brown,
Andrea Adami, linux-arm-kernel, linux-input, Jingoo Han,
Daniel Mack, Lee Jones, Richard Purdie, linux-leds
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> writes:
...zip...
> diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
> index 3041d83..97eced9 100644
> --- a/arch/arm/mach-pxa/poodle.c
> +++ b/arch/arm/mach-pxa/poodle.c
> @@ -181,14 +181,18 @@ static struct locomo_platform_data locomo_info = {
> .gpio_data = {
> .gpio_base = POODLE_LOCOMO_GPIO_BASE,
> },
> - .bl_data = {
> + .lcd_data = {
Is that part really belonging to that patch ? It seems to me that this changes
the code included in patch 10/15 "ARM: pxa: poodle: use new LoCoMo
driver".
Therefore I'm wondering if I take the serie, halt it at patch 10, and try to
compile I would succeed ... I think I wouldn't.
> + },
> + .bl_data = {
> .gpio_fl_vr = POODLE_GPIO_FL_VR,
> },
Ditto.
> + .gpio_amp1_on = -1,
> + .gpio_amp2_on = -1,
This won't prevent compilation, but is it the target of this patch which is IRQ
space oriented ?
> @@ -453,7 +457,7 @@ static void __init poodle_init(void)
> platform_scoop_config = &poodle_pcmcia_config;
>
> if (sharpsl_param.comadj != -1)
> - locomo_info.bl_data.comadj = sharpsl_param.comadj;
> + locomo_info.lcd_data.comadj = sharpsl_param.comadj;
Ditto.
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 14/15] gpio: locomo: implement per-pin irq handling
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
` (2 preceding siblings ...)
2014-10-28 0:02 ` [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
2014-10-31 8:00 ` Linus Walleij
2014-10-28 0:02 ` [PATCH 15/15] spi: add locomo SPI driver Dmitry Eremin-Solenikov
4 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
LoCoMo has a possibility to generate per-GPIO edge irqs. Support for
that was there in old locomo driver, got 'cleaned up' during old driver
IRQ cascading cleanup and is now reimplemented. It is expected that
SL-5500 (collie) will use locomo gpio irqs for mmc detection irq.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/gpio/gpio-locomo.c | 158 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 158 insertions(+)
diff --git a/drivers/gpio/gpio-locomo.c b/drivers/gpio/gpio-locomo.c
index 3b54b07..6ef0fc4 100644
--- a/drivers/gpio/gpio-locomo.c
+++ b/drivers/gpio/gpio-locomo.c
@@ -18,13 +18,18 @@
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/spinlock.h>
+#include <linux/irq.h>
#include <linux/mfd/locomo.h>
+#define LOCOMO_GPIO_NR_IRQS 16
+
struct locomo_gpio {
void __iomem *regs;
+ int irq;
spinlock_t lock;
struct gpio_chip gpio;
+ int irq_base;
u16 rising_edge;
u16 falling_edge;
@@ -114,6 +119,148 @@ static int locomo_gpio_direction_output(struct gpio_chip *chip,
return 0;
}
+static int locomo_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+ struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
+
+ return lg->irq_base + offset;
+}
+
+static void
+locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
+{
+ u16 req;
+ struct locomo_gpio *lg = irq_get_handler_data(irq);
+ int i = lg->irq_base;
+
+ req = readw(lg->regs + LOCOMO_GIR) &
+ readw(lg->regs + LOCOMO_GPD);
+
+ while (req) {
+ if (req & 1)
+ generic_handle_irq(i);
+ req >>= 1;
+ i++;
+ }
+}
+
+static void locomo_gpio_ack_irq(struct irq_data *d)
+{
+ struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ r = readw(lg->regs + LOCOMO_GWE);
+ r |= (0x0001 << (d->irq - lg->irq_base));
+ writew(r, lg->regs + LOCOMO_GWE);
+
+ r = readw(lg->regs + LOCOMO_GIS);
+ r &= ~(0x0001 << (d->irq - lg->irq_base));
+ writew(r, lg->regs + LOCOMO_GIS);
+
+ r = readw(lg->regs + LOCOMO_GWE);
+ r &= ~(0x0001 << (d->irq - lg->irq_base));
+ writew(r, lg->regs + LOCOMO_GWE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+}
+
+static void locomo_gpio_mask_irq(struct irq_data *d)
+{
+ struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ r = readw(lg->regs + LOCOMO_GIE);
+ r &= ~(0x0001 << (d->irq - lg->irq_base));
+ writew(r, lg->regs + LOCOMO_GIE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+}
+
+static void locomo_gpio_unmask_irq(struct irq_data *d)
+{
+ struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
+ unsigned long flags;
+ u16 r;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ r = readw(lg->regs + LOCOMO_GIE);
+ r |= (0x0001 << (d->irq - lg->irq_base));
+ writew(r, lg->regs + LOCOMO_GIE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+}
+
+static int locomo_gpio_type(struct irq_data *d, unsigned int type)
+{
+ unsigned int mask;
+ struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
+ unsigned long flags;
+
+ mask = 1 << (d->irq - lg->irq_base);
+
+ if (type = IRQ_TYPE_PROBE) {
+ if ((lg->rising_edge | lg->falling_edge) & mask)
+ return 0;
+ type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
+ }
+
+ if (type & IRQ_TYPE_EDGE_RISING)
+ lg->rising_edge |= mask;
+ else
+ lg->rising_edge &= ~mask;
+ if (type & IRQ_TYPE_EDGE_FALLING)
+ lg->falling_edge |= mask;
+ else
+ lg->falling_edge &= ~mask;
+
+ spin_lock_irqsave(&lg->lock, flags);
+
+ writew(lg->rising_edge, lg->regs + LOCOMO_GRIE);
+ writew(lg->falling_edge, lg->regs + LOCOMO_GFIE);
+
+ spin_unlock_irqrestore(&lg->lock, flags);
+
+ return 0;
+}
+
+static struct irq_chip locomo_gpio_chip = {
+ .name = "LOCOMO-gpio",
+ .irq_ack = locomo_gpio_ack_irq,
+ .irq_mask = locomo_gpio_mask_irq,
+ .irq_unmask = locomo_gpio_unmask_irq,
+ .irq_set_type = locomo_gpio_type,
+};
+
+static void locomo_gpio_setup_irq(struct locomo_gpio *lg)
+{
+ int irq;
+
+ lg->irq_base = irq_alloc_descs(-1, 0, LOCOMO_GPIO_NR_IRQS, -1);
+
+ /* Install handlers for IRQ_LOCOMO_* */
+ for (irq = lg->irq_base;
+ irq < lg->irq_base + LOCOMO_GPIO_NR_IRQS;
+ irq++) {
+ irq_set_chip_and_handler(irq, &locomo_gpio_chip,
+ handle_edge_irq);
+ irq_set_chip_data(irq, lg);
+ set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ }
+
+ /*
+ * Install handler for IRQ_LOCOMO_HW.
+ */
+ irq_set_handler_data(lg->irq, lg);
+ irq_set_chained_handler(lg->irq, locomo_gpio_handler);
+}
+
#ifdef CONFIG_PM_SLEEP
static int locomo_gpio_suspend(struct device *dev)
{
@@ -169,6 +316,10 @@ static int locomo_gpio_probe(struct platform_device *pdev)
if (!lg)
return -ENOMEM;
+ lg->irq = platform_get_irq(pdev, 0);
+ if (lg->irq < 0)
+ return -ENXIO;
+
lg->regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(lg->regs))
return PTR_ERR(lg->regs);
@@ -189,11 +340,14 @@ static int locomo_gpio_probe(struct platform_device *pdev)
lg->gpio.get = locomo_gpio_get;
lg->gpio.direction_input = locomo_gpio_direction_input;
lg->gpio.direction_output = locomo_gpio_direction_output;
+ lg->gpio.to_irq = locomo_gpio_to_irq;
ret = gpiochip_add(&lg->gpio);
if (ret)
return ret;
+ locomo_gpio_setup_irq(lg);
+
return 0;
}
@@ -208,6 +362,10 @@ static int locomo_gpio_remove(struct platform_device *pdev)
return ret;
}
+ irq_set_chained_handler(lg->irq, NULL);
+ irq_set_handler_data(lg->irq, NULL);
+ irq_free_descs(lg->irq_base, LOCOMO_GPIO_NR_IRQS);
+
return 0;
}
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH 14/15] gpio: locomo: implement per-pin irq handling
2014-10-28 0:02 ` [PATCH 14/15] gpio: locomo: implement per-pin irq handling Dmitry Eremin-Solenikov
@ 2014-10-31 8:00 ` Linus Walleij
2014-10-31 9:35 ` Dmitry Eremin-Solenikov
0 siblings, 1 reply; 52+ messages in thread
From: Linus Walleij @ 2014-10-31 8:00 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
Linux Input, linux-leds@vger.kernel.org,
linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org, Andrea Adami, Russell King,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo
On Tue, Oct 28, 2014 at 1:02 AM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> LoCoMo has a possibility to generate per-GPIO edge irqs. Support for
> that was there in old locomo driver, got 'cleaned up' during old driver
> IRQ cascading cleanup and is now reimplemented. It is expected that
> SL-5500 (collie) will use locomo gpio irqs for mmc detection irq.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Please don't use open-coded IRQ handling like this, we are moving
away from that.
In Kconfig,
select GPIOLIB_IRQCHIP
and look at the other drivers selecting this for inspiration. There
is even some documentation in Documentation/gpio/driver.txt
You will find that it cuts down a lot of overhead from your driver
and does everything in the right way in a central place.
> struct locomo_gpio {
> void __iomem *regs;
> + int irq;
>
> spinlock_t lock;
> struct gpio_chip gpio;
> + int irq_base;
gpiolib irqchip helpers uses irqdomain to do all this debasing
and rebasing for you. Go with that.
> +static int locomo_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> +{
> + struct locomo_gpio *lg = container_of(chip, struct locomo_gpio, gpio);
> +
> + return lg->irq_base + offset;
> +}
And it implements .to_irq() in the gpiolib core.
> +static void
> +locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
It's locomo_gpio_irq_handler() right?
> +{
> + u16 req;
> + struct locomo_gpio *lg = irq_get_handler_data(irq);
> + int i = lg->irq_base;
> +
> + req = readw(lg->regs + LOCOMO_GIR) &
> + readw(lg->regs + LOCOMO_GPD);
> +
> + while (req) {
> + if (req & 1)
> + generic_handle_irq(i);
> + req >>= 1;
> + i++;
> + }
Same thing as the MFD device, look closer at how you construct
the IRQ handling loop, so the register gets re-read each iteration.
> +static void locomo_gpio_ack_irq(struct irq_data *d)
> +{
> + struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
> + unsigned long flags;
> + u16 r;
> +
> + spin_lock_irqsave(&lg->lock, flags);
> +
> + r = readw(lg->regs + LOCOMO_GWE);
> + r |= (0x0001 << (d->irq - lg->irq_base));
> + writew(r, lg->regs + LOCOMO_GWE);
> +
> + r = readw(lg->regs + LOCOMO_GIS);
> + r &= ~(0x0001 << (d->irq - lg->irq_base));
> + writew(r, lg->regs + LOCOMO_GIS);
> +
> + r = readw(lg->regs + LOCOMO_GWE);
> + r &= ~(0x0001 << (d->irq - lg->irq_base));
> + writew(r, lg->regs + LOCOMO_GWE);
> +
> + spin_unlock_irqrestore(&lg->lock, flags);
> +}
I really wonder if this locking is needed around these
regioster accesses. It seems more like a habit than
like something that is actually needed. Think it over.
*irqsave* versions of spinlocks are definately wrong
in the irqchip callbacks, if you give it a minute I think
you quickly realize why.
> +static int locomo_gpio_type(struct irq_data *d, unsigned int type)
> +{
> + unsigned int mask;
> + struct locomo_gpio *lg = irq_data_get_irq_chip_data(d);
> + unsigned long flags;
> +
> + mask = 1 << (d->irq - lg->irq_base);
This should just use d->hwirq with irqdomain implemented
correctly.
(...)
> +static void locomo_gpio_setup_irq(struct locomo_gpio *lg)
> +{
> + int irq;
> +
> + lg->irq_base = irq_alloc_descs(-1, 0, LOCOMO_GPIO_NR_IRQS, -1);
> +
> + /* Install handlers for IRQ_LOCOMO_* */
> + for (irq = lg->irq_base;
> + irq < lg->irq_base + LOCOMO_GPIO_NR_IRQS;
> + irq++) {
> + irq_set_chip_and_handler(irq, &locomo_gpio_chip,
> + handle_edge_irq);
> + irq_set_chip_data(irq, lg);
> + set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
> + }
> +
> + /*
> + * Install handler for IRQ_LOCOMO_HW.
> + */
> + irq_set_handler_data(lg->irq, lg);
> + irq_set_chained_handler(lg->irq, locomo_gpio_handler);
> +}
All this gets redundant with gpiochip_irqchip_add()
and gpiochip_set_chained_irqchip().
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH 14/15] gpio: locomo: implement per-pin irq handling
2014-10-31 8:00 ` Linus Walleij
@ 2014-10-31 9:35 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-31 9:35 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
Linux Input, linux-leds@vger.kernel.org,
linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org, Andrea Adami, Russell King,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo
2014-10-31 11:00 GMT+03:00 Linus Walleij <linus.walleij@linaro.org>:
> On Tue, Oct 28, 2014 at 1:02 AM, Dmitry Eremin-Solenikov
> <dbaryshkov@gmail.com> wrote:
>
>> LoCoMo has a possibility to generate per-GPIO edge irqs. Support for
>> that was there in old locomo driver, got 'cleaned up' during old driver
>> IRQ cascading cleanup and is now reimplemented. It is expected that
>> SL-5500 (collie) will use locomo gpio irqs for mmc detection irq.
>>
>> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
>
> Please don't use open-coded IRQ handling like this, we are moving
> away from that.
>
> In Kconfig,
>
> select GPIOLIB_IRQCHIP
>
> and look at the other drivers selecting this for inspiration. There
> is even some documentation in Documentation/gpio/driver.txt
>
> You will find that it cuts down a lot of overhead from your driver
> and does everything in the right way in a central place.
Thanks, I will take a look.
[Skipped the rest of the comments mostly dedicated to gpiolib_irqchip].
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 15/15] spi: add locomo SPI driver
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
` (3 preceding siblings ...)
2014-10-28 0:02 ` [PATCH 14/15] gpio: locomo: implement per-pin irq handling Dmitry Eremin-Solenikov
@ 2014-10-28 0:02 ` Dmitry Eremin-Solenikov
[not found] ` <1414454528-24240-16-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
4 siblings, 1 reply; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:02 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw
Cc: Andrea Adami, Russell King, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Linus Walleij, Alexandre Courbot, Dmitry Torokhov,
Bryan Wu, Richard Purdie, Samuel Ortiz, Lee Jones, Mark Brown,
Jingoo Han, Liam Girdwood
LoCoMo chip has a built-in simple SPI controller. On Sharp SL-5500 PDDAs
it is connected to external MMC slot.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/spi/Kconfig | 8 +
drivers/spi/Makefile | 1 +
drivers/spi/spi-locomo.c | 370 +++++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/locomo.h | 30 ++++
4 files changed, 409 insertions(+)
create mode 100644 drivers/spi/spi-locomo.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 84e7c9e..1395780 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -242,6 +242,14 @@ config SPI_LM70_LLP
which interfaces to an LM70 temperature sensor using
a parallel port.
+config SPI_LOCOMO
+ tristate "Locomo SPI master"
+ depends on MFD_LOCOMO
+ select SPI_BITBANG
+ help
+ This enables using the SPI controller as present in the LoCoMo
+ chips. It is probably only usefull on the Sharp SL-5x00 PDA family.
+
config SPI_MPC52xx
tristate "Freescale MPC52xx SPI (non-PSC) controller support"
depends on PPC_MPC52xx
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 78f24ca..4f96197 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o
obj-$(CONFIG_SPI_GPIO) += spi-gpio.o
obj-$(CONFIG_SPI_IMX) += spi-imx.o
obj-$(CONFIG_SPI_LM70_LLP) += spi-lm70llp.o
+obj-$(CONFIG_SPI_LOCOMO) += spi-locomo.o
obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o
obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o
obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o
diff --git a/drivers/spi/spi-locomo.c b/drivers/spi/spi-locomo.c
new file mode 100644
index 0000000..8e9e5c4
--- /dev/null
+++ b/drivers/spi/spi-locomo.c
@@ -0,0 +1,370 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/mfd/locomo.h>
+#include <linux/delay.h>
+
+struct locomospi_dev {
+ struct spi_bitbang bitbang;
+ void __iomem *base;
+ int clock_base;
+ int clock_div;
+
+ u16 save_ct;
+ u16 save_md;
+};
+
+static void locomospi_reg_open(struct locomospi_dev *spidev)
+{
+ u16 r;
+
+ spidev->clock_div = DIV_64;
+ spidev->clock_base = CLOCK_18MHZ;
+ writew(LOCOMO_SPIMD_MSB1ST | LOCOMO_SPIMD_DOSTAT | LOCOMO_SPIMD_RCPOL |
+ LOCOMO_SPIMD_TCPOL | (spidev->clock_base << 3) |
+ spidev->clock_div,
+ spidev->base + LOCOMO_SPIMD);
+
+ /* if (locomospi_carddetect()) { */
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ r |= LOCOMO_SPIMD_XON;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ r |= LOCOMO_SPIMD_XEN;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+ /* } */
+
+ writew(LOCOMO_SPICT_CS, spidev->base + LOCOMO_SPICT);
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ r |= (LOCOMO_SPICT_CEN | LOCOMO_SPICT_RXUEN | LOCOMO_SPICT_ALIGNEN);
+ writew(r, spidev->base + LOCOMO_SPICT);
+
+ udelay(200);
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ writew(r, spidev->base + LOCOMO_SPICT);
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ r &= ~LOCOMO_SPICT_CS;
+ writew(r, spidev->base + LOCOMO_SPICT);
+}
+
+static void locomospi_reg_release(struct locomospi_dev *spidev)
+{
+ u16 r;
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ r &= ~LOCOMO_SPICT_CEN;
+ writew(r, spidev->base + LOCOMO_SPICT);
+
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ r &= ~LOCOMO_SPIMD_XEN;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ r &= ~LOCOMO_SPIMD_XON;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ r |= LOCOMO_SPIMD_XEN; /* FIXME */
+ writew(r, spidev->base + LOCOMO_SPICT);
+}
+
+
+static void locomospi_chipselect(struct spi_device *spi, int is_active)
+{
+ struct locomospi_dev *spidev;
+ u16 r;
+
+ dev_dbg(&spi->dev, "SPI cs: %d\n", is_active);
+
+ spidev = spi_master_get_devdata(spi->master);
+
+ r = readw(spidev->base + LOCOMO_SPICT);
+ if (!!is_active ^ !!(spi->mode & SPI_CS_HIGH))
+ r &= ~LOCOMO_SPICT_CS;
+ else
+ r |= LOCOMO_SPICT_CS;
+ writew(r, spidev->base + LOCOMO_SPICT);
+}
+
+static u32 locomospi_txrx_word(struct spi_device *spi,
+ unsigned nsecs,
+ u32 word, u8 bits)
+{
+ struct locomospi_dev *spidev;
+ int wait;
+ int j;
+ u32 rx;
+
+ spidev = spi_master_get_devdata(spi->master);
+
+ if (spidev->clock_div = 4)
+ wait = 0x10000;
+ else
+ wait = 8;
+
+ for (j = 0; j < wait; j++) {
+ if (readw(spidev->base + LOCOMO_SPIST) & LOCOMO_SPI_RFW)
+ break;
+ }
+
+ writeb(word, spidev->base + LOCOMO_SPITD);
+ ndelay(nsecs);
+
+ for (j = 0; j < wait; j++) {
+ if (readw(spidev->base + LOCOMO_SPIST) & LOCOMO_SPI_RFR)
+ break;
+ }
+
+ rx = readb(spidev->base + LOCOMO_SPIRD);
+ ndelay(nsecs);
+
+ dev_dbg(&spi->dev, "SPI txrx: %02x/%02x\n", word, rx);
+
+ return rx;
+}
+
+static void locomo_spi_set_speed(struct locomospi_dev *spidev, u32 hz)
+{
+ u16 r;
+
+ if (hz >= 24576000) {
+ spidev->clock_base = CLOCK_25MHZ;
+ spidev->clock_div = DIV_1;
+ } else if (hz >= 22579200) {
+ spidev->clock_base = CLOCK_22MHZ;
+ spidev->clock_div = DIV_1;
+ } else if (hz >= 18432000) {
+ spidev->clock_base = CLOCK_18MHZ;
+ spidev->clock_div = DIV_1;
+ } else if (hz >= 12288000) {
+ spidev->clock_base = CLOCK_25MHZ;
+ spidev->clock_div = DIV_2;
+ } else if (hz >= 11289600) {
+ spidev->clock_base = CLOCK_22MHZ;
+ spidev->clock_div = DIV_2;
+ } else if (hz >= 9216000) {
+ spidev->clock_base = CLOCK_18MHZ;
+ spidev->clock_div = DIV_2;
+ } else if (hz >= 6144000) {
+ spidev->clock_base = CLOCK_25MHZ;
+ spidev->clock_div = DIV_4;
+ } else if (hz >= 5644800) {
+ spidev->clock_base = CLOCK_22MHZ;
+ spidev->clock_div = DIV_4;
+ } else if (hz >= 4608000) {
+ spidev->clock_base = CLOCK_18MHZ;
+ spidev->clock_div = DIV_4;
+ } else if (hz >= 3072000) {
+ spidev->clock_base = CLOCK_25MHZ;
+ spidev->clock_div = DIV_8;
+ } else if (hz >= 2822400) {
+ spidev->clock_base = CLOCK_22MHZ;
+ spidev->clock_div = DIV_8;
+ } else if (hz >= 2304000) {
+ spidev->clock_base = CLOCK_18MHZ;
+ spidev->clock_div = DIV_8;
+ } else if (hz >= 384000) {
+ spidev->clock_base = CLOCK_25MHZ;
+ spidev->clock_div = DIV_64;
+ } else if (hz >= 352800) {
+ spidev->clock_base = CLOCK_22MHZ;
+ spidev->clock_div = DIV_64;
+ } else { /* set to 288 Khz */
+ spidev->clock_base = CLOCK_18MHZ;
+ spidev->clock_div = DIV_64;
+ }
+
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ if ((r & LOCOMO_SPIMD_CLKSEL) = spidev->clock_div &&
+ (r & LOCOMO_SPIMD_XSEL) = (spidev->clock_div << 3))
+ return;
+
+ r &= ~(LOCOMO_SPIMD_XSEL | LOCOMO_SPIMD_CLKSEL | LOCOMO_SPIMD_XEN);
+ writew(r, spidev->base + LOCOMO_SPIMD);
+
+ r |= (spidev->clock_div | (spidev->clock_base << 3) | LOCOMO_SPIMD_XEN);
+ writew(r, spidev->base + LOCOMO_SPIMD);
+
+ udelay(300);
+}
+
+static int locomo_spi_setup_transfer(struct spi_device *spi,
+ struct spi_transfer *t)
+{
+ struct locomospi_dev *spidev;
+ u16 r;
+ u32 hz = 0;
+ int rc = spi_bitbang_setup_transfer(spi, t);
+
+ if (rc)
+ return rc;
+
+ if (t)
+ hz = t->speed_hz;
+ if (!hz)
+ hz = spi->max_speed_hz;
+
+ spidev = spi_master_get_devdata(spi->master);
+
+ r = readw(spidev->base + LOCOMO_SPIMD);
+ if (hz = 0) {
+ r &= ~LOCOMO_SPIMD_XON;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+ } else {
+ r |= LOCOMO_SPIMD_XON;
+ writew(r, spidev->base + LOCOMO_SPIMD);
+ locomo_spi_set_speed(spidev, hz);
+ }
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int locomo_spi_suspend(struct device *dev)
+{
+ struct spi_master *master = dev_get_drvdata(dev);
+ struct locomospi_dev *spidev = spi_master_get_devdata(master);
+ int ret;
+
+ /* Stop the queue running */
+ ret = spi_master_suspend(master);
+ if (ret) {
+ dev_warn(dev, "cannot suspend master\n");
+ return ret;
+ }
+
+ spidev->save_ct = readw(spidev->base + LOCOMO_SPICT);
+ writew(0x40, spidev->base + LOCOMO_SPICT);
+
+ spidev->save_md = readw(spidev->base + LOCOMO_SPIMD);
+ writew(0x3c14, spidev->base + LOCOMO_SPIMD);
+
+ return 0;
+}
+
+static int locomo_spi_resume(struct device *dev)
+{
+ struct spi_master *master = dev_get_drvdata(dev);
+ struct locomospi_dev *spidev = spi_master_get_devdata(master);
+ int ret;
+
+ writew(spidev->save_ct, spidev->base + LOCOMO_SPICT);
+ writew(spidev->save_md, spidev->base + LOCOMO_SPIMD);
+
+ /* Start the queue running */
+ ret = spi_master_resume(master);
+ if (ret)
+ dev_err(dev, "problem starting queue (%d)\n", ret);
+
+ return ret;
+}
+
+static SIMPLE_DEV_PM_OPS(locomo_spi_pm_ops,
+ locomo_spi_suspend, locomo_spi_resume);
+
+#define LOCOMO_SPI_PM_OPS (&locomo_spi_pm_ops)
+#else
+#define LOCOMO_SPI_PM_OPS NULL
+#endif
+
+static int locomo_spi_probe(struct platform_device *pdev)
+{
+ struct resource *res;
+ struct spi_master *master;
+ struct locomospi_dev *spidev;
+ int ret;
+
+ dev_info(&pdev->dev, "LoCoO SPI Driver\n");
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ master = spi_alloc_master(&pdev->dev, sizeof(struct locomospi_dev));
+ if (!master)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, master);
+
+ master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 8);
+ master->bus_num = 0;
+ master->num_chipselect = 1;
+
+ spidev = spi_master_get_devdata(master);
+ spidev->bitbang.master = spi_master_get(master);
+
+ spidev->bitbang.setup_transfer = locomo_spi_setup_transfer;
+ spidev->bitbang.chipselect = locomospi_chipselect;
+ spidev->bitbang.txrx_word[SPI_MODE_0] = locomospi_txrx_word;
+ spidev->bitbang.txrx_word[SPI_MODE_1] = locomospi_txrx_word;
+ spidev->bitbang.txrx_word[SPI_MODE_2] = locomospi_txrx_word;
+ spidev->bitbang.txrx_word[SPI_MODE_3] = locomospi_txrx_word;
+
+ spidev->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+
+ spidev->base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(spidev->base)) {
+ ret = PTR_ERR(spidev->base);
+ goto out_put;
+ }
+
+ locomospi_reg_open(spidev);
+
+ ret = spi_bitbang_start(&spidev->bitbang);
+ if (ret) {
+ dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
+ goto out_put;
+ }
+
+ return 0;
+
+out_put:
+ spi_master_put(master);
+ return ret;
+}
+
+static int locomo_spi_remove(struct platform_device *pdev)
+{
+ struct spi_master *master = platform_get_drvdata(pdev);
+ struct locomospi_dev *spidev = spi_master_get_devdata(master);
+
+ spi_bitbang_stop(&spidev->bitbang);
+ locomospi_reg_release(spidev);
+ spi_master_put(master);
+
+
+ return 0;
+}
+
+static struct platform_driver locomo_spi_driver = {
+ .probe = locomo_spi_probe,
+ .remove = locomo_spi_remove,
+ .driver = {
+ .name = "locomo-spi",
+ .owner = THIS_MODULE,
+ .pm = LOCOMO_SPI_PM_OPS,
+ },
+};
+module_platform_driver(locomo_spi_driver);
+
+MODULE_AUTHOR("Thomas Kunze thommy@tabao.de");
+MODULE_DESCRIPTION("LoCoMo SPI driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:locomo-spi");
diff --git a/include/linux/mfd/locomo.h b/include/linux/mfd/locomo.h
index 1f54300..f822d77 100644
--- a/include/linux/mfd/locomo.h
+++ b/include/linux/mfd/locomo.h
@@ -53,7 +53,37 @@
/* SPI interface */
#define LOCOMO_SPI 0x60
#define LOCOMO_SPIMD 0x00 /* SPI mode setting */
+#define LOCOMO_SPIMD_LOOPBACK (1 << 15) /* loopback tx to rx */
+#define LOCOMO_SPIMD_MSB1ST (1 << 14) /* send MSB first */
+#define LOCOMO_SPIMD_DOSTAT (1 << 13) /* transmit line is idle high */
+#define LOCOMO_SPIMD_TCPOL (1 << 11) /* transmit CPOL (maybe affects CPHA too) */
+#define LOCOMO_SPIMD_RCPOL (1 << 10) /* receive CPOL (maybe affects CPHA too) */
+#define LOCOMO_SPIMD_TDINV (1 << 9) /* invert transmit line */
+#define LOCOMO_SPIMD_RDINV (1 << 8) /* invert receive line */
+#define LOCOMO_SPIMD_XON (1 << 7) /* enable spi controller clock */
+#define LOCOMO_SPIMD_XEN (1 << 6) /* clock bit write enable xon must be off, wait 300 us before xon->1 */
+#define LOCOMO_SPIMD_XSEL 0x0018 /* clock select */
+#define CLOCK_18MHZ 0 /* 18,432 MHz clock */
+#define CLOCK_22MHZ 1 /* 22,5792 MHz clock */
+#define CLOCK_25MHZ 2 /* 24,576 MHz clock */
+#define LOCOMO_SPIMD_CLKSEL 0x7
+#define DIV_1 0 /* don't divide clock */
+#define DIV_2 1 /* divide clock by two */
+#define DIV_4 2 /* divide clock by four */
+#define DIV_8 3 /* divide clock by eight*/
+#define DIV_64 4 /* divide clock by 64 */
+
#define LOCOMO_SPICT 0x04 /* SPI mode control */
+#define LOCOMO_SPICT_CRC16_7_B (1 << 15) /* 0: crc16 1: crc7 */
+#define LOCOMO_SPICT_CRCRX_TX_B (1 << 14)
+#define LOCOMO_SPICT_CRCRESET_B (1 << 13)
+#define LOCOMO_SPICT_CEN (1 << 7) /* ?? enable */
+#define LOCOMO_SPICT_CS (1 << 6) /* chip select */
+#define LOCOMO_SPICT_UNIT16 (1 << 5) /* 0: 8 bit units, 1: 16 bit unit */
+#define LOCOMO_SPICT_ALIGNEN (1 << 2) /* align transfer enable */
+#define LOCOMO_SPICT_RXWEN (1 << 1) /* continous receive */
+#define LOCOMO_SPICT_RXUEN (1 << 0) /* aligned receive */
+
#define LOCOMO_SPIST 0x08 /* SPI status */
#define LOCOMO_SPI_TEND (1 << 3) /* Transfer end bit */
#define LOCOMO_SPI_REND (1 << 2) /* Receive end bit */
--
2.1.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH 00/15] new locomo driver
2014-10-28 0:01 [PATCH 00/15] new locomo driver Dmitry Eremin-Solenikov
` (8 preceding siblings ...)
[not found] ` <1414454528-24240-1-git-send-email-dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2014-10-28 0:13 ` Russell King - ARM Linux
[not found] ` <20141028001338.GZ27405-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-10-28 0:29 ` Mark Brown
[not found] ` <1414454528-24240-2-git-send-email-dbaryshkov@gmail.com>
10 siblings, 2 replies; 52+ messages in thread
From: Russell King - ARM Linux @ 2014-10-28 0:13 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov, Greg KH
Cc: linux-arm-kernel, linux-gpio, linux-input, linux-leds, linux-spi,
linux-fbdev, alsa-devel, Andrea Adami, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Linus Walleij, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo Han, Liam Girdwood
On Tue, Oct 28, 2014 at 03:01:53AM +0300, Dmitry Eremin-Solenikov wrote:
> Sharp Zaurus SL-5500 and SL-5600 use special companion Gate Array. Current
> drivers present in Linux kernel has some problems:
>
> * It uses custom bus instead of platform bus/mfd core.
I believe Greg wouldn't see that as a positive point.
Don't think that the platform bus _should_ always be used. It shouldn't
(Greg has said he'd like to see the platform bus to be totally killed off.)
Instead, custom buses properly suited to the class of device in question
is much preferred, especially if it aids in...
> * Device drivers are not well layered/separated.
... better layering or separation of drivers.
So, thinking that converting from a custom bus to a platform bus
definitely is /not/ a positive step forward.
(Why mfd was ever allowed to re-use the platform bus stuff is a separate
question not relevent to these patches.)
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 52+ messages in thread[parent not found: <20141028001338.GZ27405-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>]
* Re: [PATCH 00/15] new locomo driver
[not found] ` <20141028001338.GZ27405-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
@ 2014-10-28 0:28 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 52+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-28 0:28 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Greg KH, linux-arm-kernel,
linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-input,
linux-leds, linux-spi, linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, Andrea Adami, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Linus Walleij, Alexandre Courbot,
Dmitry Torokhov, Bryan Wu, Richard Purdie, Samuel Ortiz,
Lee Jones, Mark Brown, Jingoo Han, Liam Girdwood
2014-10-28 4:13 GMT+04:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Tue, Oct 28, 2014 at 03:01:53AM +0300, Dmitry Eremin-Solenikov wrote:
>> Sharp Zaurus SL-5500 and SL-5600 use special companion Gate Array. Current
>> drivers present in Linux kernel has some problems:
>>
>> * It uses custom bus instead of platform bus/mfd core.
>
> I believe Greg wouldn't see that as a positive point.
>
> Don't think that the platform bus _should_ always be used. It shouldn't
> (Greg has said he'd like to see the platform bus to be totally killed off.)
> Instead, custom buses properly suited to the class of device in question
> is much preferred, especially if it aids in...
I'm sorry, I must be outdated on this topic. Few years ago things were exactly
opposite - we explicitly had to use platform bus for mfd devices. I
still think that
mfd devices containing several cells should use mfd-core (is it still
OK to use it?).
And mfd-core (up to now) uses platform bus.
>
>> * Device drivers are not well layered/separated.
>
> ... better layering or separation of drivers.
>
> So, thinking that converting from a custom bus to a platform bus
> definitely is /not/ a positive step forward.
Is there an example of new approach? Current locomo-dev implementation
is poisoned with several bugs. For example it passes ioremapped memory
as resources to child devices that later call request_resource() on it.
Adding additional features (like correct work with IRQs) will duplicate
platform bus code and mfd functions.
>
> (Why mfd was ever allowed to re-use the platform bus stuff is a separate
> question not relevent to these patches.)
I remember this story - Ian Molton and me wrote mfd-core.c.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 00/15] new locomo driver
2014-10-28 0:13 ` [PATCH 00/15] new locomo driver Russell King - ARM Linux
[not found] ` <20141028001338.GZ27405-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
@ 2014-10-28 0:29 ` Mark Brown
1 sibling, 0 replies; 52+ messages in thread
From: Mark Brown @ 2014-10-28 0:29 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Dmitry Eremin-Solenikov, Greg KH, linux-arm-kernel, linux-gpio,
linux-input, linux-leds, linux-spi, linux-fbdev, alsa-devel,
Andrea Adami, Daniel Mack, Haojian Zhuang, Robert Jarzmik,
Linus Walleij, Alexandre Courbot, Dmitry Torokhov, Bryan Wu,
Richard Purdie, Samuel Ortiz, Lee Jones, Jingoo Han,
Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]
On Tue, Oct 28, 2014 at 12:13:39AM +0000, Russell King - ARM Linux wrote:
> On Tue, Oct 28, 2014 at 03:01:53AM +0300, Dmitry Eremin-Solenikov wrote:
> > Sharp Zaurus SL-5500 and SL-5600 use special companion Gate Array. Current
> > drivers present in Linux kernel has some problems:
> > * It uses custom bus instead of platform bus/mfd core.
> I believe Greg wouldn't see that as a positive point.
> Don't think that the platform bus _should_ always be used. It shouldn't
> (Greg has said he'd like to see the platform bus to be totally killed off.)
> Instead, custom buses properly suited to the class of device in question
> is much preferred, especially if it aids in...
> > * Device drivers are not well layered/separated.
> ... better layering or separation of drivers.
> So, thinking that converting from a custom bus to a platform bus
> definitely is /not/ a positive step forward.
> (Why mfd was ever allowed to re-use the platform bus stuff is a separate
> question not relevent to these patches.)
The reason we ended up reusing the platform bus so much was that
originally people were doing custom buses but people started complaining
that the code was (or should be) a cut'n'paste of the platform bus and
that this duplication was both not pretty and a bit tedious for anyone
doing anything that involved deploying good practice over a lot of
buses. Early MFDs were actually MMIO devices so the platform bus was a
good fit, then people (including me when I upstreamed the wm97xx drivers
and apparently whoever worked on these devices) started adding custom
buses and then people complianed that we should reuse both the bus type
and the MFD infrastructure so here we are.
Probably a way of sharing the platform code but giving the bus another
name and bus_type would allow for better separation here.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 52+ messages in thread
[parent not found: <1414454528-24240-2-git-send-email-dbaryshkov@gmail.com>]