wm8994: Delete some not need source

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
old mode 100644 (file)
new mode 100755 (executable)
index 7528c47..6c656d0
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -1434,109 +1434,7 @@ struct platform_device rk29_device_gps = {
  * wm8994  codec
  * author: qjb@rock-chips.com
  *****************************************************************************************/
-//#if defined(CONFIG_MFD_WM8994)
-#if defined (CONFIG_REGULATOR_WM8994)
-static struct regulator_consumer_supply wm8994_ldo1_consumers[] = {
-       {
-               .supply = "DBVDD",
-       },
-       {
-               .supply = "AVDD1",
-       },
-       {
-               .supply = "CPVDD",
-       },
-       {
-               .supply = "SPKVDD1",
-       }               
-};
-static struct regulator_consumer_supply wm8994_ldo2_consumers[] = {
-       {
-               .supply = "DCVDD",
-       },
-       {
-               .supply = "AVDD2",
-       },
-       {
-               .supply = "SPKVDD2",
-       }                       
-};
-struct regulator_init_data regulator_init_data_ldo1 = {
-       .constraints = {
-               .name = "wm8994-ldo1",
-               .min_uA = 00000,
-               .max_uA = 18000,
-               .always_on = true,
-               .apply_uV = true,               
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_CURRENT,           
-       },
-       .num_consumer_supplies = ARRAY_SIZE(wm8994_ldo1_consumers),
-       .consumer_supplies = wm8994_ldo1_consumers,     
-};
-struct regulator_init_data regulator_init_data_ldo2 = {
-       .constraints = {
-               .name = "wm8994-ldo2",
-               .min_uA = 00000,
-               .max_uA = 18000,
-               .always_on = true,
-               .apply_uV = true,               
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_CURRENT,           
-       },
-       .num_consumer_supplies = ARRAY_SIZE(wm8994_ldo2_consumers),
-       .consumer_supplies = wm8994_ldo2_consumers,     
-};
-#endif 
-struct wm8994_drc_cfg wm8994_drc_cfg_pdata = {
-       .name = "wm8994_DRC",
-       .regs = {0,0,0,0,0},
-};
-
-struct wm8994_retune_mobile_cfg wm8994_retune_mobile_cfg_pdata = {
-       .name = "wm8994_EQ",
-       .rate = 0,
-       .regs = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,},
-}; 
-
 struct wm8994_pdata wm8994_platdata = {        
-#if defined (CONFIG_GPIO_WM8994)
-       .gpio_base = WM8994_GPIO_EXPANDER_BASE,
-       //Fill value to initialize the GPIO
-       .gpio_defaults ={},
-#endif 
-       //enable=0 disable ldo
-#if defined (CONFIG_REGULATOR_WM8994)  
-       .ldo = {
-               {
-                       .enable = 0,
-                       //RK29_PIN5_PA1
-                       .supply = NULL,
-                       .init_data = &regulator_init_data_ldo1,
-               },
-               {
-                       .enable = 0,
-                       .supply = NULL,         
-                       .init_data = &regulator_init_data_ldo2,
-               }
-       },
-#endif         
-       //DRC 0--use default
-       .num_drc_cfgs = 0,
-       .drc_cfgs = &wm8994_drc_cfg_pdata,
-       //EQ   0--use default 
-       .num_retune_mobile_cfgs = 0,
-       .retune_mobile_cfgs = &wm8994_retune_mobile_cfg_pdata,
-       
-       .lineout1_diff = 1,
-       .lineout2_diff = 1,
-       
-       .lineout1fb = 1,
-       .lineout2fb = 1,
-       
-       .micbias1_lvl = 1,
-       .micbias2_lvl = 1,
-       
-       .jd_scthr = 0,
-       .jd_thr = 0,
        
        .PA_control_pin = RK29_PIN6_PD3,        
        .Power_EN_Pin = RK29_PIN5_PA1,
@@ -1553,7 +1451,7 @@ struct wm8994_pdata wm8994_platdata = {
        .recorder_vol = 30,
                
 };
-//#endif 
+
 
 #ifdef CONFIG_RK_HEADSET_DET
 

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index 385babcd2cebbab61173f2a507d29866a9993a39..9ef1e20c798503fb32be933b9538d85404998e5f 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -1512,109 +1512,7 @@ struct platform_device rk29_device_gps = {
  * wm8994  codec
  * author: qjb@rock-chips.com
  *****************************************************************************************/
-//#if defined(CONFIG_MFD_WM8994)
-#if defined (CONFIG_REGULATOR_WM8994)
-static struct regulator_consumer_supply wm8994_ldo1_consumers[] = {
-       {
-               .supply = "DBVDD",
-       },
-       {
-               .supply = "AVDD1",
-       },
-       {
-               .supply = "CPVDD",
-       },
-       {
-               .supply = "SPKVDD1",
-       }               
-};
-static struct regulator_consumer_supply wm8994_ldo2_consumers[] = {
-       {
-               .supply = "DCVDD",
-       },
-       {
-               .supply = "AVDD2",
-       },
-       {
-               .supply = "SPKVDD2",
-       }                       
-};
-struct regulator_init_data regulator_init_data_ldo1 = {
-       .constraints = {
-               .name = "wm8994-ldo1",
-               .min_uA = 00000,
-               .max_uA = 18000,
-               .always_on = true,
-               .apply_uV = true,               
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_CURRENT,           
-       },
-       .num_consumer_supplies = ARRAY_SIZE(wm8994_ldo1_consumers),
-       .consumer_supplies = wm8994_ldo1_consumers,     
-};
-struct regulator_init_data regulator_init_data_ldo2 = {
-       .constraints = {
-               .name = "wm8994-ldo2",
-               .min_uA = 00000,
-               .max_uA = 18000,
-               .always_on = true,
-               .apply_uV = true,               
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_CURRENT,           
-       },
-       .num_consumer_supplies = ARRAY_SIZE(wm8994_ldo2_consumers),
-       .consumer_supplies = wm8994_ldo2_consumers,     
-};
-#endif 
-struct wm8994_drc_cfg wm8994_drc_cfg_pdata = {
-       .name = "wm8994_DRC",
-       .regs = {0,0,0,0,0},
-};
-
-struct wm8994_retune_mobile_cfg wm8994_retune_mobile_cfg_pdata = {
-       .name = "wm8994_EQ",
-       .rate = 0,
-       .regs = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,},
-}; 
-
 struct wm8994_pdata wm8994_platdata = {        
-#if defined (CONFIG_GPIO_WM8994)
-       .gpio_base = WM8994_GPIO_EXPANDER_BASE,
-       //Fill value to initialize the GPIO
-       .gpio_defaults ={},
-#endif 
-       //enable=0 disable ldo
-#if defined (CONFIG_REGULATOR_WM8994)  
-       .ldo = {
-               {
-                       .enable = 0,
-                       //RK29_PIN5_PA1
-                       .supply = NULL,
-                       .init_data = &regulator_init_data_ldo1,
-               },
-               {
-                       .enable = 0,
-                       .supply = NULL,         
-                       .init_data = &regulator_init_data_ldo2,
-               }
-       },
-#endif         
-       //DRC 0--use default
-       .num_drc_cfgs = 0,
-       .drc_cfgs = &wm8994_drc_cfg_pdata,
-       //EQ   0--use default 
-       .num_retune_mobile_cfgs = 0,
-       .retune_mobile_cfgs = &wm8994_retune_mobile_cfg_pdata,
-       
-       .lineout1_diff = 1,
-       .lineout2_diff = 1,
-       
-       .lineout1fb = 1,
-       .lineout2fb = 1,
-       
-       .micbias1_lvl = 1,
-       .micbias2_lvl = 1,
-       
-       .jd_scthr = 0,
-       .jd_thr = 0,
 
        .PA_control_pin = 0,    
        .Power_EN_Pin = RK29_PIN5_PA1,
@@ -1631,7 +1529,7 @@ struct wm8994_pdata wm8994_platdata = {
        .recorder_vol = 20,
        
 };
-//#endif 
+
 
 #ifdef CONFIG_RK_HEADSET_DET
 #define HEADSET_GPIO RK29_PIN4_PD2

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 196c7a0bea9328c6eaa8ec47388ba7f25861d522..f6f188669374a1e439966d62925ad28c9663ffa7 100755 (executable)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -161,13 +161,6 @@ config GPIO_TPS65910
        help
          Say yes here to access the GPIO signal of TPS65910x multi-function
          power management chips from Texas Instruments.
-#add by qjb
-config GPIO_WM8994
-       tristate "WM8994 GPIOs"
-       depends on MFD_WM8994
-       help
-         Say yes here to access the GPIO signals of WM8994 audio hub
-         CODECs from Wolfson Microelectronics. 
 
 config GPIO_WM831X
        tristate "WM831x GPIOs"

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 48f149c9360467a4b70eb0c4b9e9d5c6256d253d..e0b37e098e76def56fc7e36c9d8a5e47c2f38463 100755 (executable)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -23,5 +23,3 @@ obj-$(CONFIG_GPIO_WM831X)     += wm831x-gpio.o
 obj-$(CONFIG_GPIO_PCA9554)     += pca9554.o
 obj-$(CONFIG_IOEXTEND_TCA6424) += tca6424.o
 obj-$(CONFIG_EXPAND_GPIO_SOFT_INTERRUPT) += expand_gpio_soft_interrupt.o
-#add by qjb
-obj-$(CONFIG_GPIO_WM8994)      += wm8994-gpio.o
\ No newline at end of file

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 0e7a073d4472508ac42aad9dc5d44a9f50b13f4d..7e48e6c35177f83979e3d07a4b72c464c23b8ddf 100755 (executable)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -171,18 +171,6 @@ config PMIC_DA903X
          the I2C driver and the core APIs _only_, you have to select
          individual components like LCD backlight, voltage regulators,
          LEDs and battery-charger under the corresponding menus.
-##and by qjb 
-config MFD_WM8994
-       tristate "Support Wolfson Microelectronics WM8994"
-       select MFD_CORE
-       depends on I2C
-       help
-         The WM8994 is a highly integrated hi-fi CODEC designed for
-         smartphone applicatiosn.  As well as audio functionality it
-         has on board GPIO and regulator functionality which is
-         supported via the relevant subsystems.  This driver provides
-         core support for the WM8994, in order to use the actual
-         functionaltiy of the device other drivers must be enabled.
 
 config MFD_WM8400
        tristate "Support Wolfson Microelectronics WM8400"

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a3768e455e9dc0fe1ee0aebb62c90f657b6e3726..405ed383a862bb79556c5380f890709acf48faf8 100755 (executable)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -55,6 +55,5 @@ obj-$(CONFIG_PCF50633_ADC)    += pcf50633-adc.o
 obj-$(CONFIG_PCF50633_GPIO)    += pcf50633-gpio.o
 obj-$(CONFIG_AB3100_CORE)      += ab3100-core.o
 obj-$(CONFIG_AB3100_OTP)       += ab3100-otp.o
-#add by qjb
-obj-$(CONFIG_MFD_WM8994)       += wm8994-core.o
+
 

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index b78010c..6399e8c
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -82,15 +82,7 @@ config REGULATOR_TPS65910
        help
          This driver supports the voltage regulators provided by
          this family of companion chips.
-         
-#add by qjb
-config REGULATOR_WM8994
-       tristate "Wolfson Microelectronics WM8994 CODEC"
-       depends on MFD_WM8994
-       help
-         This driver provides support for the voltage regulators on the
-         WM8994 CODEC.
-                 
+ 
 config REGULATOR_WM831X
        tristate "Wolfson Microelcronics WM831x PMIC regulators"
        depends on MFD_WM831X

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index e8bf0fa..ec0e204
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -29,7 +29,5 @@ obj-$(CONFIG_RK29_PWM_REGULATOR) += rk29-pwm-regulator.o
 
 obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
-#add by qjb
-obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
 
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG