Commit 5ac676ad authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Ralf Baechle
Browse files

MIPS: TXx9: tx49xx: Move GPIO setup from .mem_setup() to .arch_init() 



txx9_gpio_init() calls gpiochip_add_data(), which fails with -ENOMEM as
it is called too early in the boot process. This causes all subsequent
GPIO operations to fail silently (before commit 54d77198 ("gpio:
bail out silently on NULL descriptors") it printed the error message
"gpiod_direction_output_raw: invalid GPIO" on RBTX49[23]7).

Postpone all GPIO setup to .arch_init() time to fix this.

Suggested-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linux-gpio@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14237/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 561eca49

arch/mips/txx9/generic/setup_tx4927.c

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ void __init tx4927_setup(void) 
		txx9_tmr_init(TX4927_TMR_REG(i) & 0xfffffffffULL);



	/* PIO */

	txx9_gpio_init(TX4927_PIO_REG & 0xfffffffffULL, 0, TX4927_NUM_PIO);

	__raw_writel(0, &tx4927_pioptr->maskcpu);

	__raw_writel(0, &tx4927_pioptr->maskext);

arch/mips/txx9/generic/setup_tx4938.c

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ void __init tx4938_setup(void) 
		txx9_tmr_init(TX4938_TMR_REG(i) & 0xfffffffffULL);



	/* PIO */

	txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, TX4938_NUM_PIO);

	__raw_writel(0, &tx4938_pioptr->maskcpu);

	__raw_writel(0, &tx4938_pioptr->maskext);

arch/mips/txx9/rbtx4927/setup.c

+22 −10
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/leds.h>

#include <asm/io.h>

#include <asm/reboot.h>

#include <asm/txx9pio.h>

#include <asm/txx9/generic.h>

#include <asm/txx9/pci.h>

#include <asm/txx9/rbtx4927.h>
@@ -151,20 +152,37 @@ static void __init tx4937_pci_setup(void) 
	}

	tx4938_setup_pcierr_irq();

}

#else

static inline void tx4927_pci_setup(void) {}

static inline void tx4937_pci_setup(void) {}

#endif /* CONFIG_PCI */



static void __init rbtx4927_gpio_init(void)

{

	/* TX4927-SIO DTR on (PIO[15]) */

	gpio_request(15, "sio-dtr");

	gpio_direction_output(15, 1);



	tx4927_sio_init(0, 0);

}



static void __init rbtx4927_arch_init(void)

{

	txx9_gpio_init(TX4927_PIO_REG & 0xfffffffffULL, 0, TX4927_NUM_PIO);



	rbtx4927_gpio_init();



	tx4927_pci_setup();

}



static void __init rbtx4937_arch_init(void)

{

	txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, TX4938_NUM_PIO);



	rbtx4927_gpio_init();



	tx4937_pci_setup();

}

#else

#define rbtx4927_arch_init NULL

#define rbtx4937_arch_init NULL

#endif /* CONFIG_PCI */



static void toshiba_rbtx4927_restart(char *command)

{
@@ -205,12 +223,6 @@ static void __init rbtx4927_mem_setup(void) 
#else

	set_io_port_base(KSEG1 + RBTX4927_ISA_IO_OFFSET);

#endif



	/* TX4927-SIO DTR on (PIO[15]) */

	gpio_request(15, "sio-dtr");

	gpio_direction_output(15, 1);



	tx4927_sio_init(0, 0);

}



static void __init rbtx4927_clock_init(void)

arch/mips/txx9/rbtx4938/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static void __init rbtx4938_mtd_init(void) 


static void __init rbtx4938_arch_init(void)

{

	txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, TX4938_NUM_PIO);

	gpiochip_add_data(&rbtx4938_spi_gpio_chip, NULL);

	rbtx4938_pci_setup();

	rbtx4938_spi_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE