Re: [PATCH v4 2/5] mfd: tps65912: Remove old driver in preparation for new driver
he On 10/05/2015 04:29 AM, Lee Jones wrote: On Mon, 05 Oct 2015, Lee Jones wrote: On Thu, 01 Oct 2015, Andrew F. Davis wrote: The old tps65912 driver is being replaced, delete old driver. Signed-off-by: Andrew F. Davis I already Acked this in v3. Acked-by: Lee Jones Ack can carry, but is there any chance this can be split up for easy digestion into the respective trees? I'm not sure, the components are tightly coupled and if one tree has different parts deleted/replaced I'm not sure if this will leave the trees in a compilable state. I think one tree will need to take all the parts. If it was just adding components then this wouldn't be needed, but having old and new together may be a problem. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 2/5] mfd: tps65912: Remove old driver in preparation for new driver
On Thu, 01 Oct 2015, Andrew F. Davis wrote: > The old tps65912 driver is being replaced, delete old driver. > > Signed-off-by: Andrew F. Davis I already Acked this in v3. Acked-by: Lee Jones > --- > drivers/gpio/Kconfig | 6 - > drivers/gpio/Makefile | 1 - > drivers/gpio/gpio-tps65912.c | 153 -- > drivers/mfd/Kconfig| 26 -- > drivers/mfd/Makefile | 4 - > drivers/mfd/tps65912-core.c| 175 --- > drivers/mfd/tps65912-i2c.c | 139 - > drivers/mfd/tps65912-irq.c | 217 - > drivers/mfd/tps65912-spi.c | 141 - > drivers/regulator/Kconfig | 6 - > drivers/regulator/Makefile | 1 - > drivers/regulator/tps65912-regulator.c | 541 > - > include/linux/mfd/tps65912.h | 328 > 13 files changed, 1738 deletions(-) > delete mode 100644 drivers/gpio/gpio-tps65912.c > delete mode 100644 drivers/mfd/tps65912-core.c > delete mode 100644 drivers/mfd/tps65912-i2c.c > delete mode 100644 drivers/mfd/tps65912-irq.c > delete mode 100644 drivers/mfd/tps65912-spi.c > delete mode 100644 drivers/regulator/tps65912-regulator.c > delete mode 100644 include/linux/mfd/tps65912.h > > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > index b4fc9e4..fb28483 100644 > --- a/drivers/gpio/Kconfig > +++ b/drivers/gpio/Kconfig > @@ -838,12 +838,6 @@ config GPIO_TPS65910 > Select this option to enable GPIO driver for the TPS65910 > chip family. > > -config GPIO_TPS65912 > - tristate "TI TPS65912 GPIO" > - depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI) > - help > - This driver supports TPS65912 gpio chip > - > config GPIO_TWL4030 > tristate "TWL4030, TWL5030, and TPS659x0 GPIOs" > depends on TWL4030_CORE > diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile > index f79a7c4..605bf89 100644 > --- a/drivers/gpio/Makefile > +++ b/drivers/gpio/Makefile > @@ -96,7 +96,6 @@ obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o > obj-$(CONFIG_GPIO_PALMAS)+= gpio-palmas.o > obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o > obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o > -obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o > obj-$(CONFIG_GPIO_TS5500)+= gpio-ts5500.o > obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o > obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o > diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c > deleted file mode 100644 > index 9cdbc0c..000 > --- a/drivers/gpio/gpio-tps65912.c > +++ /dev/null > @@ -1,153 +0,0 @@ > -/* > - * Copyright 2011 Texas Instruments Inc. > - * > - * Author: Margarita Olaya > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License as published by the > - * Free Software Foundation; either version 2 of the License, or (at your > - * option) any later version. > - * > - * This driver is based on wm8350 implementation. > - */ > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -struct tps65912_gpio_data { > - struct tps65912 *tps65912; > - struct gpio_chip gpio_chip; > -}; > - > -#define to_tgd(gc) container_of(gc, struct tps65912_gpio_data, gpio_chip) > - > -static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset) > -{ > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > - struct tps65912 *tps65912 = tps65912_gpio->tps65912; > - int val; > - > - val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset); > - > - if (val & GPIO_STS_MASK) > - return 1; > - > - return 0; > -} > - > -static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset, > - int value) > -{ > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > - struct tps65912 *tps65912 = tps65912_gpio->tps65912; > - > - if (value) > - tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, > - GPIO_SET_MASK); > - else > - tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, > - GPIO_SET_MASK); > -} > - > -static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset, > - int value) > -{ > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > - struct tps65912 *tps65912 = tps65912_gpio->tps65912; > - > - /* Set the initial value */ > - tps65912_gpio_set(gc, offset, value); > - > - return tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, > - GPIO_CFG_MASK); > -} > - > -static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset)
Re: [PATCH v4 2/5] mfd: tps65912: Remove old driver in preparation for new driver
On Mon, 05 Oct 2015, Lee Jones wrote: > On Thu, 01 Oct 2015, Andrew F. Davis wrote: > > > The old tps65912 driver is being replaced, delete old driver. > > > > Signed-off-by: Andrew F. Davis > > I already Acked this in v3. > > Acked-by: Lee Jones Ack can carry, but is there any chance this can be split up for easy digestion into the respective trees? > > --- > > drivers/gpio/Kconfig | 6 - > > drivers/gpio/Makefile | 1 - > > drivers/gpio/gpio-tps65912.c | 153 -- > > drivers/mfd/Kconfig| 26 -- > > drivers/mfd/Makefile | 4 - > > drivers/mfd/tps65912-core.c| 175 --- > > drivers/mfd/tps65912-i2c.c | 139 - > > drivers/mfd/tps65912-irq.c | 217 - > > drivers/mfd/tps65912-spi.c | 141 - > > drivers/regulator/Kconfig | 6 - > > drivers/regulator/Makefile | 1 - > > drivers/regulator/tps65912-regulator.c | 541 > > - > > include/linux/mfd/tps65912.h | 328 > > 13 files changed, 1738 deletions(-) > > delete mode 100644 drivers/gpio/gpio-tps65912.c > > delete mode 100644 drivers/mfd/tps65912-core.c > > delete mode 100644 drivers/mfd/tps65912-i2c.c > > delete mode 100644 drivers/mfd/tps65912-irq.c > > delete mode 100644 drivers/mfd/tps65912-spi.c > > delete mode 100644 drivers/regulator/tps65912-regulator.c > > delete mode 100644 include/linux/mfd/tps65912.h > > > > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > > index b4fc9e4..fb28483 100644 > > --- a/drivers/gpio/Kconfig > > +++ b/drivers/gpio/Kconfig > > @@ -838,12 +838,6 @@ config GPIO_TPS65910 > > Select this option to enable GPIO driver for the TPS65910 > > chip family. > > > > -config GPIO_TPS65912 > > - tristate "TI TPS65912 GPIO" > > - depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI) > > - help > > - This driver supports TPS65912 gpio chip > > - > > config GPIO_TWL4030 > > tristate "TWL4030, TWL5030, and TPS659x0 GPIOs" > > depends on TWL4030_CORE > > diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile > > index f79a7c4..605bf89 100644 > > --- a/drivers/gpio/Makefile > > +++ b/drivers/gpio/Makefile > > @@ -96,7 +96,6 @@ obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o > > obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o > > obj-$(CONFIG_GPIO_TPS6586X)+= gpio-tps6586x.o > > obj-$(CONFIG_GPIO_TPS65910)+= gpio-tps65910.o > > -obj-$(CONFIG_GPIO_TPS65912)+= gpio-tps65912.o > > obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o > > obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o > > obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o > > diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c > > deleted file mode 100644 > > index 9cdbc0c..000 > > --- a/drivers/gpio/gpio-tps65912.c > > +++ /dev/null > > @@ -1,153 +0,0 @@ > > -/* > > - * Copyright 2011 Texas Instruments Inc. > > - * > > - * Author: Margarita Olaya > > - * > > - * This program is free software; you can redistribute it and/or modify it > > - * under the terms of the GNU General Public License as published by the > > - * Free Software Foundation; either version 2 of the License, or (at your > > - * option) any later version. > > - * > > - * This driver is based on wm8350 implementation. > > - */ > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -struct tps65912_gpio_data { > > - struct tps65912 *tps65912; > > - struct gpio_chip gpio_chip; > > -}; > > - > > -#define to_tgd(gc) container_of(gc, struct tps65912_gpio_data, gpio_chip) > > - > > -static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset) > > -{ > > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > > - struct tps65912 *tps65912 = tps65912_gpio->tps65912; > > - int val; > > - > > - val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset); > > - > > - if (val & GPIO_STS_MASK) > > - return 1; > > - > > - return 0; > > -} > > - > > -static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset, > > - int value) > > -{ > > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > > - struct tps65912 *tps65912 = tps65912_gpio->tps65912; > > - > > - if (value) > > - tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, > > - GPIO_SET_MASK); > > - else > > - tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, > > - GPIO_SET_MASK); > > -} > > - > > -static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset, > > - int value) > > -{ > > - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); > > - struct tps65912
[PATCH v4 2/5] mfd: tps65912: Remove old driver in preparation for new driver
The old tps65912 driver is being replaced, delete old driver. Signed-off-by: Andrew F. Davis --- drivers/gpio/Kconfig | 6 - drivers/gpio/Makefile | 1 - drivers/gpio/gpio-tps65912.c | 153 -- drivers/mfd/Kconfig| 26 -- drivers/mfd/Makefile | 4 - drivers/mfd/tps65912-core.c| 175 --- drivers/mfd/tps65912-i2c.c | 139 - drivers/mfd/tps65912-irq.c | 217 - drivers/mfd/tps65912-spi.c | 141 - drivers/regulator/Kconfig | 6 - drivers/regulator/Makefile | 1 - drivers/regulator/tps65912-regulator.c | 541 - include/linux/mfd/tps65912.h | 328 13 files changed, 1738 deletions(-) delete mode 100644 drivers/gpio/gpio-tps65912.c delete mode 100644 drivers/mfd/tps65912-core.c delete mode 100644 drivers/mfd/tps65912-i2c.c delete mode 100644 drivers/mfd/tps65912-irq.c delete mode 100644 drivers/mfd/tps65912-spi.c delete mode 100644 drivers/regulator/tps65912-regulator.c delete mode 100644 include/linux/mfd/tps65912.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b4fc9e4..fb28483 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -838,12 +838,6 @@ config GPIO_TPS65910 Select this option to enable GPIO driver for the TPS65910 chip family. -config GPIO_TPS65912 - tristate "TI TPS65912 GPIO" - depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI) - help - This driver supports TPS65912 gpio chip - config GPIO_TWL4030 tristate "TWL4030, TWL5030, and TPS659x0 GPIOs" depends on TWL4030_CORE diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f79a7c4..605bf89 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -96,7 +96,6 @@ obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o obj-$(CONFIG_GPIO_TPS6586X)+= gpio-tps6586x.o obj-$(CONFIG_GPIO_TPS65910)+= gpio-tps65910.o -obj-$(CONFIG_GPIO_TPS65912)+= gpio-tps65912.o obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c deleted file mode 100644 index 9cdbc0c..000 --- a/drivers/gpio/gpio-tps65912.c +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright 2011 Texas Instruments Inc. - * - * Author: Margarita Olaya - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This driver is based on wm8350 implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct tps65912_gpio_data { - struct tps65912 *tps65912; - struct gpio_chip gpio_chip; -}; - -#define to_tgd(gc) container_of(gc, struct tps65912_gpio_data, gpio_chip) - -static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset) -{ - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); - struct tps65912 *tps65912 = tps65912_gpio->tps65912; - int val; - - val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset); - - if (val & GPIO_STS_MASK) - return 1; - - return 0; -} - -static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset, - int value) -{ - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); - struct tps65912 *tps65912 = tps65912_gpio->tps65912; - - if (value) - tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, - GPIO_SET_MASK); - else - tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, - GPIO_SET_MASK); -} - -static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset, - int value) -{ - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); - struct tps65912 *tps65912 = tps65912_gpio->tps65912; - - /* Set the initial value */ - tps65912_gpio_set(gc, offset, value); - - return tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, - GPIO_CFG_MASK); -} - -static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset) -{ - struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); - struct tps65912 *tps65912 = tps65912_gpio->tps65912; - - return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, - GPIO_CFG_MASK); -} - -static