Commit f67f6c00 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

ARM: s3c24xx: move s3cmci pinctrl handling into board files 



Rather than call the internal s3c_gpio_cfgall_range() function
through a platform header, move the code into the set_power
callback that is already exported by the board, and add
a default implementation.

In DT mode, the code already does not set the pin config,
so nothing changes there.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200806182059.2431-29-krzk@kernel.org


[krzk: Rebase and correct set_power in mach-h1940.c]
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 673085f4

arch/arm/mach-s3c24xx/include/mach/pm-core.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "regs-clock.h"

#include "regs-irq.h"

#include <mach/irqs.h>



static inline void s3c_pm_debug_init_uart(void)

{

arch/arm/mach-s3c24xx/mach-amlm5900.c

+15 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/list.h>

#include <linux/timer.h>

#include <linux/init.h>

#include <linux/gpio/machine.h>

#include <linux/gpio.h>

#include <linux/device.h>

#include <linux/platform_device.h>
@@ -121,6 +122,19 @@ static struct s3c2410_uartcfg amlm5900_uartcfgs[] = { 
	}

};



static struct gpiod_lookup_table amlm5900_mmc_gpio_table = {

	.dev_id = "s3c2410-sdi",

	.table = {

		/* bus pins */

		GPIO_LOOKUP_IDX("GPIOE",  5, "bus", 0, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  6, "bus", 1, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  7, "bus", 2, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  8, "bus", 3, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  9, "bus", 4, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct platform_device *amlm5900_devices[] __initdata = {

#ifdef CONFIG_FB_S3C2410
@@ -216,6 +230,7 @@ static void __init amlm5900_init(void) 
	s3c24xx_fb_set_platdata(&amlm5900_fb_info);

#endif

	s3c_i2c0_set_platdata(NULL);

	gpiod_add_lookup_table(&amlm5900_mmc_gpio_table);

	platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices));

}

arch/arm/mach-s3c24xx/mach-at2440evb.c

+9 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static struct platform_device at2440evb_device_eth = { 
};



static struct s3c24xx_mci_pdata at2440evb_mci_pdata __initdata = {

	/* Intentionally left blank */

	.set_power	= s3c24xx_mci_def_set_power,

};



static struct gpiod_lookup_table at2440evb_mci_gpio_table = {
@@ -142,10 +142,18 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { 
	.table = {

		/* Card detect S3C2410_GPG(10) */

		GPIO_LOOKUP("GPIOG", 10, "cd", GPIO_ACTIVE_LOW),

		/* bus pins */

		GPIO_LOOKUP_IDX("GPIOE",  5, "bus", 0, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  6, "bus", 1, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  7, "bus", 2, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  8, "bus", 3, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  9, "bus", 4, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH),

		{ },

	},

};





/* 7" LCD panel */



static struct s3c2410fb_display at2440evb_lcd_cfg __initdata = {

arch/arm/mach-s3c24xx/mach-gta02.c

+15 −0
Original line number Diff line number Diff line
@@ -487,6 +487,20 @@ static struct platform_device gta02_audio = { 
	.id = -1,

};



static struct gpiod_lookup_table gta02_mmc_gpio_table = {

	.dev_id = "s3c2410-sdi",

	.table = {

		/* bus pins */

		GPIO_LOOKUP_IDX("GPIOE",  5, "bus", 0, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  6, "bus", 1, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  7, "bus", 2, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  8, "bus", 3, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  9, "bus", 4, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static void __init gta02_map_io(void)

{

	s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
@@ -543,6 +557,7 @@ static void __init gta02_machine_init(void) 
			      S3C_GPIO_PULL_NONE);



	gpiod_add_lookup_table(&gta02_audio_gpio_table);

	gpiod_add_lookup_table(&gta02_mmc_gpio_table);

	platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));

	pm_power_off = gta02_poweroff;

arch/arm/mach-s3c24xx/mach-h1940.c

+9 −0
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ static struct platform_device h1940_device_bluetooth = { 


static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)

{

	s3c24xx_mci_def_set_power(power_mode, vdd);



	switch (power_mode) {

	case MMC_POWER_OFF:

		gpio_set_value(H1940_LATCH_SD_POWER, 0);
@@ -470,6 +472,13 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { 
		GPIO_LOOKUP("GPIOF", 5, "cd", GPIO_ACTIVE_LOW),

		/* Write protect S3C2410_GPH(8) */

		GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_LOW),

		/* bus pins */

		GPIO_LOOKUP_IDX("GPIOE",  5, "bus", 0, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  6, "bus", 1, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  7, "bus", 2, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  8, "bus", 3, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE",  9, "bus", 4, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH),

		{ },

	},

};