xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: pxa: Add gpio descriptor lookup tables for MMC CD/WP

Browse Source 
This adds GPIO descriptor look-up tables for a whole bunch
of PXA boards with MMC card detect (CD) and write protect (WP)
GPIO lines, so we can move away from the hard-coded GPIO
numberspace.

In some cases the platforms were compulsively including the
<linux/gpio.h> header even if they weren't actually using
it, and in these cases I simply replaced that inclusion with
the more appropriate <linux/gpio/machine.h> which is what
board files should be including most of the time.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Linus Walleij
2018-12-02 09:43:22 +01:00
committed by Ulf Hansson
parent 5128f8d445
commit 32d1544880
21 changed files with 322 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
arch/arm/mach-pxa/zylonite.c
View File

@@ -19,7 +19,7 @@
#include <linux/leds.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/gpio/machine.h>
#include <linux/pwm.h>
#include <linux/pwm_backlight.h>
#include <linux/smc91x.h>
@@ -232,6 +232,24 @@ static struct pxamci_platform_data zylonite_mci_platform_data = {
.gpio_power = -1,
};
#define PCA9539A_MCI_CD 0
#define PCA9539A_MCI1_CD 1
#define PCA9539A_MCI_WP 2
#define PCA9539A_MCI1_WP 3
#define PCA9539A_MCI3_CD 30
#define PCA9539A_MCI3_WP 31
static struct gpiod_lookup_table zylonite_mci_gpio_table = {
.dev_id = "pxa2xx-mci.0",
.table = {
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI_CD,
"cd", GPIO_ACTIVE_LOW),
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI_WP,
"wp", GPIO_ACTIVE_LOW),
{ },
},
};
static struct pxamci_platform_data zylonite_mci2_platform_data = {
.detect_delay_ms= 200,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
@@ -240,6 +258,17 @@ static struct pxamci_platform_data zylonite_mci2_platform_data = {
.gpio_power = -1,
};
static struct gpiod_lookup_table zylonite_mci2_gpio_table = {
.dev_id = "pxa2xx-mci.1",
.table = {
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI1_CD,
"cd", GPIO_ACTIVE_LOW),
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI1_WP,
"wp", GPIO_ACTIVE_LOW),
{ },
},
};
static struct pxamci_platform_data zylonite_mci3_platform_data = {
.detect_delay_ms= 200,
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
@@ -248,12 +277,27 @@ static struct pxamci_platform_data zylonite_mci3_platform_data = {
.gpio_power = -1,
};
static struct gpiod_lookup_table zylonite_mci3_gpio_table = {
.dev_id = "pxa2xx-mci.2",
.table = {
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI3_CD,
"cd", GPIO_ACTIVE_LOW),
GPIO_LOOKUP("i2c-pca9539-a", PCA9539A_MCI3_WP,
"wp", GPIO_ACTIVE_LOW),
{ },
},
};
static void __init zylonite_init_mmc(void)
{
gpiod_add_lookup_table(&zylonite_mci_gpio_table);
pxa_set_mci_info(&zylonite_mci_platform_data);
gpiod_add_lookup_table(&zylonite_mci2_gpio_table);
pxa3xx_set_mci2_info(&zylonite_mci2_platform_data);
if (cpu_is_pxa310())
if (cpu_is_pxa310()) {
gpiod_add_lookup_table(&zylonite_mci3_gpio_table);
pxa3xx_set_mci3_info(&zylonite_mci3_platform_data);
}
}
#else
static inline void zylonite_init_mmc(void) {}