mfd: Factor out WM831x I2C I/O from the core driver
Subsystems (5)
PATCH 1/2 mfd: Factor out WM831x I2C I/O from the core driver
In preparation for the addition of SPI support for the WM831x move the I2C specific code into a separate file with a separate Kconfig option so the I2C support can be excluded from the build.
Also update the 1133-EV1 PMIC module support for SMDK6410 to use the new symbol.
---
Resending as my finger macro sent these to the ALSA list.
arch/arm/mach-s3c64xx/Kconfig | 1 + drivers/mfd/Kconfig | 14 +++-- drivers/mfd/Makefile | 1 + drivers/mfd/wm831x-core.c | 138 +------------------------------------ drivers/mfd/wm831x-i2c.c | 143 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/wm831x/core.h | 12 +++ 6 files changed, 170 insertions(+), 139 deletions(-) create mode 100644 drivers/mfd/wm831x-i2c.c
arch/arm/mach-s3c64xx/Kconfig +1 -0
@@ -185,6 +185,7 @@ config SMDK6410_WM1192_EV1 select REGULATOR_WM831X select S3C24XX_GPIO_EXTRA64 select MFD_WM831X + select MFD_WM831X_I2C help The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC daughtercard for the Samsung SMDK6410 reference platform.
drivers/mfd/Kconfig +9 -5
@@ -315,14 +315,18 @@ config MFD_WM8400 the functionality of the device. config MFD_WM831X - bool "Support Wolfson Microelectronics WM831x/2x PMICs" + bool + depends on GENERIC_HARDIRQS + +config MFD_WM831X_I2C + bool "Support Wolfson Microelectronics WM831x/2x PMICs with I2C" select MFD_CORE depends on I2C=y && GENERIC_HARDIRQS help - Support for the Wolfson Microelecronics WM831x and WM832x PMICs. - This driver provides common support for accessing the device, - additional drivers must be enabled in order to use the - functionality of the device. + Support for the Wolfson Microelecronics WM831x and WM832x PMICs + when controlled using I2C. This driver provides common support + for accessing the device, additional drivers must be enabled in + order to use the functionality of the device. config MFD_WM8350 bool
drivers/mfd/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o tmio_core.o obj-$(CONFIG_MFD_WM8400) += wm8400-core.o wm831x-objs := wm831x-core.o wm831x-irq.o wm831x-otp.o obj-$(CONFIG_MFD_WM831X) += wm831x.o +obj-$(CONFIG_MFD_WM831X_I2C) += wm831x-i2c.o wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o wm8350-objs += wm8350-irq.o obj-$(CONFIG_MFD_WM8350) += wm8350.o
drivers/mfd/wm831x-core.c +4 -134
173 lines not on this page · raw message
drivers/mfd/wm831x-i2c.c new file +143 -0
143 lines not on this page · raw message
include/linux/mfd/wm831x/core.h +12 -0
@@ -238,6 +238,15 @@ struct regulator_dev;#define WM831X_NUM_IRQ_REGS 5 +enum wm831x_parent { +WM8310 =0x8310 , +WM8311 =0x8311 , +WM8312 =0x8312 , +WM8320 =0x8320 , +WM8321 =0x8321 , +WM8325 =0x8325 , +}; +struct wm831x {struct mutex io_lock;
@@ -285,6 +294,9 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,int wm831x_bulk_read (struct wm831x *wm831x,unsigned short reg,int count,u16 *buf); +int wm831x_device_init (struct wm831x *wm831x,unsigned long id,int irq); +void wm831x_device_exit (struct wm831x *wm831x); +int wm831x_device_suspend (struct wm831x *wm831x);int wm831x_irq_init (struct wm831x *wm831x,int irq);void wm831x_irq_exit (struct wm831x *wm831x);
Signature · 1 line
1.7.1
PATCH 2/2 mfd: Add WM831x SPI support
Implement support for controlling WM831x and WM832x devices using SPI.
---
Resending as my finger macro sent these to the ALSA list.
drivers/mfd/Kconfig | 10 ++ drivers/mfd/Makefile | 1 + drivers/mfd/wm831x-spi.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 0 deletions(-) create mode 100644 drivers/mfd/wm831x-spi.c
drivers/mfd/Kconfig +10 -0
@@ -328,6 +328,16 @@ config MFD_WM831X_I2C for accessing the device, additional drivers must be enabled in order to use the functionality of the device. +config MFD_WM831X_SPI + bool "Support Wolfson Microelectronics WM831x/2x PMICs with SPI" + select MFD_CORE + depends on SPI_MASTER && GENERIC_HARDIRQS + help + Support for the Wolfson Microelecronics WM831x and WM832x PMICs + when controlled using SPI. This driver provides common support + for accessing the device, additional drivers must be enabled in + order to use the functionality of the device. + config MFD_WM8350 bool depends on GENERIC_HARDIRQS
drivers/mfd/Makefile +1 -0
@@ -25,6 +25,7 @@ obj-$(CONFIG_MFD_WM8400) += wm8400-core.o wm831x-objs := wm831x-core.o wm831x-irq.o wm831x-otp.o obj-$(CONFIG_MFD_WM831X) += wm831x.o obj-$(CONFIG_MFD_WM831X_I2C) += wm831x-i2c.o +obj-$(CONFIG_MFD_WM831X_SPI) += wm831x-spi.o wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o wm8350-objs += wm8350-irq.o obj-$(CONFIG_MFD_WM8350) += wm8350.o
drivers/mfd/wm831x-spi.c new file +232 -0
232 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH 2/2] mfd: Add WM831x SPI support
Hi Mark,
Quoted 1 line · Mark Brown
Implement support for controlling WM831x and WM832x devices using SPI.
Patch applied, many thanks.
Cheers,
Samuel.
Quoted 285 lines
Signed-off-by Mark Brown <[email protected]>---
Resending as my finger macro sent these to the ALSA list.
drivers/mfd/Kconfig | 10 ++ drivers/mfd/Makefile | 1 + drivers/mfd/wm831x-spi.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 0 deletions(-) create mode 100644 drivers/mfd/wm831x-spi.cdrivers/mfd/Kconfig +10
-0@@ -328,6 +328,16 @@ config MFD_WM831X_I2C for accessing the device, additional drivers must be enabled in order to use the functionality of the device. +config MFD_WM831X_SPI + bool "Support Wolfson Microelectronics WM831x/2x PMICs with SPI" + select MFD_CORE + depends on SPI_MASTER && GENERIC_HARDIRQS + help + Support for the Wolfson Microelecronics WM831x and WM832x PMICs + when controlled using SPI. This driver provides common support + for accessing the device, additional drivers must be enabled in + order to use the functionality of the device. + config MFD_WM8350 bool depends on GENERIC_HARDIRQSdrivers/mfd/Makefile +1
-0@@ -25,6 +25,7 @@ obj-$(CONFIG_MFD_WM8400) += wm8400-core.o wm831x-objs := wm831x-core.o wm831x-irq.o wm831x-otp.o obj-$(CONFIG_MFD_WM831X) += wm831x.o obj-$(CONFIG_MFD_WM831X_I2C) += wm831x-i2c.o +obj-$(CONFIG_MFD_WM831X_SPI) += wm831x-spi.o wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o wm8350-objs += wm8350-irq.o obj-$(CONFIG_MFD_WM8350) += wm8350.odrivers/mfd/wm831x-spi.c new file +232
-0@@ -0,0 +1,232 @@ +/* +* wm831x-spi.c -- SPI access for Wolfson WM831x PMICs +* +* Copyright 2009,2010 Wolfson Microelectronics PLC. +* +* Author: Mark Brown <[email protected]> +* +* 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/kernel.h> +#include <linux/module.h> +#include <linux/spi/spi.h> + +#include <linux/mfd/wm831x/core.h> + +static int wm831x_spi_read_device (struct wm831x *wm831x,unsigned short reg, +int bytes,void *dest) +{ +u16 tx_val; +u16 *d = dest; +int r, ret; + +/* Go register at a time */ +for (r = reg; r < reg + (bytes /2 ); r++) { + tx_val = r |0x8000 ; + + ret =spi_write_then_read (wm831x->control_data, + (u8 *)&tx_val,2 , (u8 *)d,2 ); +if (ret !=0 ) +return ret; + + *d =be16_to_cpu (*d); + + d++; + } + +return 0 ; +} + +static int wm831x_spi_write_device (struct wm831x *wm831x,unsigned short reg, +int bytes,void *src) +{ +struct spi_device *spi = wm831x->control_data; +u16 *s = src; +u16 data[2 ]; +int ret; + +/* Go register at a time */ +for (r = reg; r < reg + (bytes /2 ); r++) { + data[0 ] = r; + data[1 ] = *s++; + + ret =spi_write (spi, (char *)&data,sizeof (data)); +if (ret !=0 ) +return ret; + } + +return 0 ; +} + +static int __devinit wm831x_spi_probe (struct spi_device *spi) +{ +struct wm831x *wm831x; +enum wm831x_parent type; + +/* Currently SPI support for ID tables is unmerged, we're faking it */ +if (strcmp (spi->modalias,"wm8310" ) ==0 ) + type =WM8310 ; +else if (strcmp (spi->modalias,"wm8311" ) ==0 ) + type =WM8311 ; +else if (strcmp (spi->modalias,"wm8312" ) ==0 ) + type =WM8312 ; +else if (strcmp (spi->modalias,"wm8320" ) ==0 ) + type =WM8320 ; +else if (strcmp (spi->modalias,"wm8321" ) ==0 ) + type =WM8321 ; +else if (strcmp (spi->modalias,"wm8325" ) ==0 ) + type =WM8325 ; +else { +dev_err (&spi->dev,"Unknown device type\n" ); +return -EINVAL ; + } + + wm831x =kzalloc (sizeof (struct wm831x ),GFP_KERNEL ); +if (wm831x ==NULL ) +return -ENOMEM ; + + spi->bits_per_word =16 ; + spi->mode =SPI_MODE_0 ; + +dev_set_drvdata (&spi->dev, wm831x); + wm831x->dev = &spi->dev; + wm831x->control_data = spi; + wm831x->read_dev = wm831x_spi_read_device; + wm831x->write_dev = wm831x_spi_write_device; + +return wm831x_device_init (wm831x, type, spi->irq); +} + +static int __devexit wm831x_spi_remove(struct spi_device *spi) +{ +struct wm831x *wm831x =dev_get_drvdata (&spi->dev); + +wm831x_device_exit (wm831x); + +return 0 ; +} + +static int wm831x_spi_suspend (struct spi_device *spi,pm_message_t m) +{ +struct wm831x *wm831x =dev_get_drvdata (&spi->dev); + +return wm831x_device_suspend (wm831x); +} + +static struct spi_driver wm8310_spi_driver = { + .driver = { + .name ="wm8310" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static struct spi_driver wm8311_spi_driver = { + .driver = { + .name ="wm8311" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static struct spi_driver wm8312_spi_driver = { + .driver = { + .name ="wm8312" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static struct spi_driver wm8320_spi_driver = { + .driver = { + .name ="wm8320" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static struct spi_driver wm8321_spi_driver = { + .driver = { + .name ="wm8321" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static struct spi_driver wm8325_spi_driver = { + .driver = { + .name ="wm8325" , + .bus = &spi_bus_type, + .owner =THIS_MODULE , + }, + .probe = wm831x_spi_probe, + .remove =__devexit_p (wm831x_spi_remove), + .suspend = wm831x_spi_suspend, +}; + +static int __init wm831x_spi_init (void ) +{ +int ret; + + ret =spi_register_driver (&wm8310_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8310 SPI driver: %d\n" , ret); + + ret =spi_register_driver (&wm8311_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8311 SPI driver: %d\n" , ret); + + ret =spi_register_driver (&wm8312_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8312 SPI driver: %d\n" , ret); + + ret =spi_register_driver (&wm8320_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8320 SPI driver: %d\n" , ret); + + ret =spi_register_driver (&wm8321_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8321 SPI driver: %d\n" , ret); + + ret =spi_register_driver (&wm8325_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8325 SPI driver: %d\n" , ret); + +return 0 ; +} +subsys_initcall (wm831x_spi_init); + +static void __exit wm831x_spi_exit(void) +{ +spi_unregister_driver (&wm8325_spi_driver); +spi_unregister_driver (&wm8321_spi_driver); +spi_unregister_driver (&wm8320_spi_driver); +spi_unregister_driver (&wm8312_spi_driver); +spi_unregister_driver (&wm8311_spi_driver); +spi_unregister_driver (&wm8310_spi_driver); +} +module_exit (wm831x_spi_exit); + +MODULE_DESCRIPTION ("SPI support for WM831x/2x AudioPlus PMICs" ); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Mark Brown" );Signature · 1 line
1.7.1
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Re: [PATCH 2/2] mfd: Add WM831x SPI support
Quoted 11 lines · Samuel Ortiz
Review
Quoted 11 lines
(quoted diff) +11
-0+static int wm831x_spi_write_device(struct wm831x *wm831x, unsigned short reg, + int bytes, void *src) +{ + struct spi_device *spi = wm831x->control_data; + u16 *s = src; + u16 data[2]; + int ret; + + /* Go register at a time */ + for (r = reg; r < reg + (bytes / 2); r++) { + data[0] = r;
Oh, gah. We need an extra int r here, I've obviously stuffed up the move from the BSP I was working on. Sorry about that:
Quoted 1 line
From
b7fc0d8ff8c96fabf531d685bda7c3d5b8c51f35Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Tue, 19 Oct 2010 02:53:08 -0700
Subject: [PATCH] mfd: Fix missing variable in WM831x SPI
--- drivers/mfd/wm831x-spi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/wm831x-spi.c +1 -1
@@ -48,7 +48,7 @@ static int wm831x_spi_write_device(struct wm831x *wm831x, unsigned short reg,struct spi_device *spi = wm831x->control_data;u16 *s = src;u16 data[2 ]; -int ret; +int ret, r;/* Go register at a time */ for (r = reg; r < reg + (bytes /2 ); r++) {
Signature · 1 line
1.7.1
Re: [PATCH 2/2] mfd: Add WM831x SPI support
Hi Mark,
Quoted 16 lines · Mark Brown
Quoted 11 lines · Samuel Ortiz
Review
Quoted 11 lines
(quoted diff) +11
-0+static int wm831x_spi_write_device(struct wm831x *wm831x, unsigned short reg, + int bytes, void *src) +{ + struct spi_device *spi = wm831x->control_data; + u16 *s = src; + u16 data[2]; + int ret; + + /* Go register at a time */ + for (r = reg; r < reg + (bytes / 2); r++) { + data[0] = r;Oh, gah. We need an extra int r here, I've obviously stuffed up the move from the BSP I was working on. Sorry about that:
No problem, I didn't see it as I haven't build my tree yet. I squashed this fix into the initial patch.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Quoted 6 lines · Mark Brown
In preparation for the addition of SPI support for the WM831x move the I2C specific code into a separate file with a separate
Kconfigoption so the I2C support can be excluded from the build.Also update the 1133-EV1 PMIC module support for SMDK6410 to use the new symbol.
Sorry, that's the one I applied.
Cheers,
Samuel.
Quoted 431 lines
Signed-off-by Mark Brown <[email protected]>---
Resending as my finger macro sent these to the ALSA list.
arch/arm/mach-s3c64xx/Kconfig | 1 + drivers/mfd/Kconfig | 14 +++-- drivers/mfd/Makefile | 1 + drivers/mfd/wm831x-core.c | 138 +------------------------------------ drivers/mfd/wm831x-i2c.c | 143 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/wm831x/core.h | 12 +++ 6 files changed, 170 insertions(+), 139 deletions(-) create mode 100644 drivers/mfd/wm831x-i2c.carch/arm/mach-s3c64xx/Kconfig +1
-0@@ -185,6 +185,7 @@ config SMDK6410_WM1192_EV1 select REGULATOR_WM831X select S3C24XX_GPIO_EXTRA64 select MFD_WM831X + select MFD_WM831X_I2C help The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC daughtercard for the Samsung SMDK6410 reference platform.drivers/mfd/Kconfig +9
-5@@ -315,14 +315,18 @@ config MFD_WM8400 the functionality of the device. config MFD_WM831X - bool "Support Wolfson Microelectronics WM831x/2x PMICs" + bool + depends on GENERIC_HARDIRQS + +config MFD_WM831X_I2C + bool "Support Wolfson Microelectronics WM831x/2x PMICs with I2C" select MFD_CORE depends on I2C=y && GENERIC_HARDIRQS help - Support for the Wolfson Microelecronics WM831x and WM832x PMICs. - This driver provides common support for accessing the device, - additional drivers must be enabled in order to use the - functionality of the device. + Support for the Wolfson Microelecronics WM831x and WM832x PMICs + when controlled using I2C. This driver provides common support + for accessing the device, additional drivers must be enabled in + order to use the functionality of the device. config MFD_WM8350 booldrivers/mfd/Makefile +1
-0@@ -24,6 +24,7 @@ obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o tmio_core.o obj-$(CONFIG_MFD_WM8400) += wm8400-core.o wm831x-objs := wm831x-core.o wm831x-irq.o wm831x-otp.o obj-$(CONFIG_MFD_WM831X) += wm831x.o +obj-$(CONFIG_MFD_WM831X_I2C) += wm831x-i2c.o wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o wm8350-objs += wm8350-irq.o obj-$(CONFIG_MFD_WM8350) += wm8350.odrivers/mfd/wm831x-core.c +4
-134@@ -14,7 +14,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/i2c.h> #include <linux/bcd.h> #include <linux/delay.h> #include <linux/mfd/core.h> @@ -90,15 +89,6 @@ int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = { };EXPORT_SYMBOL_GPL (wm831x_isinkv_values); -enum wm831x_parent { -WM8310 =0x8310 , -WM8311 =0x8311 , -WM8312 =0x8312 , -WM8320 =0x8320 , -WM8321 =0x8321 , -WM8325 =0x8325 , -}; -static int wm831x_reg_locked (struct wm831x *wm831x,unsigned short reg) {if (!wm831x->locked)@@ -1447,7 +1437,7 @@ static struct mfd_cell backlight_devs[] = {/* * Instantiate the generic non-control parts of the device. */ -static int wm831x_device_init (struct wm831x *wm831x,unsigned long id,int irq) +int wm831x_device_init (struct wm831x *wm831x,unsigned long id,int irq) {struct wm831x_pdata *pdata = wm831x->dev->platform_data;int rev;@@ -1673,7 +1663,7 @@ err:return ret; } -static void wm831x_device_exit (struct wm831x *wm831x) +void wm831x_device_exit (struct wm831x *wm831x) {wm831x_otp_exit (wm831x);mfd_remove_devices (wm831x->dev);@@ -1683,7 +1673,7 @@ static void wm831x_device_exit(struct wm831x *wm831x)kfree (wm831x); } -static int wm831x_device_suspend (struct wm831x *wm831x) +int wm831x_device_suspend (struct wm831x *wm831x) {int reg, mask;@@ -1719,126 +1709,6 @@ static int wm831x_device_suspend(struct wm831x *wm831x)return 0 ; } -static int wm831x_i2c_read_device (struct wm831x *wm831x,unsigned short reg, -int bytes,void *dest) -{ -struct i2c_client *i2c = wm831x->control_data; -int ret; -u16 r =cpu_to_be16 (reg); - - ret =i2c_master_send (i2c, (unsigned char *)&r,2 ); -if (ret <0 ) -return ret; -if (ret !=2 ) -return -EIO ; - - ret =i2c_master_recv (i2c, dest, bytes); -if (ret <0 ) -return ret; -if (ret != bytes) -return -EIO ; -return 0 ; -} - -/* Currently we allocate the write buffer on the stack; this is OK for -* small writes - if we need to do large writes this will need to be -* revised. -*/ -static int wm831x_i2c_write_device (struct wm831x *wm831x,unsigned short reg, -int bytes,void *src) -{ -struct i2c_client *i2c = wm831x->control_data; -unsigned char msg[bytes +2 ]; -int ret; - - reg =cpu_to_be16 (reg); -memcpy (&msg[0 ], ®,2 ); -memcpy (&msg[2 ], src, bytes); - - ret =i2c_master_send (i2c, msg, bytes +2 ); -if (ret <0 ) -return ret; -if (ret < bytes +2 ) -return -EIO ; - -return 0 ; -} - -static int wm831x_i2c_probe (struct i2c_client *i2c, -const struct i2c_device_id *id) -{ -struct wm831x *wm831x; - - wm831x =kzalloc (sizeof (struct wm831x ),GFP_KERNEL ); -if (wm831x ==NULL ) -return -ENOMEM ; - -i2c_set_clientdata (i2c, wm831x); - wm831x->dev = &i2c->dev; - wm831x->control_data = i2c; - wm831x->read_dev = wm831x_i2c_read_device; - wm831x->write_dev = wm831x_i2c_write_device; - -return wm831x_device_init (wm831x, id->driver_data, i2c->irq); -} - -static int wm831x_i2c_remove (struct i2c_client *i2c) -{ -struct wm831x *wm831x =i2c_get_clientdata (i2c); - -wm831x_device_exit (wm831x); - -return 0 ; -} - -static int wm831x_i2c_suspend (struct i2c_client *i2c,pm_message_t mesg) -{ -struct wm831x *wm831x =i2c_get_clientdata (i2c); - -return wm831x_device_suspend (wm831x); -} - -static const struct i2c_device_id wm831x_i2c_id[] = { - {"wm8310" ,WM8310 }, - {"wm8311" ,WM8311 }, - {"wm8312" ,WM8312 }, - {"wm8320" ,WM8320 }, - {"wm8321" ,WM8321 }, - {"wm8325" ,WM8325 }, - { } -}; -MODULE_DEVICE_TABLE (i2c, wm831x_i2c_id); - - -static struct i2c_driver wm831x_i2c_driver = { - .driver = { - .name ="wm831x" , - .owner =THIS_MODULE , - }, - .probe = wm831x_i2c_probe, - .remove = wm831x_i2c_remove, - .suspend = wm831x_i2c_suspend, - .id_table = wm831x_i2c_id, -}; - -static int __init wm831x_i2c_init (void ) -{ -int ret; - - ret =i2c_add_driver (&wm831x_i2c_driver); -if (ret !=0 ) -pr_err ("Failed to register wm831x I2C driver: %d\n" , ret); - -return ret; -} -subsys_initcall (wm831x_i2c_init); - -static void __exit wm831x_i2c_exit(void) -{ -i2c_del_driver (&wm831x_i2c_driver); -} -module_exit (wm831x_i2c_exit); - -MODULE_DESCRIPTION ("I2C support for the WM831X AudioPlus PMIC" ); +MODULE_DESCRIPTION ("Core support for the WM831X AudioPlus PMIC" );MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Mark Brown" );drivers/mfd/wm831x-i2c.c new file +143
-0@@ -0,0 +1,143 @@ +/* +* wm831x-i2c.c -- I2C access for Wolfson WM831x PMICs +* +* Copyright 2009,2010 Wolfson Microelectronics PLC. +* +* Author: Mark Brown <[email protected]> +* +* 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/kernel.h> +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/delay.h> +#include <linux/mfd/core.h> +#include <linux/slab.h> + +#include <linux/mfd/wm831x/core.h> +#include <linux/mfd/wm831x/pdata.h> + +static int wm831x_i2c_read_device (struct wm831x *wm831x,unsigned short reg, +int bytes,void *dest) +{ +struct i2c_client *i2c = wm831x->control_data; +int ret; +u16 r =cpu_to_be16 (reg); + + ret =i2c_master_send (i2c, (unsigned char *)&r,2 ); +if (ret <0 ) +return ret; +if (ret !=2 ) +return -EIO ; + + ret =i2c_master_recv (i2c, dest, bytes); +if (ret <0 ) +return ret; +if (ret != bytes) +return -EIO ; +return 0 ; +} + +/* Currently we allocate the write buffer on the stack; this is OK for +* small writes - if we need to do large writes this will need to be +* revised. +*/ +static int wm831x_i2c_write_device (struct wm831x *wm831x,unsigned short reg, +int bytes,void *src) +{ +struct i2c_client *i2c = wm831x->control_data; +unsigned char msg[bytes +2 ]; +int ret; + + reg =cpu_to_be16 (reg); +memcpy (&msg[0 ], ®,2 ); +memcpy (&msg[2 ], src, bytes); + + ret =i2c_master_send (i2c, msg, bytes +2 ); +if (ret <0 ) +return ret; +if (ret < bytes +2 ) +return -EIO ; + +return 0 ; +} + +static int wm831x_i2c_probe (struct i2c_client *i2c, +const struct i2c_device_id *id) +{ +struct wm831x *wm831x; + + wm831x =kzalloc (sizeof (struct wm831x ),GFP_KERNEL ); +if (wm831x ==NULL ) +return -ENOMEM ; + +i2c_set_clientdata (i2c, wm831x); + wm831x->dev = &i2c->dev; + wm831x->control_data = i2c; + wm831x->read_dev = wm831x_i2c_read_device; + wm831x->write_dev = wm831x_i2c_write_device; + +return wm831x_device_init (wm831x, id->driver_data, i2c->irq); +} + +static int wm831x_i2c_remove (struct i2c_client *i2c) +{ +struct wm831x *wm831x =i2c_get_clientdata (i2c); + +wm831x_device_exit (wm831x); + +return 0 ; +} + +static int wm831x_i2c_suspend (struct i2c_client *i2c,pm_message_t mesg) +{ +struct wm831x *wm831x =i2c_get_clientdata (i2c); + +return wm831x_device_suspend (wm831x); +} + +static const struct i2c_device_id wm831x_i2c_id[] = { + {"wm8310" ,WM8310 }, + {"wm8311" ,WM8311 }, + {"wm8312" ,WM8312 }, + {"wm8320" ,WM8320 }, + {"wm8321" ,WM8321 }, + {"wm8325" ,WM8325 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, wm831x_i2c_id); + + +static struct i2c_driver wm831x_i2c_driver = { + .driver = { + .name ="wm831x" , + .owner =THIS_MODULE , + }, + .probe = wm831x_i2c_probe, + .remove = wm831x_i2c_remove, + .suspend = wm831x_i2c_suspend, + .id_table = wm831x_i2c_id, +}; + +static int __init wm831x_i2c_init (void ) +{ +int ret; + + ret =i2c_add_driver (&wm831x_i2c_driver); +if (ret !=0 ) +pr_err ("Failed to register wm831x I2C driver: %d\n" , ret); + +return ret; +} +subsys_initcall (wm831x_i2c_init); + +static void __exit wm831x_i2c_exit(void) +{ +i2c_del_driver (&wm831x_i2c_driver); +} +module_exit (wm831x_i2c_exit);include/linux/mfd/wm831x/core.h +12
-0@@ -238,6 +238,15 @@ struct regulator_dev;#define WM831X_NUM_IRQ_REGS 5 +enum wm831x_parent { +WM8310 =0x8310 , +WM8311 =0x8311 , +WM8312 =0x8312 , +WM8320 =0x8320 , +WM8321 =0x8321 , +WM8325 =0x8325 , +}; +struct wm831x {struct mutex io_lock;@@ -285,6 +294,9 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,int wm831x_bulk_read (struct wm831x *wm831x,unsigned short reg,int count,u16 *buf); +int wm831x_device_init (struct wm831x *wm831x,unsigned long id,int irq); +void wm831x_device_exit (struct wm831x *wm831x); +int wm831x_device_suspend (struct wm831x *wm831x);int wm831x_irq_init (struct wm831x *wm831x,int irq);void wm831x_irq_exit (struct wm831x *wm831x);Signature · 1 line
1.7.1
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Hi Mark,
Quoted 17 lines · Mark Brown
arch/arm/mach-s3c64xx/Kconfig +1
-0@@ -185,6 +185,7 @@ config SMDK6410_WM1192_EV1 select REGULATOR_WM831X select S3C24XX_GPIO_EXTRA64 select MFD_WM831X + select MFD_WM831X_I2C help The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC daughtercard for the Samsung SMDK6410 reference platform.drivers/mfd/Kconfig +0
-0
drivers/mfd/Kconfig config MFD_WM8400 · line 323
Quoted 10 lines
drivers/mfd/Kconfig +5
-1@@ -315,14 +315,18 @@ config MFD_WM8400 the functionality of the device. config MFD_WM831X - bool "Support Wolfson Microelectronics WM831x/2x PMICs" + bool + depends on GENERIC_HARDIRQS + +config MFD_WM831X_I2C + bool "Support Wolfson Microelectronics WM831x/2x PMICs with I2C" select MFD_CORE
I think we should select MFD_WM831X here as well otherwise there's nothing preventing us from building the I2C or the SPI part without the core one. And that leads to a build breakage.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Quoted 3 lines · Samuel Ortiz
I think we should select
MFD_WM831Xhere as well otherwise there's nothing preventing us from building the I2C or the SPI part without the core one. And that leads to a build breakage.
I agree, I'll try to send a followup out unless you update the patch before I get to it.
Quoted 8 lines · Mark Brown
Quoted 3 lines · Samuel Ortiz
I think we should select
MFD_WM831Xhere as well otherwise there's nothing preventing us from building the I2C or the SPI part without the core one. And that leads to a build breakage.I agree, I'll try to send a followup out unless you update the patch before I get to it.
I'll update the patch.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Quoted 1 line · Samuel Ortiz
I'll update the patch.
Thanks!