* Sebastian Reichel <sre@xxxxxxxxxx> [131114 04:40]:
> This patch introduces device tree support to the isp1704
> charger driver. Adding support involved moving the handling
> of the enable GPIO from board code into the driver.
>
> Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>
> ---
> arch/arm/mach-omap2/board-rx51-peripherals.c | 10 +----
> drivers/power/isp1704_charger.c | 56 +++++++++++++++++++++++++---
> include/linux/power/isp1704_charger.h | 2 +-
> 3 files changed, 52 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index a791fef..2986d16 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -273,13 +273,8 @@ static struct platform_device rx51_battery_device = {
> .id = -1,
> };
>
> -static void rx51_charger_set_power(bool on)
> -{
> - gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
> -}
> -
> static struct isp1704_charger_data rx51_charger_data = {
> - .set_power = rx51_charger_set_power,
> + .enable_gpio = RX51_USB_TRANSCEIVER_RST_GPIO,
> };
>
> static struct platform_device rx51_charger_device = {
> @@ -291,9 +286,6 @@ static struct platform_device rx51_charger_device = {
>
> static void __init rx51_charger_init(void)
> {
> - WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
> - GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
> -
> platform_device_register(&rx51_battery_device);
> platform_device_register(&rx51_charger_device);
> }
Can you please separate out the changes to board-rx51-peripherals.c
as they have a huge chance of merge conflicts for v3.14 when
we're planning to flip omap3 to be device tree only?
To remove the dependency, how about add .enable_gpio to the
isp1704_charger.h and to the board-rx51-peripherals.c without
removing .set_power in the first patch?
Then we can set up an immutable branch that can be merged both
to linux-omap tree and Anton's tree to avoid merge conflicts.
Then the rest of the patches can go via Anton's tree and you
can just have .set_power do nothing, and then it can be
removed later on when no longer used at all.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
