Skip to contentSkip to conversation

mfd/mc13xxx: cleanups and support for mc13892

PATCH In review Uwe Kleine-König 4 participants 14 messages Sep 29, 2010 – Oct 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mfd/mc13xxx: cleanups and support for mc13892

Hello,

this series adds support for the mc13892 PMIC found as companion e.g. on the MX51 Babbage board. Additionally it includes a few minor cleanups.

Unfortunately the changes done are too heavy for git to detect the renaming.

The following changes since commit 899611ee7d373e5eeda08e9a8632684e1ebbbf00:

Linux 2.6.36-rc6 (2010-09-28 18:01:22 -0700)

are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git next/mc13xxx

Uwe Kleine-König (4):
mfd/mc13783: remove obsolete private data mfd/mc13783: remove deprecated functions mfd/mc13xxx: add support for mc13892
rtc/mc13xxx: add support for the rtc found in the MC13892 PMIC

 drivers/mfd/Kconfig         |    9 +-
 drivers/mfd/Makefile        |    2 +-
 drivers/mfd/mc13783-core.c  |  752 --------------------------------------
 drivers/mfd/mc13xxx-core.c  |  840 +++++++++++++++++++++++++++++++++++++++++++
 drivers/rtc/Kconfig         |    7 +-
 drivers/rtc/Makefile        |    2 +-
 drivers/rtc/rtc-mc13783.c   |  428 ----------------------
 drivers/rtc/rtc-mc13xxx.c   |  437 ++++++++++++++++++++++
 include/linux/mfd/mc13783.h |  239 +++++--------
 include/linux/mfd/mc13xxx.h |  154 ++++++++
 10 files changed, 1542 insertions(+), 1328 deletions(-)
 delete mode 100644 drivers/mfd/mc13783-core.c
 create mode 100644 drivers/mfd/mc13xxx-core.c
 delete mode 100644 drivers/rtc/rtc-mc13783.c
 create mode 100644 drivers/rtc/rtc-mc13xxx.c
 create mode 100644 include/linux/mfd/mc13xxx.h
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#1 lore raw

PATCH 1/4 mfd/mc13783: remove obsolete private data

The regulator driver was converted to get the needed data directly from platform_data by

	a10099b (regulator/mc13783: various cleanups)

so regulators and num_regulators can go away. Then apart from the flag indicating that the adc does a conversion, flags is only a copy of the flags member of platform_data. This flag isn't needed to be returned by mc13783_get_flags, so mc13783_get_flags now gets the flags from platform_data, too and the driver private member is renamed for clearity.

---
 drivers/mfd/mc13783-core.c |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)
drivers/mfd/mc13783-core.c +9 -18
index 6df3498..2506e68 100644
@@ -22,14 +22,10 @@ struct mc13783 {
 	struct spi_device *spidev;
 	struct mutex lock;
 	int irq;
-	int flags;
+	int adcflags;
 
 	irq_handler_t irqhandler[MC13783_NUM_IRQ];
 	void *irqdata[MC13783_NUM_IRQ];
-
-	/* XXX these should go as platformdata to the regulator subdevice */
-	struct mc13783_regulator_init_data *regulators;
-	int num_regulators;
 };
 
 #define MC13783_REG_REVISION			 7
@@ -250,7 +246,10 @@ EXPORT_SYMBOL(mc13783_reg_rmw);
 
 int mc13783_get_flags(struct mc13783 *mc13783)
 {
-	return mc13783->flags;
+	struct mc13783_platform_data *pdata =
+		dev_get_platdata(&mc13783->spidev->dev);
+
+	return pdata->flags;
 }
 EXPORT_SYMBOL(mc13783_get_flags);
 
@@ -493,7 +492,7 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-#define MC13783_ADC_WORKING (1 << 16)
+#define MC13783_ADC_WORKING (1 << 0)
 
 int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 		unsigned int channel, unsigned int *sample)
@@ -509,12 +508,12 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 
 	mc13783_lock(mc13783);
 
-	if (mc13783->flags & MC13783_ADC_WORKING) {
+	if (mc13783->adcflags & MC13783_ADC_WORKING) {
 		ret = -EBUSY;
 		goto out;
 	}
 
-	mc13783->flags |= MC13783_ADC_WORKING;
+	mc13783->adcflags |= MC13783_ADC_WORKING;
 
 	mc13783_reg_read(mc13783, MC13783_ADC0, &old_adc0);
 
@@ -578,7 +577,7 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 		/* restore TSMOD */
 		mc13783_reg_write(mc13783, MC13783_REG_ADC_0, old_adc0);
 
-	mc13783->flags &= ~MC13783_ADC_WORKING;
+	mc13783->adcflags &= ~MC13783_ADC_WORKING;
 out:
 	mc13783_unlock(mc13783);
 
@@ -675,14 +674,6 @@ err_revision:
 		return ret;
 	}
 
-	/* This should go away (BEGIN) */
-	if (pdata) {
-		mc13783->flags = pdata->flags;
-		mc13783->regulators = pdata->regulators;
-		mc13783->num_regulators = pdata->num_regulators;
-	}
-	/* This should go away (END) */
-
 	mc13783_unlock(mc13783);
 
 	if (pdata->flags & MC13783_USE_ADC)
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/4 mfd/mc13783: remove deprecated functions

In reply to Uwe Kleine-König

The last user is gone since v2.6.34-rc1~40

---
 include/linux/mfd/mc13783.h |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)
include/linux/mfd/mc13783.h +0 -18
index 0fa44fb..5f6aff5 100644
@@ -35,24 +35,6 @@ int mc13783_irq_status(struct mc13783 *mc13783, int irq,
 		int *enabled, int *pending);
 int mc13783_irq_ack(struct mc13783 *mc13783, int irq);
 
-static inline int mc13783_mask(struct mc13783 *mc13783, int irq) __deprecated;
-static inline int mc13783_mask(struct mc13783 *mc13783, int irq)
-{
-	return mc13783_irq_mask(mc13783, irq);
-}
-
-static inline int mc13783_unmask(struct mc13783 *mc13783, int irq) __deprecated;
-static inline int mc13783_unmask(struct mc13783 *mc13783, int irq)
-{
-	return mc13783_irq_unmask(mc13783, irq);
-}
-
-static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq) __deprecated;
-static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq)
-{
-	return mc13783_irq_ack(mc13783, irq);
-}
-
 #define MC13783_ADC0		43
 #define MC13783_ADC0_ADREFEN		(1 << 10)
 #define MC13783_ADC0_ADREFMODE		(1 << 11)
Signature · 1 line
1.7.2.3
#3 lore raw

PATCH 3/4 mfd/mc13xxx: add support for mc13892

In reply to Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

---
 drivers/mfd/Kconfig         |    9 +-
 drivers/mfd/Makefile        |    2 +-
 drivers/mfd/mc13783-core.c  |  743 --------------------------------------
 drivers/mfd/mc13xxx-core.c  |  840 +++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/mc13783.h |  247 ++++++-------
 include/linux/mfd/mc13xxx.h |  154 ++++++++
 6 files changed, 1113 insertions(+), 882 deletions(-)
 delete mode 100644 drivers/mfd/mc13783-core.c
 create mode 100644 drivers/mfd/mc13xxx-core.c
 create mode 100644 include/linux/mfd/mc13xxx.h
drivers/mfd/Kconfig +7 -2
index db51ea1..1868d9b 100644
@@ -408,11 +408,16 @@ config MFD_PCF50633
 	  so that function-specific drivers can bind to them.
 
 config MFD_MC13783
-	tristate "Support Freescale MC13783"
+	tristate
+
+config MFD_MC13XXX
+	tristate "Support Freescale MC13783 and MC13892"
 	depends on SPI_MASTER
 	select MFD_CORE
+	select MFD_MC13783
 	help
-	  Support for the Freescale (Atlas) MC13783 PMIC and audio CODEC.
+	  Support for the Freescale (Atlas) PMIC and audio CODECs
+	  MC13783 and MC13892.
 	  This driver provides common support for accessing  the device,
 	  additional drivers must be enabled in order to use the
 	  functionality of the device.
drivers/mfd/Makefile +1 -1
index feaeeae..56965c9 100644
@@ -39,7 +39,7 @@ obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
 obj-$(CONFIG_TWL4030_CODEC)	+= twl4030-codec.o
 obj-$(CONFIG_TWL6030_PWM)	+= twl6030-pwm.o
 
-obj-$(CONFIG_MFD_MC13783)	+= mc13783-core.o
+obj-$(CONFIG_MFD_MC13XXX)	+= mc13xxx-core.o
 
 obj-$(CONFIG_MFD_CORE)		+= mfd-core.o
 
drivers/mfd/mc13783-core.c deleted +0 -743

743 lines not on this page · raw message

drivers/mfd/mc13xxx-core.c new file +840 -0

840 lines not on this page · raw message

include/linux/mfd/mc13783.h +111 -136

289 lines not on this page · raw message

include/linux/mfd/mc13xxx.h new file +154 -0

154 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#4 lore raw

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

Hi Uwe,

Quoted 5 lines · Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

All 4 patches applied, thanks.

I have one comment though:

drivers/mfd/Kconfig config MFD_PCF50633 · line 412

Quoted 11 lines
drivers/mfd/Kconfig +2 -1
index db51ea1..1868d9b 100644
@@ -408,11 +408,16 @@ config MFD_PCF50633
 	  so that function-specific drivers can bind to them.
 
 config MFD_MC13783
-	tristate "Support Freescale MC13783"
+	tristate
+

I don't think it's worth keeping this symbol around.

Cheers,
Samuel.

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

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

Quoted 9 lines · Samuel Ortiz

Hi Uwe,

Quoted 5 lines · Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

All 4 patches applied, thanks.

Thanks.

Quoted 9 lines

I have one comment though:

Quoted 7 lines
drivers/mfd/Kconfig +0 -0
index db51ea1..1868d9b 100644
@@ -408,11 +408,16 @@ config MFD_PCF50633
 	  so that function-specific drivers can bind to them.
 
Quoted 5 lines

drivers/mfd/Kconfig config MFD_PCF50633 · line 412

Quoted 4 lines
drivers/mfd/Kconfig +2 -1
 config MFD_MC13783
-	tristate "Support Freescale MC13783"
+	tristate
+

I don't think it's worth keeping this symbol around.

That's part of the compatibility cruft because some drivers depend on it. This will be removed when all other drivers are converted together with (e.g.) include/mfd/mc13783.h.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#6 lore raw

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

Quoted 21 lines · Uwe Kleine-König
Quoted 9 lines · Samuel Ortiz

Hi Uwe,

Quoted 5 lines · Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

All 4 patches applied, thanks.

Thanks.

Quoted 9 lines

I have one comment though:

Quoted 7 lines
drivers/mfd/Kconfig +0 -0
index db51ea1..1868d9b 100644
@@ -408,11 +408,16 @@ config MFD_PCF50633
 	  so that function-specific drivers can bind to them.
 
Quoted 7 lines
Quoted 5 lines

drivers/mfd/Kconfig config MFD_PCF50633 · line 412

Quoted 4 lines
drivers/mfd/Kconfig +2 -1
 config MFD_MC13783
-	tristate "Support Freescale MC13783"
+	tristate
+

I don't think it's worth keeping this symbol around.

That's part of the compatibility cruft because some drivers depend on it.

Right, there are 4 of them left, I didnt see that.

Quoted 2 lines

This will be removed when all other drivers are converted together with (e.g.) include/mfd/mc13783.h.

It would be nice to have them ready for the next merge window, and I suppose this should go through my tree then.

Cheers,
Samuel.

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

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

Hello Samuel,

Quoted 4 lines
Quoted 2 lines

This will be removed when all other drivers are converted together with (e.g.) include/mfd/mc13783.h.

It would be nice to have them ready for the next merge window, and I suppose this should go through my tree then.

If next window mean the one that opens after 2.6.37-rc1 then I'm not sure I will manage that. I planned to do that for the 2.6.38-rc1 window though.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#8 lore raw

Re: [Customers.Protonic] [PATCH 3/4] mfd/mc13xxx: add support for mc13892

In reply to Uwe Kleine-König
Quoted 132 lines · Uwe Kleine-König

[...]

include/linux/mfd/mc13xxx.h new file +123 -0
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2009-2010 Pengutronix
+ * Uwe Kleine-Koenig <[email protected]>
+ *
+ * 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.
+ */
+#ifndef __LINUX_MFD_MC13XXX_H
+#define __LINUX_MFD_MC13XXX_H
+
+#include <linux/interrupt.h>
+
+struct mc13xxx;
+
+void mc13xxx_lock(struct mc13xxx *mc13xxx);
+void mc13xxx_unlock(struct mc13xxx *mc13xxx);
+
+int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32
 *val); +int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int
 offset, u32 val); +int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned
 int offset, +		u32 mask, u32 val);
+
+int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
+
+int mc13xxx_irq_request(struct mc13xxx *mc13xxx, int irq,
+		irq_handler_t handler, const char *name, void *dev);
+int mc13xxx_irq_request_nounmask(struct mc13xxx *mc13xxx, int irq,
+		irq_handler_t handler, const char *name, void *dev);
+int mc13xxx_irq_free(struct mc13xxx *mc13xxx, int irq, void *dev);
+
+int mc13xxx_irq_mask(struct mc13xxx *mc13xxx, int irq);
+int mc13xxx_irq_unmask(struct mc13xxx *mc13xxx, int irq);
+int mc13xxx_irq_status(struct mc13xxx *mc13xxx, int irq,
+		int *enabled, int *pending);
+int mc13xxx_irq_ack(struct mc13xxx *mc13xxx, int irq);
+
+int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
+
+#define MC13XXX_IRQ_ADCDONE	0
+#define MC13XXX_IRQ_ADCBISDONE	1
+#define MC13XXX_IRQ_TS		2
+#define MC13XXX_IRQ_CHGDET	6
+#define MC13XXX_IRQ_CHGREV	8
+#define MC13XXX_IRQ_CHGSHORT	9
+#define MC13XXX_IRQ_CCCV	10
+#define MC13XXX_IRQ_CHGCURR	11
+#define MC13XXX_IRQ_BPON	12
+#define MC13XXX_IRQ_LOBATL	13
+#define MC13XXX_IRQ_LOBATH	14
+#define MC13XXX_IRQ_1HZ		24
+#define MC13XXX_IRQ_TODA	25
+#define MC13XXX_IRQ_SYSRST	30
+#define MC13XXX_IRQ_RTCRST	31
+#define MC13XXX_IRQ_PC		32
+#define MC13XXX_IRQ_WARM	33
+#define MC13XXX_IRQ_MEMHLD	34
+#define MC13XXX_IRQ_THWARNL	36
+#define MC13XXX_IRQ_THWARNH	37
+#define MC13XXX_IRQ_CLK		38
+
+#define MC13XXX_NUM_IRQ		46
+
+struct regulator_init_data;
+
+struct mc13xxx_regulator_init_data {
+	int id;
+	struct regulator_init_data *init_data;
+};
+
+struct mc13xxx_regulator_platform_data {
+	int num_regulators;
+	struct mc13xxx_regulator_init_data *regulators;
+};
+
+struct mc13xxx_led_platform_data {
+#define MC13783_LED_MD		0
+#define MC13783_LED_AD		1
+#define MC13783_LED_KP		2
+#define MC13783_LED_R1		3
+#define MC13783_LED_G1		4
+#define MC13783_LED_B1		5
+#define MC13783_LED_R2		6
+#define MC13783_LED_G2		7
+#define MC13783_LED_B2		8
+#define MC13783_LED_R3		9
+#define MC13783_LED_G3		10
+#define MC13783_LED_B3		11
+#define MC13783_LED_MAX MC13783_LED_B3
+	int id;
+	const char *name;
+	const char *default_trigger;
+
+/* Three or two bits current selection depending on the led */
+	char max_current;
+};
+
+struct mc13xxx_leds_platform_data {
+	int num_leds;
+	struct mc13xxx_led_platform_data *led;
+
+#define MC13783_LED_TRIODE_MD	(1 << 0)
+#define MC13783_LED_TRIODE_AD	(1 << 1)
+#define MC13783_LED_TRIODE_KP	(1 << 2)
+#define MC13783_LED_BOOST_EN	(1 << 3)
+#define MC13783_LED_TC1HALF	(1 << 4)
+#define MC13783_LED_SLEWLIMTC	(1 << 5)
+#define MC13783_LED_SLEWLIMBL	(1 << 6)
+#define MC13783_LED_TRIODE_TC1	(1 << 7)
+#define MC13783_LED_TRIODE_TC2	(1 << 8)
+#define MC13783_LED_TRIODE_TC3	(1 << 9)
+	int flags;
+
+#define MC13783_LED_AB_DISABLED		0
+#define MC13783_LED_AB_MD1		1
+#define MC13783_LED_AB_MD12		2
+#define MC13783_LED_AB_MD123		3
+#define MC13783_LED_AB_MD1234		4
+#define MC13783_LED_AB_MD1234_AD1	5
+#define MC13783_LED_AB_MD1234_AD12	6
+#define MC13783_LED_AB_MD1_AD		7
+	char abmode;
+
+#define MC13783_LED_ABREF_200MV	0
+#define MC13783_LED_ABREF_400MV	1
+#define MC13783_LED_ABREF_600MV	2
+#define MC13783_LED_ABREF_800MV	3
+	char abref;

include/linux/mfd/mc13xxx.h line 138

Quoted 10 lines
include/linux/mfd/mc13xxx.h new file +10 -0
+
+#define MC13783_LED_PERIOD_10MS		0
+#define MC13783_LED_PERIOD_100MS	1
+#define MC13783_LED_PERIOD_500MS	2
+#define MC13783_LED_PERIOD_2S		3
+	char bl_period;
+	char tc1_period;
+	char tc2_period;
+	char tc3_period;
+};

The LED drivers in mc13892 and mc13783 are very different. We should have separate pdev struct for these!

Best regards,

Signature · 2 lines
David Jander
Protonic Holland.
#9 lore raw

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

In reply to Uwe Kleine-König

Hi Samuel,

Quoted 29 lines · Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

---
 drivers/mfd/Kconfig         |    9 +-
 drivers/mfd/Makefile        |    2 +-
 drivers/mfd/mc13783-core.c  |  743 --------------------------------------
 drivers/mfd/mc13xxx-core.c  |  840 +++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/mc13783.h |  247 ++++++-------
 include/linux/mfd/mc13xxx.h |  154 ++++++++
 6 files changed, 1113 insertions(+), 882 deletions(-)
 delete mode 100644 drivers/mfd/mc13783-core.c
 create mode 100644 drivers/mfd/mc13xxx-core.c
 create mode 100644 include/linux/mfd/mc13xxx.h

[...]

drivers/mfd/mc13xxx-core.c new file +3 -0
new file mode 100644
index 0000000..93258ad
@@ -0,0 +1,840 @@
+/*
+ * Copyright 2009-2010 Pengutronix
+ * Uwe Kleine-Koenig <[email protected]>

drivers/mfd/mc13xxx-core.c line 13

Quoted 10 lines
drivers/mfd/mc13xxx-core.c new file +10 -0
+ *
+ * loosely based on an earlier driver that has
+ * Copyright 2009 Pengutronix, Sascha Hauer <[email protected]>
+ *
+ * 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.
+ */
+#define DEBUG
+#define VERBOSE_DEBUG

David Jander gave me a hint via private mail that I forgot to remove these two #defines.
Would you care to remove these before Linus pulls? Should I send a patch or do you do it by hand?

Thanks to both of you,
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#10 lore raw

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

Hi Uwe,

Quoted 38 lines · Uwe Kleine-König

Hi Samuel,

Quoted 35 lines · Uwe Kleine-König

mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough to mc13782 to support it in a single driver.

This patch introduces enough compatibility cruft to keep all users of the superseded mc13783 driver unchanged.

---
 drivers/mfd/Kconfig         |    9 +-
 drivers/mfd/Makefile        |    2 +-
 drivers/mfd/mc13783-core.c  |  743 --------------------------------------
 drivers/mfd/mc13xxx-core.c  |  840 +++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/mc13783.h |  247 ++++++-------
 include/linux/mfd/mc13xxx.h |  154 ++++++++
 6 files changed, 1113 insertions(+), 882 deletions(-)
 delete mode 100644 drivers/mfd/mc13783-core.c
 create mode 100644 drivers/mfd/mc13xxx-core.c
 create mode 100644 include/linux/mfd/mc13xxx.h

[...]

drivers/mfd/mc13xxx-core.c new file +9 -0
new file mode 100644
index 0000000..93258ad
@@ -0,0 +1,840 @@
+/*
+ * Copyright 2009-2010 Pengutronix
+ * Uwe Kleine-Koenig <[email protected]>
+ *
+ * loosely based on an earlier driver that has
+ * Copyright 2009 Pengutronix, Sascha Hauer <[email protected]>
+ *
+ * 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
Quoted 8 lines

drivers/mfd/mc13xxx-core.c line 13

Quoted 4 lines
drivers/mfd/mc13xxx-core.c new file +4 -0
+ * Free Software Foundation.
+ */
+#define DEBUG
+#define VERBOSE_DEBUG

David Jander gave me a hint via private mail that I forgot to remove these two #defines.
Would you care to remove these before Linus pulls? Should I send a patch or do you do it by hand?

I'll take care of it, don't bother.

Cheers,
Samuel.

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

Re: [PATCH 3/4] mfd/mc13xxx: add support for mc13892

In reply to Uwe Kleine-König

Hi Uwe,

Quoted 6 lines · Uwe Kleine-König

drivers/mfd/mc13xxx-core.c line 13

Quoted 2 lines
drivers/mfd/mc13xxx-core.c new file +2 -0
+#define DEBUG
+#define VERBOSE_DEBUG

David Jander gave me a hint via private mail that I forgot to remove these two #defines.
Would you care to remove these before Linus pulls? Should I send a patch or do you do it by hand?

That's fixed now.

Cheers,
Samuel.

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

PATCH 4/4 rtc/mc13xxx: add support for the rtc found in the MC13892 PMIC

In reply to Uwe Kleine-König

The mfd driver for MC13783 recently got support for MC13892 and was renamed accordingly from mc13783-core to mc13xxx-core. Do the same for rtc-mc13783.

The only relevant change is to use platform id's to tell the platform bus that this driver is responsible for mc13892-rtc devices, too.

---
 drivers/rtc/Kconfig       |    7 +-
 drivers/rtc/Makefile      |    2 +-
 drivers/rtc/rtc-mc13783.c |  428 --------------------------------------------
 drivers/rtc/rtc-mc13xxx.c |  437 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 442 insertions(+), 432 deletions(-)
 delete mode 100644 drivers/rtc/rtc-mc13783.c
 create mode 100644 drivers/rtc/rtc-mc13xxx.c
drivers/rtc/Kconfig +4 -3
index 48ca713..6ac83c2 100644
@@ -926,10 +926,11 @@ config RTC_DRV_PCAP
 	  the PCAP2 ASIC used on some Motorola phones.
 
 config RTC_DRV_MC13783
-	depends on MFD_MC13783
-	tristate "Freescale MC13783 RTC"
+	depends on MFD_MC13XXX
+	tristate "Freescale MC13xxx RTC"
 	help
-	  This enables support for the Freescale MC13783 PMIC RTC
+	  This enables support for the RTCs found on Freescale's PMICs
+	  MC13783 and MC13892.
 
 config RTC_DRV_MPC5121
 	tristate "Freescale MPC5121 built-in RTC"
drivers/rtc/Makefile +1 -1
index 0f207b3..61d8848 100644
@@ -60,7 +60,7 @@ obj-$(CONFIG_RTC_MXC)		+= rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX8925)	+= rtc-max8925.o
 obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o
-obj-$(CONFIG_RTC_DRV_MC13783)	+= rtc-mc13783.o
+obj-$(CONFIG_RTC_DRV_MC13XXX)	+= rtc-mc13xxx.o
 obj-$(CONFIG_RTC_DRV_MSM6242)	+= rtc-msm6242.o
 obj-$(CONFIG_RTC_DRV_MPC5121)	+= rtc-mpc5121.o
 obj-$(CONFIG_RTC_DRV_MV)	+= rtc-mv.o
drivers/rtc/rtc-mc13783.c deleted +0 -428

428 lines not on this page · raw message

drivers/rtc/rtc-mc13xxx.c new file +437 -0

437 lines not on this page · raw message

Signature · 1 line
1.7.2.3
Acked-by on v1 4/4
#13 lore raw

Re: [PATCH 4/4] rtc/mc13xxx: add support for the rtc found in the MC13892 PMIC

Quoted 8 lines · On Wed, 29 Sep 2010 18:23:47 +0200 Uwe Kleine-König…

The mfd driver for MC13783 recently got support for MC13892 and was renamed accordingly from mc13783-core to mc13xxx-core. Do the same for rtc-mc13783.

The only relevant change is to use platform id's to tell the platform bus that this driver is responsible for mc13892-rtc devices, too.

Signature · 6 lines
 Best regards,

 Alessandro Zummo,
  Tower Technologies - Torino, Italy

  http://www.towertech.it