Skip to contentSkip to conversation

mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c

PATCH In review Axel Lin 2 participants 4 messages Feb 25, 2012 – Mar 1, 2012 Multifunction devices (MFD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 mfd: include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c

Include linux/mfd/pcf50633/pmic.h instead of duplicating the same defines.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mfd/pcf50633-gpio.c |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)
drivers/mfd/pcf50633-gpio.c +1 -26
index 9ab19a8..d02ddf2 100644
@@ -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,
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c

Include linux/mfd/pcf50633/mbc.h instead of duplicating the same defines.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mfd/pcf50633-irq.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/mfd/pcf50633-irq.c +1 -6
index 048a3b9..498286c 100644
@@ -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)
Signature · 1 line
1.7.5.4
#3 lore raw
In reply to Axel Lin

Hi Axel,

Quoted 1 line · Axel Lin

Include linux/mfd/pcf50633/pmic.h instead of duplicating the same defines.

Patch applied, thanks.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#2 lore raw

Re: [PATCH 2/2] mfd: include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c

In reply to Axel Lin

Hi Axel,

Quoted 1 line · Axel Lin

Include linux/mfd/pcf50633/mbc.h instead of duplicating the same defines.

Thanks, patch applied as well.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/