mfd: tps80031: Move rail definition to regulator header
Laxman Dewangan [Thu, 14 Jul 2011 10:01:49 +0000 (15:01 +0530)]
Moving the definitions of regulator rail names into regulator
header from core header.

bug 849977

Original-Change-Id: Ia2e4e9394b6ee013e2e12355038e15609d5077ea
Reviewed-on: http://git-master/r/41023
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>

Rebase-Id: Rb37a8ce8264396ddb18708596cf7908df2fac3ff

include/linux/mfd/tps80031.h
include/linux/regulator/tps80031-regulator.h

index 120a77a..e62cfb3 100644 (file)
@@ -32,27 +32,6 @@ enum chips {
        TPS80032 = 0x00000002,
 };
 
-#define tps80031_rails(_name) "tps80031_"#_name
-
-enum {
-       TPS80031_ID_VIO,
-       TPS80031_ID_SMPS1,
-       TPS80031_ID_SMPS2,
-       TPS80031_ID_SMPS3,
-       TPS80031_ID_SMPS4,
-       TPS80031_ID_VANA,
-       TPS80031_ID_LDO1,
-       TPS80031_ID_LDO2,
-       TPS80031_ID_LDO3,
-       TPS80031_ID_LDO4,
-       TPS80031_ID_LDO5,
-       TPS80031_ID_LDO6,
-       TPS80031_ID_LDO7,
-       TPS80031_ID_LDOLN,
-       TPS80031_ID_LDOUSB,
-       TPS80031_ID_VBUS,
-};
-
 enum {
        TPS80031_INT_PWRON,
        TPS80031_INT_RPWRON,
index 92787df..fe4e0a5 100644 (file)
 
 #include <linux/regulator/machine.h>
 
+#define tps80031_rails(_name) "tps80031_"#_name
+
+enum {
+       TPS80031_ID_VIO,
+       TPS80031_ID_SMPS1,
+       TPS80031_ID_SMPS2,
+       TPS80031_ID_SMPS3,
+       TPS80031_ID_SMPS4,
+       TPS80031_ID_VANA,
+       TPS80031_ID_LDO1,
+       TPS80031_ID_LDO2,
+       TPS80031_ID_LDO3,
+       TPS80031_ID_LDO4,
+       TPS80031_ID_LDO5,
+       TPS80031_ID_LDO6,
+       TPS80031_ID_LDO7,
+       TPS80031_ID_LDOLN,
+       TPS80031_ID_LDOUSB,
+       TPS80031_ID_VBUS,
+};
+
+
 enum {
        /* USBLDO input selection */
        USBLDO_INPUT_VSYS       = 0x00000001,
@@ -52,7 +74,7 @@ enum {
  * @init_enable: Enable or do not enable the rails during initialization.
  * @init_apply: Init parameter applied or not.
  * @flags: Configuration flag to configure the rails. It should be ORed of
- *         above enums.
+ *      above enums.
  */
 
 struct tps80031_regulator_platform_data {