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

Commit 4294ad1c authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Fix DB1100 GPIO registration



With CONFIG_GPIOLIB=y gpios need to be requested before they can be
modified.  Request the SD carddetect pins, and drop the SPI direction
setup, as the driver does that for us anyway.  This gets rid of a
lot of WARN_ON()s triggered by GPIO core, and restores functionality
of the touschreen controller.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/6497/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 38dbfb59
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -534,13 +534,10 @@ static int __init db1000_dev_init(void)
		s0 = AU1100_GPIO1_INT;
		s1 = AU1100_GPIO4_INT;

		gpio_request(19, "sd0_cd");
		gpio_request(20, "sd1_cd");
		gpio_direction_input(19);	/* sd0 cd# */
		gpio_direction_input(20);	/* sd1 cd# */
		gpio_direction_input(21);	/* touch pendown# */
		gpio_direction_input(207);	/* SPI MISO */
		gpio_direction_output(208, 0);	/* SPI MOSI */
		gpio_direction_output(209, 1);	/* SPI SCK */
		gpio_direction_output(210, 1);	/* SPI CS# */

		/* spi_gpio on SSI0 pins */
		pfc = __raw_readl((void __iomem *)SYS_PINFUNC);