linaro-dev February 2012

linaro-dev@lists.linaro.org

150 participants
147 discussions

[PATCH 0/2] change lpj in arm smp common code

by Richard Zhao

The two patches were originally in [PATCH V6 0/7] add a generic cpufreq driver. I seperated them and hope they can go to upstream earlier. Richard Zhao (2): ARM: add cpufreq transiton notifier to adjust loops_per_jiffy for smp cpufreq: OMAP: remove loops_per_jiffy recalculate for smp arch/arm/kernel/smp.c | 54 ++++++++++++++++++++++++++++++++++++++++ drivers/cpufreq/omap-cpufreq.c | 36 -------------------------- 2 files changed, 54 insertions(+), 36 deletions(-) -- 1.7.5.4

12 years, 6 months

[PATCH 05/07] Watchdog: DA9052/53 watchdog support v1

by Ashish Jangam

This driver adds support for the watchdog functionality provided by the Dialog Semiconductor DA9052/53 PMIC chip. This patch is functionally tested on Samsung SMDKV6410. Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> Signed-off-by: Ashish Jangam <ashish.jangam(a)kpitcummins.com> --- Documentation/watchdog/watchdog-parameters.txt | 5 + drivers/watchdog/Kconfig | 6 + drivers/watchdog/Makefile | 1 + drivers/watchdog/da9052_wdt.c | 333 ++++++++++++++++++++++++ 4 files changed, 345 insertions(+), 0 deletions(-) create mode 100644 drivers/watchdog/da9052_wdt.c diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 17ddd82..04fddba 100644 --- a/Documentation/watchdog/watchdog-parameters.txt +++ b/Documentation/watchdog/watchdog-parameters.txt @@ -78,6 +78,11 @@ wd0_timeout: Default watchdog0 timeout in 1/10secs wd1_timeout: Default watchdog1 timeout in 1/10secs wd2_timeout: Default watchdog2 timeout in 1/10secs ------------------------------------------------- +da9052wdt: +timeout: Watchdog timeout in seconds. 2<= timeout <=131, default=2.048s +nowayout: Watchdog cannot be stopped once started + (default=kernel config parameter) +------------------------------------------------- davinci_wdt: heartbeat: Watchdog heartbeat period in seconds from 1 to 600, default 60 ------------------------------------------------- diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 877b107..3fb9633 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -63,6 +63,12 @@ config SOFT_WATCHDOG To compile this driver as a module, choose M here: the module will be called softdog. +config DA9052_WATCHDOG + tristate "Dialog DA9052/DA9053 Watchdog" + depends on PMIC_DA9052 + help + Support for the watchdog in the DA9052-BC and DA9053-AA/Bx PMICs. + config WM831X_WATCHDOG tristate "WM831x watchdog" depends on MFD_WM831X diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index e8f479a..0ecbe5a 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -166,4 +166,5 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o +obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c new file mode 100644 index 0000000..b08091e --- /dev/null +++ b/drivers/watchdog/da9052_wdt.c @@ -0,0 +1,333 @@ +/* + * System monitoring driver for DA9052 PMICs. + * + * Copyright(c) 2012 Dialog Semiconductor Ltd. + * + * Author: Dajun Chen <dchen(a)diasemi.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/miscdevice.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/fs.h> +#include <linux/uaccess.h> +#include <linux/platform_device.h> +#include <linux/time.h> +#include <linux/watchdog.h> +#include <linux/types.h> +#include <linux/kernel.h> + +#include <linux/mfd/da9052/reg.h> +#include <linux/mfd/da9052/da9052.h> + +static int nowayout = WATCHDOG_NOWAYOUT; +static int wdt_state = WDIOS_DISABLECARD; +static struct miscdevice da9052_wdt_miscdev; +static unsigned long da9052_wdt_users; +static int da9052_wdt_expect_close; +struct da9052 *da9052; +static DEFINE_MUTEX(wdt_mutex); + +static struct { + u8 reg_val; + int time; /* Seconds */ +} da9052_wdt_maps[] = { + { 1, 2 }, + { 2, 4 }, + { 3, 8 }, + { 4, 16 }, + { 5, 32 }, + { 5, 33 }, /* Actual time 32.768s so included both 32s and 33s */ + { 6, 65 }, + { 6, 66 }, /* Actual time 65.536s so include both, 65s and 66s */ + { 7, 131 }, +}; + +static int da9052_wdt_set_timeout(struct da9052 *da9052, unsigned char timeout) +{ + int ret; + + /* Disable the Watchdog timer for 150us before changing the + * time out value + */ + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_TWDSCALE, 0); + if (ret < 0) { + dev_err(da9052->dev, "Failed to disable watchdog bit, %d\n", + ret); + return ret; + } + + mutex_lock(&wdt_mutex); + wdt_state = (timeout == 0) ? WDIOS_DISABLECARD : WDIOS_ENABLECARD; + mutex_unlock(&wdt_mutex); + + if (timeout) { + udelay(150); + + /* Set the desired timeout */ + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_TWDSCALE, timeout); + if (ret < 0) { + dev_err(da9052->dev, + "Failed to update timescale bit, %d\n", ret); + return ret; + } + } + + return 0; +} + +static int da9052_wdt_start(struct da9052 *da9052) +{ + int ret = 0; + + + if (wdt_state == WDIOS_DISABLECARD) { + /* Default 2.048s */ + ret = da9052_wdt_set_timeout(da9052, 1); + if (ret <= 0) + goto err; + + mutex_lock(&wdt_mutex); + wdt_state = WDIOS_ENABLECARD; + mutex_unlock(&wdt_mutex); + } + +err: + return ret; +} + +static int da9052_wdt_stop(struct da9052 *da9052) +{ + int ret = 0; + + mutex_lock(&wdt_mutex); + + if (wdt_state == WDIOS_ENABLECARD) { + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_TWDSCALE, 0); + if (ret < 0) { + dev_err(da9052->dev, + "Failed to disable watchdog bit strobe bit, %d\n", + ret); + goto err; + } + + wdt_state = WDIOS_DISABLECARD; + } + +err: + mutex_unlock(&wdt_mutex); + return ret; +} + +static void da9052_wdt_strobe(struct da9052 *da9052) +{ + int ret; + + if (wdt_state == WDIOS_ENABLECARD) { + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_WATCHDOG, 1 << 7); + if (ret < 0) { + dev_err(da9052->dev, + "Failed to update watchdog strobe bit, %d\n", + ret); + return; + } + } +} + +static int da9052_wdt_open(struct inode *inode, struct file *file) +{ + int ret; + + if (test_and_set_bit(0, &da9052_wdt_users)) + return -EBUSY; + + ret = da9052_wdt_start(da9052); + if (ret < 0) + return ret; + + return nonseekable_open(inode, file); +} + +static int da9052_wdt_release(struct inode *inode, struct file *file) +{ + int ret = 0; + + if (da9052_wdt_expect_close == 42) + ret = da9052_wdt_stop(da9052); + else + da9052_wdt_strobe(da9052); + + da9052_wdt_expect_close = 0; + clear_bit(0, &da9052_wdt_users); + + return ret; +} + +static struct watchdog_info da9052_wdt_info = { + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, + .identity = "DA9052 Watchdog", +}; + +static long da9052_wdt_ioctl(struct file *file, uint cmd, unsigned long arg) +{ + void __user *argp = (void __user *)arg; + int ret = 0, timeout, i, __user *p = argp; + + switch (cmd) { + case WDIOC_GETSUPPORT: + ret = copy_to_user(argp, &da9052_wdt_info, + sizeof(da9052_wdt_info)) ? -EFAULT : 0; + break; + case WDIOC_GETSTATUS: + case WDIOC_GETBOOTSTATUS: + ret = put_user(0, p); + break; + case WDIOC_SETOPTIONS: + { + int options; + ret = get_user(options, p); + if (ret) + break; + + if (options == WDIOS_ENABLECARD) + ret = da9052_wdt_start(da9052); + + if (options == WDIOS_DISABLECARD) + ret = da9052_wdt_stop(da9052); + + break; + } + case WDIOC_KEEPALIVE: + da9052_wdt_strobe(da9052); + break; + case WDIOC_SETTIMEOUT: + ret = get_user(timeout, p); + if (ret) + break; + + for (i = 0; i < ARRAY_SIZE(da9052_wdt_maps); i++) + if (da9052_wdt_maps[i].time == timeout) + break; + if (i == ARRAY_SIZE(da9052_wdt_maps)) + ret = -EINVAL; + else + ret = da9052_wdt_set_timeout(da9052, + da9052_wdt_maps[i].reg_val); + + break; + case WDIOC_GETTIMEOUT: + ret = da9052_reg_read(da9052, DA9052_CONTROL_D_REG); + if (ret < 0) + break; + + ret &= DA9052_CONTROLD_TWDSCALE; + for (i = 0; i < ARRAY_SIZE(da9052_wdt_maps); i++) + if (da9052_wdt_maps[i].reg_val == ret) + break; + if (i == ARRAY_SIZE(da9052_wdt_maps)) + ret = -EINVAL; + else + ret = put_user(da9052_wdt_maps[i].time, p); + + break; + default: + return -ENOTTY; + } + + return ret; +} + +static ssize_t da9052_wdt_write(struct file *file, + const char __user *data, size_t count, + loff_t *ppos) +{ + size_t i; + + /* Check the magic character 'V' and reload the timer */ + if (count) { + if (!nowayout) { + da9052_wdt_expect_close = 0; + + /* scan for magic character */ + for (i = 0; i != count; i++) { + char c; + if (get_user(c, data + i)) + return -EFAULT; + if (c == 'V') + da9052_wdt_expect_close = 42; + } + /* someone wrote to us, we should reload the timer */ + da9052_wdt_strobe(da9052); + } + } + return count; +} + +static const struct file_operations da9052_wdt_fops = { + .owner = THIS_MODULE, + .llseek = no_llseek, + .unlocked_ioctl = da9052_wdt_ioctl, + .write = da9052_wdt_write, + .open = da9052_wdt_open, + .release = da9052_wdt_release, +}; + +static struct miscdevice da9052_wdt_miscdev = { + .minor = WATCHDOG_MINOR, + .name = "da9052-wdt", + .fops = &da9052_wdt_fops, +}; + +static int __devinit da9052_wdt_probe(struct platform_device *pdev) +{ + int ret; + + da9052 = dev_get_drvdata(pdev->dev.parent); + + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_TWDSCALE, 0); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to disable watchdog bits, %d\n", + ret); + return ret; + } + + da9052_wdt_miscdev.parent = &pdev->dev; + + ret = misc_register(&da9052_wdt_miscdev); + + return ret; +} + +static int __devexit da9052_wdt_remove(struct platform_device *dev) +{ + misc_deregister(&da9052_wdt_miscdev); + + return 0; +} + +static struct platform_driver da9052_wdt_driver = { + .probe = da9052_wdt_probe, + .remove = __devexit_p(da9052_wdt_remove), + .driver = { + .name = "da9052-watchdog", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(da9052_wdt_driver); + +MODULE_AUTHOR("David Dajun Chen <dchen(a)diasemi.com>"); +MODULE_DESCRIPTION("DA9052 SM Device Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:da9052-wdt");

12 years, 6 months

[PATCH 04/07] Backlight: Backlight module for DA9052/53 PMIC v1

by Ashish Jangam

DA9052/53 PMIC has capability to supply power for upto 3 banks of 6 white serial LEDS. It can also control intensity of independent banks and to drive these banks boost converter will provide up to 24V and forward current of max. 50mA. This patch allows to control intensity of the individual WLEDs bank through DA9052/53 PMIC. This patch is functionally tested on Samsung SMDKV6410. Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> Signed-off-by: Ashish Jangam <ashish.jangam(a)kpitcummins.com> --- drivers/video/backlight/Kconfig | 6 + drivers/video/backlight/Makefile | 1 + drivers/video/backlight/da9052_bl.c | 187 +++++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 0 deletions(-) create mode 100644 drivers/video/backlight/da9052_bl.c diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 49e7d83..77a3942 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -245,6 +245,12 @@ config BACKLIGHT_DA903X If you have a LCD backlight connected to the WLED output of DA9030 or DA9034 WLED output, say Y here to enable this driver. +config BACKLIGHT_DA9052 + tristate "Dialog DA9052/DA9053 WLED" + depends on PMIC_DA9052 + help + Enable the Backlight Driver for DA9052-BC and DA9053-AA/Bx PMICs. + config BACKLIGHT_MAX8925 tristate "Backlight driver for MAX8925" depends on MFD_MAX8925 diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile index 0ee06e0..6622f34 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o obj-$(CONFIG_BACKLIGHT_DA903X) += da903x_bl.o +obj-$(CONFIG_BACKLIGHT_DA9052) += da9052_bl.o obj-$(CONFIG_BACKLIGHT_MAX8925) += max8925_bl.o obj-$(CONFIG_BACKLIGHT_APPLE) += apple_bl.o obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c new file mode 100644 index 0000000..b628d68 --- /dev/null +++ b/drivers/video/backlight/da9052_bl.c @@ -0,0 +1,187 @@ +/* + * Backlight Driver for Dialog DA9052 PMICs + * + * Copyright(c) 2012 Dialog Semiconductor Ltd. + * + * Author: David Dajun Chen <dchen(a)diasemi.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/backlight.h> +#include <linux/delay.h> +#include <linux/fb.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <linux/mfd/da9052/da9052.h> +#include <linux/mfd/da9052/reg.h> + +#define DA9052_MAX_BRIGHTNESS 0xFF + +enum { + DA9052_WLEDS_OFF, + DA9052_WLEDS_ON, +}; + +enum { + DA9052_TYPE_WLED1, + DA9052_TYPE_WLED2, + DA9052_TYPE_WLED3, +}; + +static unsigned char wled_bank[] = { + DA9052_LED1_CONF_REG, + DA9052_LED2_CONF_REG, + DA9052_LED3_CONF_REG, +}; + +struct da9052_bl { + struct da9052 *da9052; + uint brightness; + uint state; + uint led_reg; +}; + +static int da9052_adjust_wled_brightness(struct da9052_bl *wleds) +{ + unsigned char boost_en; + unsigned char i_sink; + int ret; + + boost_en = 0x3F; + i_sink = 0xFF; + if (wleds->state == DA9052_WLEDS_OFF) { + boost_en = 0x00; + i_sink = 0x00; + } + + ret = da9052_reg_write(wleds->da9052, DA9052_BOOST_REG, boost_en); + if (ret < 0) + return ret; + + ret = da9052_reg_write(wleds->da9052, DA9052_LED_CONT_REG, i_sink); + if (ret < 0) + return ret; + + ret = da9052_reg_write(wleds->da9052, wled_bank[wleds->led_reg], 0x0); + if (ret < 0) + return ret; + + msleep(10); + + if (wleds->brightness) { + ret = da9052_reg_write(wleds->da9052, wled_bank[wleds->led_reg], + wleds->brightness); + if (ret < 0) + return ret; + } + + return 0; +} + +static int da9052_backlight_update_status(struct backlight_device *bl) +{ + int brightness = bl->props.brightness; + struct da9052_bl *wleds = bl_get_data(bl); + + wleds->brightness = brightness; + wleds->state = DA9052_WLEDS_ON; + + return da9052_adjust_wled_brightness(wleds); +} + +static int da9052_backlight_get_brightness(struct backlight_device *bl) +{ + struct da9052_bl *wleds = bl_get_data(bl); + + return wleds->brightness; +} + +static const struct backlight_ops da9052_backlight_ops = { + .update_status = da9052_backlight_update_status, + .get_brightness = da9052_backlight_get_brightness, +}; + +static int da9052_backlight_probe(struct platform_device *pdev) +{ + struct backlight_device *bl; + struct backlight_properties props; + struct da9052_bl *wleds; + + wleds = devm_kzalloc(&pdev->dev, sizeof(struct da9052_bl), GFP_KERNEL); + if (!wleds) + return -ENOMEM; + + wleds->da9052 = dev_get_drvdata(pdev->dev.parent); + wleds->brightness = 0; + wleds->led_reg = platform_get_device_id(pdev)->driver_data; + wleds->state = DA9052_WLEDS_OFF; + + props.type = BACKLIGHT_RAW; + props.max_brightness = DA9052_MAX_BRIGHTNESS; + + bl = backlight_device_register(pdev->name, wleds->da9052->dev, wleds, + &da9052_backlight_ops, &props); + if (IS_ERR(bl)) { + dev_err(&pdev->dev, "Failed to register backlight\n"); + devm_kfree(&pdev->dev, wleds); + return PTR_ERR(bl); + } + + bl->props.max_brightness = DA9052_MAX_BRIGHTNESS; + bl->props.brightness = 0; + platform_set_drvdata(pdev, bl); + + return da9052_adjust_wled_brightness(wleds); +} + +static int da9052_backlight_remove(struct platform_device *pdev) +{ + struct backlight_device *bl = platform_get_drvdata(pdev); + struct da9052_bl *wleds = bl_get_data(bl); + + wleds->brightness = 0; + wleds->state = DA9052_WLEDS_OFF; + da9052_adjust_wled_brightness(wleds); + backlight_device_unregister(bl); + devm_kfree(&pdev->dev, wleds); + + return 0; +} + +static struct platform_device_id da9052_wled_ids[] = { + { + .name = "da9052-wled1", + .driver_data = DA9052_TYPE_WLED1, + }, + { + .name = "da9052-wled2", + .driver_data = DA9052_TYPE_WLED2, + }, + { + .name = "da9052-wled3", + .driver_data = DA9052_TYPE_WLED3, + }, +}; + +static struct platform_driver da9052_wled_driver = { + .probe = da9052_backlight_probe, + .remove = da9052_backlight_remove, + .id_table = da9052_wled_ids, + .driver = { + .name = "da9052-wled", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(da9052_wled_driver); + +MODULE_AUTHOR("David Dajun Chen <dchen(a)diasemi.com>"); +MODULE_DESCRIPTION("Backlight driver for DA9052 PMIC"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:da9052-backlight");

12 years, 6 months

3, 2, 1....BLASTOFF

by Zach Pfeffer

The preliminary 12.03 Android plan is up. https://launchpad.net/linaro-android/+milestone/12.03 ARM A15, A7 and A15/A7 Fast Models running Android, big.LITTLE testing, dual SD cards, unit tests, more enablement, improved Android SMP, and more!!! -- Zach Pfeffer Android Platform Team Lead, Linaro Platform Teams Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

12 years, 6 months

[Patch 07/07] Touch: DA9052/53 touch screen driver v1

by Ashish Jangam

This driver adds support for DA9052/53 4-wire resistive ADC interfaced touchscreen controller. DA9052/53 is a MFD therefore this driver depends on DA9052/53 core driver for core functionalities. This patch is functionally tested on Samsung SMDKV6410. Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> Signed-off-by: Ashish Jangam <ashish.jangam(a)kpitcummins.com> --- drivers/input/touchscreen/Kconfig | 7 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/da9052_tsi.c | 353 ++++++++++++++++++++++++++++++++ 3 files changed, 361 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/da9052_tsi.c diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 2b21a70..32a3e26 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -187,6 +187,13 @@ config TOUCHSCREEN_DA9034 Say Y here to enable the support for the touchscreen found on Dialog Semiconductor DA9034 PMIC. +config TOUCHSCREEN_DA9052 + tristate "Dialog DA9052/DA9053 TSI" + depends on PMIC_DA9052 + help + Say y here to support the touchscreen found on Dialog Semiconductor + DA9052-BC and DA9053-AA/Bx PMICs. + config TOUCHSCREEN_DYNAPRO tristate "Dynapro serial touchscreen" select SERIO diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index d9acbdc..c76b21c 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_TOUCHSCREEN_CYTTSP_CORE) += cyttsp_core.o obj-$(CONFIG_TOUCHSCREEN_CYTTSP_I2C) += cyttsp_i2c.o obj-$(CONFIG_TOUCHSCREEN_CYTTSP_SPI) += cyttsp_spi.o obj-$(CONFIG_TOUCHSCREEN_DA9034) += da9034-ts.o +obj-$(CONFIG_TOUCHSCREEN_DA9052) += da9052_tsi.o obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += hampshire.o obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c new file mode 100644 index 0000000..8c672ee --- /dev/null +++ b/drivers/input/touchscreen/da9052_tsi.c @@ -0,0 +1,353 @@ +/* + * TSI driver for Dialog DA9052 + * + * Copyright(c) 2012 Dialog Semiconductor Ltd. + * + * Author: David Dajun Chen <dchen(a)diasemi.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + */ +#include <linux/module.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/interrupt.h> + +#include <linux/mfd/da9052/reg.h> +#include <linux/mfd/da9052/da9052.h> + +#define TSI_PEN_DOWN_STATUS 0x40 + +struct da9052_tsi { + struct da9052 *da9052; + struct input_dev *dev; + struct delayed_work ts_pen_work; + int irq_pendwn; + int irq_datardy; +}; + +static int da9052_ts_start(struct da9052_tsi *tsi) +{ + return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, + 1 << 0, 1 << 0); +} + +static int da9052_ts_stop(struct da9052_tsi *tsi) +{ + return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, 1 << 0, 0); +} + +static irqreturn_t da9052_ts_pendwn_irq(int irq, void *data) +{ + struct da9052_tsi *tsi = data; + + /* Mask PEN_DOWN event and unmask TSI_READY event */ + disable_irq_nosync(tsi->irq_pendwn); + enable_irq(tsi->irq_datardy); + + da9052_ts_start(tsi); + + input_report_key(tsi->dev, BTN_TOUCH, 1); + input_sync(tsi->dev); + + schedule_delayed_work(&tsi->ts_pen_work, HZ/50); + + return IRQ_HANDLED; +} + +static int da9052_ts_read(struct da9052_tsi *tsi) +{ + int ret = 0; + u16 x, y, z; + u8 v; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_X_MSB_REG); + if (ret < 0) + goto exit; + + x = (u16) ret; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_Y_MSB_REG); + if (ret < 0) + goto exit; + + y = (u16) ret; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_Z_MSB_REG); + if (ret < 0) + goto exit; + + z = (u16) ret; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_LSB_REG); + if (ret < 0) + goto exit; + + v = (u8) ret; + + x = ((x << 2) & 0x3fc) | (v & 0x3); + y = ((y << 2) & 0x3fc) | ((v & 0xc) >> 2); + z = ((z << 2) & 0x3fc) | ((v & 0x30) >> 4); + + input_report_abs(tsi->dev, ABS_X, x); + input_report_abs(tsi->dev, ABS_Y, y); + input_report_abs(tsi->dev, ABS_PRESSURE, z); + input_report_key(tsi->dev, BTN_TOUCH, 1); + input_sync(tsi->dev); + +exit: + return ret; +} + +static irqreturn_t da9052_ts_datardy_irq(int irq, void *data) +{ + struct da9052_tsi *tsi = data; + + da9052_ts_read(tsi); + return IRQ_HANDLED; +} + +static void da9052_ts_pen_work(struct work_struct *work) +{ + struct da9052_tsi *tsi = container_of(work, struct da9052_tsi, + ts_pen_work.work); + struct input_dev *ip_dev = tsi->dev; + int ret; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_LSB_REG); + if (ret < 0) + return; + + if (ret & TSI_PEN_DOWN_STATUS) /* Pen Down */ + schedule_delayed_work(&tsi->ts_pen_work, HZ/50); + else { + /* Pen UP */ + da9052_ts_stop(tsi); + + /* Mask TSI_READY event and unmask PEN_DOWN event */ + disable_irq(tsi->irq_datardy); + enable_irq(tsi->irq_pendwn); + + /* Report Pen UP */ + input_report_abs(ip_dev, ABS_PRESSURE, 0); + input_report_key(ip_dev, BTN_TOUCH, 0); + input_sync(ip_dev); + } +} + +static int __devinit da9052_ts_configure_gpio(struct da9052 *da9052) +{ + int ret; + + ret = da9052_reg_update(da9052, DA9052_GPIO_2_3_REG, 0x30, 0); + if (ret < 0) + return ret; + + ret = da9052_reg_update(da9052, DA9052_GPIO_4_5_REG, 0x33, 0); + if (ret < 0) + return ret; + + ret = da9052_reg_update(da9052, DA9052_GPIO_6_7_REG, 0x33, 0); + + return ret; +} + +static int __devinit da9052_configure_tsi(struct da9052_tsi *tsi) +{ + ssize_t ret; + + ret = da9052_ts_configure_gpio(tsi->da9052); + if (ret < 0) + return ret; + + /* Measure TSI sample every 1ms */ + ret = da9052_reg_update(tsi->da9052, DA9052_ADC_CONT_REG, + 1 << 6, 1 << 6); + if (ret < 0) + return ret; + + /* TSI_DELAY: 3 slots, TSI_SKIP: 0 slots, TSI_MODE: XYZP */ + ret = da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, 0xFC, 0xC0); + if (ret < 0) + return ret; + + /* Mask PEN_DOWN and TSI_READY events */ + disable_irq(tsi->irq_pendwn); + disable_irq(tsi->irq_datardy); + + /*Supply TSIRef through LD09 */ + ret = da9052_reg_write(tsi->da9052, DA9052_LDO9_REG, 0x59); + + return ret; +} + +static int da9052_ts_input_open(struct input_dev *input_dev) +{ + struct da9052_tsi *tsi = input_get_drvdata(input_dev); + + /* Unmask PEN_DOWN event */ + enable_irq(tsi->irq_pendwn); + + /* Enable Pen Detect Circuit */ + return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, + 1 << 1, 1 << 1); +} + +static void da9052_ts_input_close(struct input_dev *input_dev) +{ + struct da9052_tsi *tsi = input_get_drvdata(input_dev); + int ret; + + ret = da9052_reg_read(tsi->da9052, DA9052_TSI_LSB_REG); + + if (ret & TSI_PEN_DOWN_STATUS) /* Pen Down */ + disable_irq(tsi->irq_datardy); + else + disable_irq(tsi->irq_pendwn); + + cancel_delayed_work_sync(&tsi->ts_pen_work); + + da9052_ts_stop(tsi); + + /* Disable Pen Detect Circuit */ + da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, 1 << 1, 0); +} + +static int __devinit da9052_ts_probe(struct platform_device *pdev) +{ + struct da9052_tsi *tsi; + struct input_dev *input_dev; + struct da9052 *da9052; + int ret; + + da9052 = dev_get_drvdata(pdev->dev.parent); + if (da9052 == NULL) + return -EINVAL; + + tsi = devm_kzalloc(&pdev->dev, sizeof(struct da9052_tsi), GFP_KERNEL); + if (!tsi) + return -ENOMEM; + + input_dev = input_allocate_device(); + if (!input_dev) { + dev_err(tsi->da9052->dev, "Failed to allocate input device\n"); + ret = -ENOMEM; + goto err_mem; + } + + INIT_DELAYED_WORK(&tsi->ts_pen_work, da9052_ts_pen_work); + + tsi->da9052 = da9052; + + input_dev->id.version = 0x0101; + input_dev->id.vendor = 0x15B6; + input_dev->id.product = 0x9052; + input_dev->name = "Dialog DA9052 TouchScreen Driver"; + input_dev->dev.parent = &pdev->dev; + input_dev->open = da9052_ts_input_open; + input_dev->close = da9052_ts_input_close; + __set_bit(EV_ABS, input_dev->evbit); + __set_bit(EV_KEY, input_dev->evbit); + __set_bit(BTN_TOUCH, input_dev->keybit); + + input_set_abs_params(input_dev, ABS_X, 0, 1023, 0, 0); + input_set_abs_params(input_dev, ABS_Y, 0, 1023, 0, 0); + input_set_abs_params(input_dev, ABS_PRESSURE, 0, 1023, 0, 0); + + tsi->dev = input_dev; + input_set_drvdata(input_dev, tsi); + + tsi->irq_pendwn = platform_get_irq_byname(pdev, "PENDWN"); + if (tsi->irq_pendwn < 0) { + ret = tsi->irq_pendwn; + goto err_input; + } + + ret = request_threaded_irq(tsi->irq_pendwn, NULL, da9052_ts_pendwn_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "PENDWN", tsi); + if (ret < 0) { + dev_err(tsi->da9052->dev, + "Failed to register %s IRQ %d, error = %d\n", "PENDWN", + tsi->irq_pendwn, ret); + goto err_input; + } + + tsi->irq_datardy = platform_get_irq_byname(pdev, "TSIRDY"); + if (tsi->irq_datardy < 0) { + ret = tsi->irq_datardy; + goto err_pendwn_irq; + } + + ret = request_threaded_irq(tsi->irq_datardy, NULL, + da9052_ts_datardy_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "TSIRDY", tsi); + if (ret < 0) { + dev_err(tsi->da9052->dev, + "Failed to register %s IRQ %d, error = %d\n", "TSIRDY", + tsi->irq_datardy, ret); + goto err_pendwn_irq; + } + + ret = da9052_configure_tsi(tsi); + if (ret < 0) + goto err_datardy_irq; + + ret = input_register_device(tsi->dev); + if (ret < 0) + goto err_datardy_irq; + + platform_set_drvdata(pdev, tsi); + + return 0; + +err_datardy_irq: + free_irq(tsi->irq_datardy, tsi); +err_pendwn_irq: + free_irq(tsi->irq_pendwn, tsi); +err_input: + input_free_device(input_dev); +err_mem: + devm_kfree(&pdev->dev, tsi); + return ret; +} + +static int __devexit da9052_ts_remove(struct platform_device *pdev) +{ + struct da9052_tsi *tsi = platform_get_drvdata(pdev); + + da9052_reg_write(tsi->da9052, DA9052_LDO9_REG, 0x19); + + free_irq(tsi->irq_pendwn, tsi); + free_irq(tsi->irq_datardy, tsi); + + input_unregister_device(tsi->dev); + + platform_set_drvdata(pdev, NULL); + + devm_kfree(&pdev->dev, tsi); + + return 0; +} + +static struct platform_driver da9052_tsi_driver = { + + .probe = da9052_ts_probe, + .remove = __devexit_p(da9052_ts_remove), + .driver = { + .name = "da9052-tsi", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(da9052_tsi_driver); + +MODULE_DESCRIPTION("Touchscreen driver for Dialog Semiconductor DA9052"); +MODULE_AUTHOR("David Dajun Chen <dchen(a)diasemi.com>"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:da9052-tsi");

12 years, 6 months

Last call for patches for the 12.02 release of linux-linaro kernel

by Andrey Konovalov

Greetings, If someone has something which is not in the mainline, was not in the 12.01 kernel release, but worth including into the 12.02 kernel release, please let me know by the end of Feb 14, PST (the git branch where I could pull from). This release will be v3.3-rc3 based, so you patches should be based on that (easiest for me), or on the tip of the linus tree. My expectations are that the power management WG has some topics to add to the 12.02. I am aware of git://git.secretlab.ca/git/linux-2.6.git, irqdomain/next The kernel working group has some blueprints for 12.02. Please let me know, if there is something for me to do here. The following commits from linux-linaro-3.2 branch will be carried over to 12.02: commit 2eb6f8b98d8471c83be7e3ab53fe4386884c96a9 Author: Vincent Guittot <vincent.guittot(a)linaro.org> Date: Fri Oct 21 09:02:47 2011 +0200 sched: Ensure cpu_power periodic update commit 2b21b980917662503a16e079b5d4a5a8a17886cd Author: Arnd Bergmann <arnd(a)arndb.de> Date: Sat Oct 8 17:07:50 2011 +0200 ARM: kprobes: work around build errors commit 61d24dd4d0528d369ea81f6e5d5e1db9c62ad46a Author: Ming Lei <ming.lei(a)canonical.com> Date: Wed Aug 31 00:03:13 2011 +0800 usb: ehci: make HC see up-to-date qh/qtd descriptor ASAP Amit (Amit Daniel Kachhap), please let me know if for 12.02 I should use the commits below, or take an updated version from you: ARM: exynos4: Add thermal sensor driver platform device support thermal: exynos4: Register the tmu sensor with the thermal interface layer thermal: exynos: Add thermal interface support for linux thermal layer thermal: Add generic cpu cooling implementation thermal: Add a new trip type to use cooling device instance number EXYNOS: Make EXYNOS common cpufreq driver ARM: exynos: Enable l2 configuration through device tree ARM: exynos: remove useless code to save/restore L2 ARM: exynos: save L2 settings during bootup ARM: s5p: add L2 early resume code ARM: exynos: Add support AFTR mode on EXYNOS4210 Thanks, Andrey Konovalov

12 years, 6 months

Announcing Linarotv-xmbc image

by Tom Gall

For the 12.01 cycle the Linaro Platforms team is pleased to announce the availability of the new linarotv-xbmc based image. This combines the xbmc media server project with linaro's leb to result in a "works out of the box" arm based media server image. It can be found at http://snapshots.linaro.org/oneiric/linaro-o-linarotv-xbmc/ Currently the best experience can be found on Panda/Panda ES however boards with hardware video acceleration enabled should work well. We welcome feedback and suggestions on the image. Support is on a as "best can" basis. Bugs if found should be written against linaro-ubuntu in lauchpad. Enjoy! -- Regards, Tom "Where's the kaboom!? There was supposed to be an earth-shattering kaboom!" Marvin Martian Multimedia Tech Lead | Linaro.org │ Open source software for ARM SoCs w) tom.gall att linaro.org w) tom_gall att vnet.ibm.com h) tom_gall att mac.com

12 years, 6 months

Do ARM Cortex-A9 PMU supoort oprofile

by zachary6626

Sorry disturbing you! I have ask google for do ARM Cortex-A9 PMU supoort oprofile, but it do not have a answer definitely . So i ask you do ARM Cortex-A9 PMU supoort oprofile. Can u help me? zachary6626

12 years, 6 months

[PATCH 0/3] Framebuffer related fixes for Exynos / Origen

by Tushar Behera

Following patchset is required to add framebuffer support on Origen. The patches are based on following commit on Kukjin's for-next branch. a188e1e "Merge branch 'next-samsung-devel' into for-next" Tushar Behera (3): ARM: EXYNOS: Increase DMA pool allocator size for framebuffer - Required to allocate the framebuffer successfully ARM: EXYNOS: Add clkdev lookup entry for lcd clock - Required for framebuffer operation ARM: EXYNOS: Invert VCLK polarity for framebuffer on Origen board - Required to remove glitch in LCD display arch/arm/mach-exynos/clock.c | 14 +++++++++----- arch/arm/mach-exynos/cpu.c | 7 +++++++ arch/arm/mach-exynos/mach-origen.c | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) -- 1.7.4.1

12 years, 7 months

[PATCH-WIP 00/13] xen/arm: receive Xen events and initialize xenbus

by Stefano Stabellini

Hi all, this patch series is part of the work in progress support for Xen on ARMv7 with virtualization extensions in Linux. It is obviously NOT ready to be accepted upstream but implements enough support to allow Linux Dom0 to receive event channel notifications and initialize xenbus. With this series applied and the corresponding Xen patch series (http://marc.info/?l=xen-devel&m=133001696312879) is possible to boot Linux as Dom0 on Xen on a Versatile Express Cortex A15 emulator and issue basic xl commands, like "xl list" and "xl uptime". "xl create" is still not working though but it is the next on the list :) Working on this series it became obvious that passing the hypercall number as IMM parameter to HVC is not flexible enough because we don't always know the hypercall number at compile time. As a result I changed the hypercall.h header file to use r12 to pass the hypercall number instead. r12 was chosen because it is defined as "intra-procedure call scratch register" so it seems the most appropriate. I have CC'ed the KVM list on the first patch because following previous discussions hypercall.h might become a common header file to issue hypercalls on different hypervisors on ARM. I haven't disentangled the Xen specific bits from the generic ones yet, however it should be straightforward. I am looking forward to hearing your opinions, especially on the hypercall calling convention. The patch series is available here: git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git xenarmv7-1 It is based on the vexpress-dt branch of git://xenbits.xen.org/people/dvrabel/linux.git, that we are currently using as development tree for Linux on Xen on Cortex A15. See http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions. The list of patches with diffstat follows: Stefano Stabellini (13): xen/arm: use r12 to pass the hypercall number to the hypervisor xen/arm: introduce privcmp, physdev_op and memory_op hypercalls. xen/arm: mmu.h and page.h related definitions xen/arm: sync_bitops xen/arm: empty implementation of grant_table arch specific functions xen/arm: missing includes xen/arm: receive xen events on arm xen/arm: fix arm xen guest handle definitions xen/arm: shared_info and start_info xen/arm: empty implementation of xen_remap_domain_mfn_range xen/arm: Introduce xen_pfn_t for pfn and mfn types xen/arm: compile and run xenbus xen/arm: compile grant-table features events and xenbus, do not compile pci arch/arm/Kconfig | 4 + arch/arm/include/asm/sync_bitops.h | 17 ++++ arch/arm/include/asm/xen/events.h | 9 ++ arch/arm/include/asm/xen/grant_table.h | 2 + arch/arm/include/asm/xen/hypercall.h | 111 ++++++++++++++++++---------- arch/arm/include/asm/xen/interface.h | 12 +-- arch/arm/include/asm/xen/mmu.h | 61 +++++++++++++++ arch/arm/include/asm/xen/page.h | 14 +++- arch/arm/xen/Makefile | 2 +- arch/arm/xen/enlighten.c | 71 ++++++++++++++++-- arch/arm/xen/grant-table.c | 47 ++++++++++++ arch/ia64/include/asm/xen/interface.h | 3 +- arch/x86/include/asm/xen/interface.h | 3 + drivers/xen/Makefile | 7 +- drivers/xen/events.c | 36 +++++++++- drivers/xen/grant-table.c | 2 + drivers/xen/xenbus/xenbus_client.c | 1 + drivers/xen/xenbus/xenbus_comms.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 26 ++++--- drivers/xen/xenbus/xenbus_probe_frontend.c | 1 + drivers/xen/xenbus/xenbus_xs.c | 3 +- drivers/xen/xenfs/xenstored.c | 1 + include/xen/interface/grant_table.h | 4 +- include/xen/interface/memory.h | 6 +- include/xen/interface/platform.h | 4 +- include/xen/interface/xen.h | 6 +- include/xen/privcmd.h | 3 +- include/xen/xen.h | 2 +- 28 files changed, 371 insertions(+), 89 deletions(-) Cheers, Stefano

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev February 2012