From: Graeme Gregory g...@slimlogic.co.uk
The TWL6025 was never released beyond sample form and was replaced by
the PhoenixLite range of chips - TWL6032. Change the references to
reference the TWL6032 class and name the registers to twl6032 in line with
an actual released chip name to avoid confusion.
Currently there are no users of TWL6025 in the code.
Signed-off-by: Graeme Gregory g...@slimlogic.co.uk
Signed-off-by: Oleksandr Kozaruk oleksandr.koza...@ti.com
Acked-by: Lee Jones lee.jo...@linaro.org
---
There are non-mainline branches that use twl6032 by its name (for example
git://git.omapzoom.org/kernel/omap.git). There is intention to add support
of twl6032 device in mainline, but we'd like to know if we can use twl6032
instead of twl6025 in our new patches, that we are going to provide.
Related discussion: https://patchwork.kernel.org/patch/2686331/
.../bindings/regulator/twl-regulator.txt | 26 +++
.../devicetree/bindings/usb/twl-usb.txt|2 +-
drivers/mfd/twl-core.c | 46 ++--
drivers/regulator/twl-regulator.c | 76 ++--
drivers/usb/phy/phy-twl6030-usb.c |2 +-
include/linux/i2c/twl.h| 30
6 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt
b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
index 658749b..75b0c16 100644
--- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
@@ -18,20 +18,20 @@ For twl6030 regulators/LDOs
- ti,twl6030-vdd1 for VDD1 SMPS
- ti,twl6030-vdd2 for VDD2 SMPS
- ti,twl6030-vdd3 for VDD3 SMPS
-For twl6025 regulators/LDOs
+For twl6032 regulators/LDOs
- compatible:
- - ti,twl6025-ldo1 for LDO1 LDO
- - ti,twl6025-ldo2 for LDO2 LDO
- - ti,twl6025-ldo3 for LDO3 LDO
- - ti,twl6025-ldo4 for LDO4 LDO
- - ti,twl6025-ldo5 for LDO5 LDO
- - ti,twl6025-ldo6 for LDO6 LDO
- - ti,twl6025-ldo7 for LDO7 LDO
- - ti,twl6025-ldoln for LDOLN LDO
- - ti,twl6025-ldousb for LDOUSB LDO
- - ti,twl6025-smps3 for SMPS3 SMPS
- - ti,twl6025-smps4 for SMPS4 SMPS
- - ti,twl6025-vio for VIO SMPS
+ - ti,twl6032-ldo1 for LDO1 LDO
+ - ti,twl6032-ldo2 for LDO2 LDO
+ - ti,twl6032-ldo3 for LDO3 LDO
+ - ti,twl6032-ldo4 for LDO4 LDO
+ - ti,twl6032-ldo5 for LDO5 LDO
+ - ti,twl6032-ldo6 for LDO6 LDO
+ - ti,twl6032-ldo7 for LDO7 LDO
+ - ti,twl6032-ldoln for LDOLN LDO
+ - ti,twl6032-ldousb for LDOUSB LDO
+ - ti,twl6032-smps3 for SMPS3 SMPS
+ - ti,twl6032-smps4 for SMPS4 SMPS
+ - ti,twl6032-vio for VIO SMPS
For twl4030 regulators/LDOs
- compatible:
- ti,twl4030-vaux1 for VAUX1 LDO
diff --git a/Documentation/devicetree/bindings/usb/twl-usb.txt
b/Documentation/devicetree/bindings/usb/twl-usb.txt
index 36b9aed..0aee0ad 100644
--- a/Documentation/devicetree/bindings/usb/twl-usb.txt
+++ b/Documentation/devicetree/bindings/usb/twl-usb.txt
@@ -8,7 +8,7 @@ TWL6030 USB COMPARATOR
usb interrupt number that raises VBUS interrupts when the controller has to
act as device
- usb-supply : phandle to the regulator device tree node. It should be vusb
- if it is twl6030 or ldousb if it is twl6025 subclass.
+ if it is twl6030 or ldousb if it is twl6032 subclass.
twl6030-usb {
compatible = ti,twl6030-usb;
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 89ab4d9..f39bceb 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -118,7 +118,7 @@
#define TWL6030_BASEADD_GASGAUGE 0x00C0
#define TWL6030_BASEADD_PIH0x00D0
#define TWL6030_BASEADD_CHARGER0x00E0
-#define TWL6025_BASEADD_CHARGER0x00DA
+#define TWL6032_BASEADD_CHARGER0x00DA
#define TWL6030_BASEADD_LED0x00F4
/* subchip/slave 2 0x4A - DFT */
@@ -718,9 +718,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned
irq_base,
| REGULATOR_CHANGE_STATUS,
};
- if (features TWL6025_SUBCLASS) {
+ if (features TWL6032_SUBCLASS) {
usb3v3.supply = ldousb;
- regulator = TWL6025_REG_LDOUSB;
+ regulator = TWL6032_REG_LDOUSB;
} else {
usb3v3.supply = vusb;
regulator = TWL6030_REG_VUSB;
@@ -747,8 +747,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned
irq_base,
usb3v3.dev_name = dev_name(child);
} else if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)
twl_class_is_6030()) {
- if (features TWL6025_SUBCLASS)
- child = add_regulator(TWL6025_REG_LDOUSB,
+ if (features
