Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 729fae44 authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Russell King
Browse files

ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request 



Signed-off-by: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a53c876d

arch/arm/mach-sa1100/h3100.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ static void h3100_lcd_power(int enable) 
		gpio_set_value(H3100_GPIO_LCD_3V_ON, enable);

		gpio_set_value(H3100_GPIO_LCD_3V_ON, enable);

		gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);

		gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);

		gpio_free(H3XXX_EGPIO_LCD_ON);

		gpio_free(H3XXX_EGPIO_LCD_ON);

	} else {

		pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);

	}

	}

}

}

arch/arm/mach-sa1100/h3600.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -27,14 +27,22 @@ 
 */

 */

static void h3600_lcd_power(int enable)

static void h3600_lcd_power(int enable)

{

{

	if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power"))

	if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) {

		pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);

		goto err1;

		goto err1;

	if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control"))

	}

	if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) {

		pr_err("%s: can't request H3XXX_EGPIO_LCD_PCI\n", __func__);

		goto err2;

		goto err2;

	if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v"))

	}

	if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) {

		pr_err("%s: can't request H3XXX_EGPIO_LCD_5V_ON\n", __func__);

		goto err3;

		goto err3;

	if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v"))

	}

	if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) {

		pr_err("%s: can't request H3600_EGPIO_LVDD_ON\n", __func__);

		goto err4;

		goto err4;

	}





	gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);

	gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);

	gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);

	gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);

arch/arm/mach-sa1100/h3xxx.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -83,8 +83,10 @@ static void h3xxx_set_vpp(int vpp) 
static int h3xxx_flash_init(void)

static int h3xxx_flash_init(void)

{

{

	int err = gpio_request(H3XXX_EGPIO_VPP_ON, "Flash Vpp");

	int err = gpio_request(H3XXX_EGPIO_VPP_ON, "Flash Vpp");

	if (err)

	if (err) {

		pr_err("%s: can't request H3XXX_EGPIO_VPP_ON\n", __func__);

		return err;

		return err;

	}





	err = gpio_direction_output(H3XXX_EGPIO_VPP_ON, 0);

	err = gpio_direction_output(H3XXX_EGPIO_VPP_ON, 0);

	if (err)

	if (err)
@@ -143,10 +145,14 @@ static u_int h3xxx_uart_get_mctrl(struct uart_port *port) 




static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate)

static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate)

{

{

	if (port->mapbase == _Ser3UTCR0)

	if (port->mapbase == _Ser3UTCR0) {

		if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) {

		if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) {

			gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state);

			gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state);

			gpio_free(H3XXX_EGPIO_RS232_ON);

			gpio_free(H3XXX_EGPIO_RS232_ON);

		} else {

			pr_err("%s: can't request H3XXX_EGPIO_RS232_ON\n",

				__func__);

		}

	}

	}

}

}