From 3a272cbf4d8804389c99dfc8f36c7b47b68a3c0d Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 9 May 2012 05:43:59 +1000 Subject: [PATCH] --- yaml --- r: 308735 b: refs/heads/master c: 9577e8c3fbc145b5d2a12d2fbc6a50031573c77d h: refs/heads/master i: 308733: 4f1ee781a0d6faf4ed24909c78b338a0d1a5ffbf 308731: 82d2d45016cd0ca586a6b75f3213c405138127a1 308727: b9aa910cb7ae341ac6f3c9c95fcd232a59e3447c 308719: a57507bbc53a48494d6f89583aedcee71a7c5c1a 308703: ecfe3c2a01519c4c91ffa051a4b825b23b855840 308671: 587b31a45af729a207a2dec86234d2e51e4812a5 308607: 1b9db5b3858b6e3c4bffef8d9fdf2a9d46e6265b 308479: 32fd14ab60b9bc67e2146a9dd98e2da4c3d59849 308223: 093901882938352c356c35a06307a0e852c58328 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl-core.c | 7 ------- trunk/include/linux/i2c/twl.h | 8 ++++++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 2cbf8b518b36..5e8767e6e2f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd4209ced4d3936cfe51b7b8833260457e2d9995 +refs/heads/master: 9577e8c3fbc145b5d2a12d2fbc6a50031573c77d diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c index 7c2267e71f8b..6fc90befa79e 100644 --- a/trunk/drivers/mfd/twl-core.c +++ b/trunk/drivers/mfd/twl-core.c @@ -224,13 +224,6 @@ #define HIGH_PERF_SQ (1 << 3) #define CK32K_LOWPWR_EN (1 << 7) - -/* chip-specific feature flags, for i2c_device_id.driver_data */ -#define TWL4030_VAUX2 BIT(0) /* pre-5030 voltage ranges */ -#define TPS_SUBSET BIT(1) /* tps659[23]0 have fewer LDOs */ -#define TWL5031 BIT(2) /* twl5031 has different registers */ -#define TWL6030_CLASS BIT(3) /* TWL6030 class */ - /*----------------------------------------------------------------------*/ /* is driver active, bound to a chip? */ diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h index 1f90de0cfdbe..d1afedc00898 100644 --- a/trunk/include/linux/i2c/twl.h +++ b/trunk/include/linux/i2c/twl.h @@ -171,8 +171,6 @@ static inline int twl_class_is_ ##class(void) \ TWL_CLASS_IS(4030, TWL4030_CLASS_ID) TWL_CLASS_IS(6030, TWL6030_CLASS_ID) -#define TWL6025_SUBCLASS BIT(4) /* TWL6025 has changed registers */ - /* * Read and write single 8-bit registers */ @@ -746,6 +744,12 @@ struct twl_regulator_driver_data { void *data; unsigned long features; }; +/* chip-specific feature flags, for twl_regulator_driver_data.features */ +#define TWL4030_VAUX2 BIT(0) /* pre-5030 voltage ranges */ +#define TPS_SUBSET BIT(1) /* tps659[23]0 have fewer LDOs */ +#define TWL5031 BIT(2) /* twl5031 has different registers */ +#define TWL6030_CLASS BIT(3) /* TWL6030 class */ +#define TWL6025_SUBCLASS BIT(4) /* TWL6025 has changed registers */ /*----------------------------------------------------------------------*/