The goal here is to make way for a more general interface for the
analog baseband chips ab3100 ab3550 ab550 and future chips.

This patch have been divided into two parts since both changing name
and content of a file is not recommended in git.

Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
---
 arch/arm/mach-u300/i2c.c   |    2 +-
 drivers/mfd/ab3100-core.c  |    2 +-
 drivers/mfd/ab3100-otp.c   |    2 +-
 drivers/regulator/ab3100.c |    2 +-
 drivers/rtc/rtc-ab3100.c   |    2 +-
 include/linux/mfd/ab3100.h |  129 --------------------------------------------
 include/linux/mfd/abx500.h |  129 ++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 134 insertions(+), 134 deletions(-)
 delete mode 100644 include/linux/mfd/ab3100.h
 create mode 100644 include/linux/mfd/abx500.h

diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c
index c73ed06..d893ee0 100644
--- a/arch/arm/mach-u300/i2c.c
+++ b/arch/arm/mach-u300/i2c.c
@@ -9,7 +9,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/i2c.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 #include <linux/regulator/machine.h>
 #include <linux/amba/bus.h>
 #include <mach/irqs.h>
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 1689821..f8c4a33 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -19,7 +19,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 
 /* These are the only registers inside AB3100 used in this main file */
 
diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c
index 2d14655..7093f1a 100644
--- a/drivers/mfd/ab3100-otp.c
+++ b/drivers/mfd/ab3100-otp.c
@@ -12,7 +12,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 #include ...
[ message continues ]

Linus,


So do you expect the existing ab4500 also to be merged into abx500?

regards,
Srinidhi


--

[ message continues ]

Don't think so, the 4500 is not related to the 3100, 3550 and 5500:s,
so they don't have much in common, whereas the latter share a lot of
characteristics. It's better if it stays where it is I think.

abx500 was the best name we could come up with that wasn't too
short, we contemplated abx.h but it was too short, abxxx0 looks
silly and so on. So abx500 denotes our largest family of mixsig ASICs
which has a lot in common, i.e. everything except the
AB8500/AB4500/STw4500, hope it's not too confusing...

But the ab4500 files should be renamed ab8500.[c|h] after current
product naming decisions though.

Yours,
Linus Walleij
--

[ message continues ]

Hi Linus,

I have an initial question for you:
Do you plan to have one single driver supporting the 3100, 3550 and the 550
chips ?

Cheers,

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--

[ message continues ]

Not really, just one common interface. The 3100, 3550 and 5500 share
sub-blocks so for example the RTC driver in drivers/rtc/rtc-ab3100.c should
be possible to use with either of them, but the core driver implementation
will likely differ. (We might need to rename the file for clarity though.)

A main point of difference will be how these are accessed: right now the
AB3100 and AB3550 are on the I2C bus, the AB5500 will have access
through a special on-chip controller instead.

So the driver/mfd/ab3100.c|ab3550.c|ab5500.c will be different, but all
implement the API from include/linux/mfd/abx500.h and subdrivers will
hopefully be possible to share.

Yours,
Linus Walleij
--

[ message continues ]