* [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c
@ 2012-02-25 3:36 Axel Lin
2012-02-25 3:37 ` [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c Axel Lin
2012-03-01 10:51 ` [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Samuel Ortiz
0 siblings, 2 replies; 4+ messages in thread
From: Axel Lin @ 2012-02-25 3:36 UTC (permalink / raw)
To: linux-kernel; +Cc: Balaji Rao, Harald Welte, Samuel Ortiz
Include linux/mfd/pcf50633/pmic.h instead of duplicating the same defines.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/pcf50633-gpio.c | 27 +--------------------------
1 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/drivers/mfd/pcf50633-gpio.c b/drivers/mfd/pcf50633-gpio.c
index 9ab19a8..d02ddf2 100644
--- a/drivers/mfd/pcf50633-gpio.c
+++ b/drivers/mfd/pcf50633-gpio.c
@@ -19,32 +19,7 @@
#include <linux/mfd/pcf50633/core.h>
#include <linux/mfd/pcf50633/gpio.h>
-
-enum pcf50633_regulator_id {
- PCF50633_REGULATOR_AUTO,
- PCF50633_REGULATOR_DOWN1,
- PCF50633_REGULATOR_DOWN2,
- PCF50633_REGULATOR_LDO1,
- PCF50633_REGULATOR_LDO2,
- PCF50633_REGULATOR_LDO3,
- PCF50633_REGULATOR_LDO4,
- PCF50633_REGULATOR_LDO5,
- PCF50633_REGULATOR_LDO6,
- PCF50633_REGULATOR_HCLDO,
- PCF50633_REGULATOR_MEMLDO,
-};
-
-#define PCF50633_REG_AUTOOUT 0x1a
-#define PCF50633_REG_DOWN1OUT 0x1e
-#define PCF50633_REG_DOWN2OUT 0x22
-#define PCF50633_REG_MEMLDOOUT 0x26
-#define PCF50633_REG_LDO1OUT 0x2d
-#define PCF50633_REG_LDO2OUT 0x2f
-#define PCF50633_REG_LDO3OUT 0x31
-#define PCF50633_REG_LDO4OUT 0x33
-#define PCF50633_REG_LDO5OUT 0x35
-#define PCF50633_REG_LDO6OUT 0x37
-#define PCF50633_REG_HCLDOOUT 0x39
+#include <linux/mfd/pcf50633/pmic.h>
static const u8 pcf50633_regulator_registers[PCF50633_NUM_REGULATORS] = {
[PCF50633_REGULATOR_AUTO] = PCF50633_REG_AUTOOUT,
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c
2012-02-25 3:36 [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Axel Lin
@ 2012-02-25 3:37 ` Axel Lin
2012-03-01 10:51 ` Samuel Ortiz
2012-03-01 10:51 ` [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Samuel Ortiz
1 sibling, 1 reply; 4+ messages in thread
From: Axel Lin @ 2012-02-25 3:37 UTC (permalink / raw)
To: linux-kernel; +Cc: Balaji Rao, Harald Welte, Samuel Ortiz
Include linux/mfd/pcf50633/mbc.h instead of duplicating the same defines.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/pcf50633-irq.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/pcf50633-irq.c b/drivers/mfd/pcf50633-irq.c
index 048a3b9..498286c 100644
--- a/drivers/mfd/pcf50633-irq.c
+++ b/drivers/mfd/pcf50633-irq.c
@@ -19,12 +19,7 @@
#include <linux/slab.h>
#include <linux/mfd/pcf50633/core.h>
-
-/* Two MBCS registers used during cold start */
-#define PCF50633_REG_MBCS1 0x4b
-#define PCF50633_REG_MBCS2 0x4c
-#define PCF50633_MBCS1_USBPRES 0x01
-#define PCF50633_MBCS1_ADAPTPRES 0x01
+#include <linux/mfd/pcf50633/mbc.h>
int pcf50633_register_irq(struct pcf50633 *pcf, int irq,
void (*handler) (int, void *), void *data)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c
2012-02-25 3:36 [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Axel Lin
2012-02-25 3:37 ` [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c Axel Lin
@ 2012-03-01 10:51 ` Samuel Ortiz
1 sibling, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2012-03-01 10:51 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Balaji Rao, Harald Welte
Hi Axel,
On Sat, Feb 25, 2012 at 11:36:54AM +0800, Axel Lin wrote:
> Include linux/mfd/pcf50633/pmic.h instead of duplicating the same defines.
Patch applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c
2012-02-25 3:37 ` [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c Axel Lin
@ 2012-03-01 10:51 ` Samuel Ortiz
0 siblings, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2012-03-01 10:51 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Balaji Rao, Harald Welte
Hi Axel,
On Sat, Feb 25, 2012 at 11:37:53AM +0800, Axel Lin wrote:
> Include linux/mfd/pcf50633/mbc.h instead of duplicating the same defines.
Thanks, patch applied as well.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-01 10:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-25 3:36 [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Axel Lin
2012-02-25 3:37 ` [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c Axel Lin
2012-03-01 10:51 ` Samuel Ortiz
2012-03-01 10:51 ` [PATCH 1/2] mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).