Re: [PATCH 2/2] Revert "ARM: RX-51: Enable isp1704 power on/off"

[Felipe Contreras]

Should probably have CC'ed linux-omap.

On Mon, Dec 5, 2011 at 7:23 PM, Felipe Contreras
<felipe.contreras@xxxxxxxxx> wrote:
> From: Felipe Contreras <felipe.contreras@xxxxxxxxx>
>
> This reverts commit 10299e2e4e3ed3b16503d4e04edd48b33083f4e2.
>
> This seems to break USB networking stuff.
>
> Cc: Kalle Jokiniemi <kalle.jokiniemi@xxxxxxxxx>
> Cc: Heikki Krogerus <heikki.krogerus@xxxxxxxxx>
> Cc: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>
> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
> ---
> Âarch/arm/mach-omap2/board-rx51-peripherals.c | Â 27 +------------------------
> Â1 files changed, 2 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index ba1aa07..9f8e4d2 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -23,7 +23,6 @@
> Â#include <linux/gpio.h>
> Â#include <linux/gpio_keys.h>
> Â#include <linux/mmc/host.h>
> -#include <linux/power/isp1704_charger.h>
>
> Â#include <plat/mcspi.h>
> Â#include <plat/board.h>
> @@ -56,8 +55,6 @@
> Â#define RX51_FMTX_IRQ Â Â Â Â Â Â Â Â Â53
> Â#define RX51_LP5523_CHIP_EN_GPIO Â Â Â 41
>
> -#define RX51_USB_TRANSCEIVER_RST_GPIO Â67
> -
> Â/* list all spi devices here */
> Âenum {
> Â Â Â ÂRX51_SPI_WL1251,
> @@ -174,30 +171,10 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
> Â Â Â Â},
> Â};
>
> -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,
> -};
> -
> Âstatic struct platform_device rx51_charger_device = {
> -    .name  = "isp1704_charger",
> -    .dev  Â= {
> - Â Â Â Â Â Â Â .platform_data = &rx51_charger_data,
> - Â Â Â },
> + Â Â Â .name = "isp1704_charger",
> Â};
>
> -static void __init rx51_charger_init(void)
> -{
> - Â Â Â WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
> - Â Â Â Â Â Â Â GPIOF_OUT_INIT_LOW, "isp1704_reset"));
> -
> - Â Â Â platform_device_register(&rx51_charger_device);
> -}
> -
> Â#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
>
> Â#define RX51_GPIO_CAMERA_LENS_COVER Â Â110
> @@ -1102,6 +1079,6 @@ void __init rx51_peripherals_init(void)
> Â Â Â Âif (partition)
> Â Â Â Â Â Â Â Âomap2_hsmmc_init(mmc);
>
> - Â Â Â rx51_charger_init();
> + Â Â Â platform_device_register(&rx51_charger_device);
> Â}

-- 
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/