mfd: Switch WM8350 revision detection to a feature based model
Subsystems (2)
PATCH 1/1 mfd: Switch WM8350 revision detection to a feature based model
Rather than check for chip revisions in the WM8350 drivers have the core code set flags for relevant differences.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/wm8350-core.c | 6 ++---- drivers/power/wm8350_power.c | 2 +- include/linux/mfd/wm8350/core.h | 8 -------- include/linux/mfd/wm8350/supply.h | 2 ++ 4 files changed, 5 insertions(+), 13 deletions(-)
drivers/mfd/wm8350-core.c +2 -4
@@ -1225,19 +1225,17 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,switch ((id2 &WM8350_CHIP_REV_MASK ) >>12 ) {case WM8350_REV_E :dev_info (wm8350->dev,"Found Rev E device\n" ); - wm8350->rev =WM8350_REV_E ;break ;case WM8350_REV_F :dev_info (wm8350->dev,"Found Rev F device\n" ); - wm8350->rev =WM8350_REV_F ;break ;case WM8350_REV_G :dev_info (wm8350->dev,"Found Rev G device\n" ); - wm8350->rev =WM8350_REV_G ; + wm8350->power.rev_g_coeff =1 ;break ;case WM8350_REV_H :dev_info (wm8350->dev,"Found Rev H device\n" ); - wm8350->rev =WM8350_REV_H ; + wm8350->power.rev_g_coeff =1 ;break ;default :/* For safety we refuse to run on unknown hardware */
drivers/power/wm8350_power.c +1 -1
@@ -44,7 +44,7 @@ static int wm8350_read_usb_uvolts(struct wm8350 *wm8350)static inline int wm8350_charge_time_min (struct wm8350 *wm8350,int min) { -if (wm8350->rev <WM8350_REV_G ) +if (!wm8350->power.rev_g_coeff)return (((min -30 ) /15 ) &0xf ) <<8 ;else return (((min -30 ) /30 ) &0xf ) <<8 ;
include/linux/mfd/wm8350/core.h +0 -8
@@ -558,12 +558,6 @@#define WM8350_IRQ_WKUP_ONKEY 48#define WM8350_IRQ_WKUP_GP_WAKEUP 49 -/* wm8350 chip revisions */ -#define WM8350_REV_E 0x4 -#define WM8350_REV_F 0x5 -#define WM8350_REV_G 0x6 -#define WM8350_REV_H 0x7 -#define WM8350_NUM_IRQ 63struct wm8350_reg_access {
@@ -585,8 +579,6 @@ struct wm8350_irq { };struct wm8350 { -int rev;/* chip revision */ -struct device *dev;/* device IO */
include/linux/mfd/wm8350/supply.h +2 -0
@@ -130,6 +130,8 @@ struct wm8350_power {struct power_supply usb;struct power_supply ac;struct wm8350_charger_policy *policy; + + int rev_g_coeff; };#endif
Signature · 1 line
1.5.6.5
Quoted 2 lines · Mark Brown
Rather than check for chip revisions in the WM8350 drivers have the core code set flags for relevant differences.
Gah, ignore this - it's broken. Sorry.