Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD changes from Samuel Ortiz: "MFD bits for the 3.7 merge window. As usual we have a few new drivers: - TI LP8788 - TI OMAP USB TLL - Maxim MAX8907 - SMSC ECE1099 - Dialog Semiconductor DA9055 - A simpler syscon driver that allow us to get rid of the anatop one. Drivers are also gradually getting Device Tree and IRQ domain support. The following drivers got DT support: - palmas, 88pm860x, tc3589x and twl4030-audio And those ones now use the IRQ domain APIs: - 88pm860x, tc3589x, db8500_prcmu Also some other interesting changes: - Intel's ICH LPC now supports Lynx Point - TI's twl4030-audio added a GPO child - tps6527 enabled its backlight subdevice - The twl6030 pwm driver moved to the new PWM subsystem And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x, palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family." Fix up various annoying conflicts: the DT and IRQ domain support came in twice and was already in 3.6. And then it was apparently rebased. Guys, DON'T REBASE! * tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits) ARM: dts: Enable 88pm860x pmic mfd: 88pm860x: Move gpadc init into touch mfd: 88pm860x: Device tree support mfd: 88pm860x: Use irqdomain mfd: smsc: Add support for smsc gpio io/keypad driver backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe mfd: DA9055 core driver mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list mfd: wm5110: Add register patches for revision B mfd: wm5110: Disable control interface error report for WM5110 rev B mfd: max8907: Remove regulator-compatible from DT docs backlight: Add TPS65217 WLED driver mfd: Add backlight as subdevice to the tps65217 mfd: Provide the PRCMU with its own IRQ domain mfd: Fix max8907 sparse warning mfd: Add lp8788 mfd driver mfd: dbx500: Provide a more accurate smp_twd clock mfd: rc5t583: Fix warning messages regulator: palmas: Add DT support mfd: palmas: Change regulator defns to better suite DT ...
This commit is contained in:
Linus Torvalds
@@ -115,6 +115,15 @@ config PWM_TIEHRPWM
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called pwm-tiehrpwm.
|
||||
|
||||
config PWM_TWL6030
|
||||
tristate "TWL6030 PWM support"
|
||||
depends on TWL4030_CORE
|
||||
help
|
||||
Generic PWM framework driver for TWL6030.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called pwm-twl6030.
|
||||
|
||||
config PWM_VT8500
|
||||
tristate "vt8500 pwm support"
|
||||
depends on ARCH_VT8500
|
||||
|
||||
@@ -8,4 +8,5 @@ obj-$(CONFIG_PWM_SAMSUNG) += pwm-samsung.o
|
||||
obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o
|
||||
obj-$(CONFIG_PWM_TIECAP) += pwm-tiecap.o
|
||||
obj-$(CONFIG_PWM_TIEHRPWM) += pwm-tiehrpwm.o
|
||||
obj-$(CONFIG_PWM_TWL6030) += pwm-twl6030.o
|
||||
obj-$(CONFIG_PWM_VT8500) += pwm-vt8500.o
|
||||
|
||||
184
drivers/pwm/pwm-twl6030.c
Normal file
184
drivers/pwm/pwm-twl6030.c
Normal file
@@ -0,0 +1,184 @@
|
||||
/*
|
||||
* twl6030_pwm.c
|
||||
* Driver for PHOENIX (TWL6030) Pulse Width Modulator
|
||||
*
|
||||
* Copyright (C) 2010 Texas Instruments
|
||||
* Author: Hemanth V <hemanthv@ti.com>
|
||||
*
|
||||
* 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 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pwm.h>
|
||||
#include <linux/i2c/twl.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#define LED_PWM_CTRL1 0xF4
|
||||
#define LED_PWM_CTRL2 0xF5
|
||||
|
||||
/* Max value for CTRL1 register */
|
||||
#define PWM_CTRL1_MAX 255
|
||||
|
||||
/* Pull down disable */
|
||||
#define PWM_CTRL2_DIS_PD (1 << 6)
|
||||
|
||||
/* Current control 2.5 milli Amps */
|
||||
#define PWM_CTRL2_CURR_02 (2 << 4)
|
||||
|
||||
/* LED supply source */
|
||||
#define PWM_CTRL2_SRC_VAC (1 << 2)
|
||||
|
||||
/* LED modes */
|
||||
#define PWM_CTRL2_MODE_HW (0 << 0)
|
||||
#define PWM_CTRL2_MODE_SW (1 << 0)
|
||||
#define PWM_CTRL2_MODE_DIS (2 << 0)
|
||||
|
||||
#define PWM_CTRL2_MODE_MASK 0x3
|
||||
|
||||
struct twl6030_pwm_chip {
|
||||
struct pwm_chip chip;
|
||||
};
|
||||
|
||||
static int twl6030_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
|
||||
{
|
||||
int ret;
|
||||
u8 val;
|
||||
|
||||
/* Configure PWM */
|
||||
val = PWM_CTRL2_DIS_PD | PWM_CTRL2_CURR_02 | PWM_CTRL2_SRC_VAC |
|
||||
PWM_CTRL2_MODE_HW;
|
||||
|
||||
ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, LED_PWM_CTRL2);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "%s: Failed to configure PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int twl6030_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
|
||||
int duty_ns, int period_ns)
|
||||
{
|
||||
u8 duty_cycle = (duty_ns * PWM_CTRL1_MAX) / period_ns;
|
||||
int ret;
|
||||
|
||||
ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, duty_cycle, LED_PWM_CTRL1);
|
||||
if (ret < 0) {
|
||||
pr_err("%s: Failed to configure PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int twl6030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
|
||||
{
|
||||
int ret;
|
||||
u8 val;
|
||||
|
||||
ret = twl_i2c_read_u8(TWL6030_MODULE_ID1, &val, LED_PWM_CTRL2);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "%s: Failed to enable PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Change mode to software control */
|
||||
val &= ~PWM_CTRL2_MODE_MASK;
|
||||
val |= PWM_CTRL2_MODE_SW;
|
||||
|
||||
ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, LED_PWM_CTRL2);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "%s: Failed to enable PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
twl_i2c_read_u8(TWL6030_MODULE_ID1, &val, LED_PWM_CTRL2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
|
||||
{
|
||||
int ret;
|
||||
u8 val;
|
||||
|
||||
ret = twl_i2c_read_u8(TWL6030_MODULE_ID1, &val, LED_PWM_CTRL2);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
val &= ~PWM_CTRL2_MODE_MASK;
|
||||
val |= PWM_CTRL2_MODE_HW;
|
||||
|
||||
ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, LED_PWM_CTRL2);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",
|
||||
pwm->label, ret);
|
||||
}
|
||||
}
|
||||
|
||||
static const struct pwm_ops twl6030_pwm_ops = {
|
||||
.request = twl6030_pwm_request,
|
||||
.config = twl6030_pwm_config,
|
||||
.enable = twl6030_pwm_enable,
|
||||
.disable = twl6030_pwm_disable,
|
||||
};
|
||||
|
||||
static int twl6030_pwm_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct twl6030_pwm_chip *twl6030;
|
||||
int ret;
|
||||
|
||||
twl6030 = devm_kzalloc(&pdev->dev, sizeof(*twl6030), GFP_KERNEL);
|
||||
if (!twl6030)
|
||||
return -ENOMEM;
|
||||
|
||||
twl6030->chip.dev = &pdev->dev;
|
||||
twl6030->chip.ops = &twl6030_pwm_ops;
|
||||
twl6030->chip.base = -1;
|
||||
twl6030->chip.npwm = 1;
|
||||
|
||||
ret = pwmchip_add(&twl6030->chip);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
platform_set_drvdata(pdev, twl6030);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int twl6030_pwm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct twl6030_pwm_chip *twl6030 = platform_get_drvdata(pdev);
|
||||
|
||||
return pwmchip_remove(&twl6030->chip);
|
||||
}
|
||||
|
||||
static struct platform_driver twl6030_pwm_driver = {
|
||||
.driver = {
|
||||
.name = "twl6030-pwm",
|
||||
},
|
||||
.probe = twl6030_pwm_probe,
|
||||
.remove = __devexit_p(twl6030_pwm_remove),
|
||||
};
|
||||
module_platform_driver(twl6030_pwm_driver);
|
||||
|
||||
MODULE_ALIAS("platform:twl6030-pwm");
|
||||
MODULE_LICENSE("GPL");
|
||||
Reference in New Issue
Block a user