ENGR00181094-3: MX6 SABRESD: remove MAX8903 interrupt pin config

move max8903 interrupt pin config from board-mx6q_sabresd.c into
sabresd_battery driver on SABRESD_rev.B board.

Signed-off-by: Rong Dian <b38775@freescale.com>

diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 70be82078bf8ef5c40022c477ecc30dd7c065879..b5cf78f810f8a4fe63754055a96815483d6968cb 100644 (file)
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1286,7 +1286,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
-CONFIG_BATTERY_MAX8903=y
+CONFIG_SABRESD_MAX8903=y
 # CONFIG_CHARGER_GPIO is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set

diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
index 83746e9d9f5ef36f919ee2831c1584826a85d415..37e4e284e3e8b080e0e83200055811cc79a086ff 100644 (file)
--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
@@ -46,7 +46,7 @@
 #include <linux/memblock.h>
 #include <linux/gpio.h>
 #include <linux/etherdevice.h>
-#include <linux/power/max8903_battery.h>
+#include <linux/power/sabresd_battery.h>
 #include <linux/regulator/anatop-regulator.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/machine.h>
@@ -1629,38 +1629,6 @@ static void __init mx6_sabresd_board_init(void)
                gpio_direction_input(SABRESD_PFUZE_INT);
                mx6q_sabresd_init_pfuze100(SABRESD_PFUZE_INT);
        }
-       /* set DOK gpio input */
-       ret = gpio_request(SABRESD_CHARGE_DOK_B, "max8903-DOK");
-       if (ret) {
-               printk(KERN_ERR"request max8903-DOK error!!\n");
-               return;
-       } else {
-               gpio_direction_input(SABRESD_CHARGE_DOK_B);
-       }
-       /* set UOK gpio input */
-       ret = gpio_request(SABRESD_CHARGE_UOK_B, "max8903-UOK");
-       if (ret) {
-               printk(KERN_ERR"request max8903-UOK error!!\n");
-               return;
-       } else {
-               gpio_direction_input(SABRESD_CHARGE_UOK_B);
-       }
-       /* set FLT gpio input */
-       ret = gpio_request(SABRESD_CHARGE_FLT_1_B, "max8903-FLT");
-       if (ret) {
-               printk(KERN_ERR"request max8903-FLT error!!\n");
-               return;
-       } else {
-               gpio_direction_input(SABRESD_CHARGE_FLT_1_B);
-       }
-       /* set CHG gpio input */
-       ret = gpio_request(SABRESD_CHARGE_CHG_1_B, "max8903-CHG");
-       if (ret) {
-               printk(KERN_ERR"request max8903-CHG error!!\n");
-               return;
-       } else {
-               gpio_direction_input(SABRESD_CHARGE_CHG_1_B);
-       }
        /* SPI */
        imx6q_add_ecspi(0, &mx6q_sabresd_spi_data);
        spi_device_init();