diff options
Diffstat (limited to 'arch/arm')
| -rwxr-xr-x | arch/arm/configs/tuna_defconfig | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-omap2/board-tuna-jack.c | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-omap2/board-tuna-power.c | 6 | ||||
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna-sensors.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig index 21c9f2d..19b6aae 100755 --- a/arch/arm/configs/tuna_defconfig +++ b/arch/arm/configs/tuna_defconfig @@ -1656,7 +1656,7 @@ CONFIG_TWL6030_POWER=y # CONFIG_TWL4030_CODEC is not set CONFIG_TWL6030_PWM=y # CONFIG_TWL6030_POWEROFF is not set -CONFIG_TWL6030_MADC=y +CONFIG_TWL6030_GPADC=y CONFIG_TWL6040_CODEC=y # CONFIG_MFD_STMPE is not set # CONFIG_MFD_TC3589X is not set diff --git a/arch/arm/mach-omap2/board-tuna-jack.c b/arch/arm/mach-omap2/board-tuna-jack.c index d3dc6ac..4445cf6 100644..100755 --- a/arch/arm/mach-omap2/board-tuna-jack.c +++ b/arch/arm/mach-omap2/board-tuna-jack.c @@ -20,7 +20,7 @@ #include <linux/platform_device.h> #include <linux/gpio.h> #include <linux/input.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include <linux/sec_jack.h> #include "mux.h" @@ -111,7 +111,7 @@ static int sec_jack_get_adc_value(void) { int value; - value = twl6030_get_madc_conversion(ADC_CHANNEL_JACK); + value = twl6030_get_gpadc_conversion(ADC_CHANNEL_JACK); return (int)(1800*value) / 1024; } diff --git a/arch/arm/mach-omap2/board-tuna-power.c b/arch/arm/mach-omap2/board-tuna-power.c index 53a6338..9a5a743 100644..100755 --- a/arch/arm/mach-omap2/board-tuna-power.c +++ b/arch/arm/mach-omap2/board-tuna-power.c @@ -22,7 +22,7 @@ #include <linux/moduleparam.h> #include <linux/pda_power.h> #include <linux/platform_device.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include <linux/delay.h> #include <plat/cpu.h> @@ -263,11 +263,11 @@ static int twl6030_get_adc_data(int ch) int i, j; for (i = 0; i < ADC_NUM_SAMPLES; i++) { - adc_data = twl6030_get_madc_conversion(ch); + adc_data = twl6030_get_gpadc_conversion(ch); if (adc_data == -EAGAIN) { for (j = 0; j < ADC_LIMIT_ERR_COUNT; j++) { msleep(20); - adc_data = twl6030_get_madc_conversion(ch); + adc_data = twl6030_get_gpadc_conversion(ch); if (adc_data > 0) break; } diff --git a/arch/arm/mach-omap2/board-tuna-sensors.c b/arch/arm/mach-omap2/board-tuna-sensors.c index f818aad..dcb8374 100755 --- a/arch/arm/mach-omap2/board-tuna-sensors.c +++ b/arch/arm/mach-omap2/board-tuna-sensors.c @@ -17,7 +17,7 @@ #include <linux/i2c.h> #include <linux/mpu.h> #include <linux/gp2a.h> -#include <linux/i2c/twl6030-madc.h> +#include <linux/i2c/twl6030-gpadc.h> #include "mux.h" #include "board-tuna.h" @@ -33,7 +33,7 @@ static int gp2a_light_adc_value(void) { - return twl6030_get_madc_conversion(GP2A_LIGHT_ADC_CHANNEL); + return twl6030_get_gpadc_conversion(GP2A_LIGHT_ADC_CHANNEL); } static void gp2a_power(bool on) |