Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Olof Johansson: "Here are the main updates for SoC support (besides DT additions) for ARM 32- and 64-bit platforms. The branch also contains defconfig updates to turn on drivers and options as needed on the various platforms. The largest parts of the delta are from cleanups moving platform data and board file setup of TI platforms to ti-sysc bus drivers. There are also some sweeping changes of eeprom and nand setup on Davinci, i.MX and other platforms. Samsung is removing support for Exynos5440, which was an oddball SoC that hasn't been seen much use in designs. Renesas is adding support for new SoCs (R-Car E3, RZ/G1C and RZ/N1D). Linus Walleij is also removing support for ux500 (Sony Ericsson) U8540/9540 SoCs that never made it to significant mass production and products" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits) MAINTAINERS: add NXP linux team maillist as i.MX reviewer ARM: stm32: Don't select DMA unconditionally on STM32MP157C arm64: defconfig: Enable PCIe on msm8996 and db820c ARM: pxa3xx: enable external wakeup pins ARM: pxa: stargate2: use device properties for at24 eeprom arm64: defconfig: Enable HISILICON_LPC arm64: defconfig: enable drivers for Poplar support arm64: defconfig: Enable UFS on msm8996 ARM: berlin: switch to SPDX license identifier arm: berlin: remove non-necessary flush_cache_all() ARM: berlin: extend BG2CD Kconfig entry OMAP: CLK: CLKSRC: Add suspend resume hooks ARM: AM43XX: Add functions to save/restore am43xx control registers ASoC: ams_delta: use GPIO lookup table ARM: OMAP1: ams-delta: add GPIO lookup tables bus: ti-sysc: Fix optional clocks array access ARM: OMAP2+: Make sure LOGICRETSTATE bits are not cleared ARM: OMAP2+: prm44xx: Inroduce cpu_pm notifiers for context save/restore ARM: OMAP2+: prm44xx: Introduce context save/restore for am43 PRCM IO ARM: OMAP2+: powerdomain: Introduce cpu_pm notifiers for context save/restore ...
这个提交包含在：
Linus Torvalds
@@ -12,6 +12,7 @@
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
#include <linux/gpio/driver.h>
|
||||
#include <linux/gpio/machine.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
@@ -202,7 +203,10 @@ static struct resource latch2_resources[] = {
|
||||
},
|
||||
};
|
||||
|
||||
#define LATCH2_LABEL "latch2"
|
||||
|
||||
static struct bgpio_pdata latch2_pdata = {
|
||||
.label = LATCH2_LABEL,
|
||||
.base = AMS_DELTA_LATCH2_GPIO_BASE,
|
||||
.ngpio = AMS_DELTA_LATCH2_NGPIO,
|
||||
};
|
||||
@@ -217,6 +221,23 @@ static struct platform_device latch2_gpio_device = {
|
||||
},
|
||||
};
|
||||
|
||||
#define LATCH2_PIN_LCD_VBLEN 0
|
||||
#define LATCH2_PIN_LCD_NDISP 1
|
||||
#define LATCH2_PIN_NAND_NCE 2
|
||||
#define LATCH2_PIN_NAND_NRE 3
|
||||
#define LATCH2_PIN_NAND_NWP 4
|
||||
#define LATCH2_PIN_NAND_NWE 5
|
||||
#define LATCH2_PIN_NAND_ALE 6
|
||||
#define LATCH2_PIN_NAND_CLE 7
|
||||
#define LATCH2_PIN_KEYBRD_PWR 8
|
||||
#define LATCH2_PIN_KEYBRD_DATAOUT 9
|
||||
#define LATCH2_PIN_SCARD_RSTIN 10
|
||||
#define LATCH2_PIN_SCARD_CMDVCC 11
|
||||
#define LATCH2_PIN_MODEM_NRESET 12
|
||||
#define LATCH2_PIN_MODEM_CODEC 13
|
||||
#define LATCH2_PIN_HOOKFLASH1 14
|
||||
#define LATCH2_PIN_HOOKFLASH2 15
|
||||
|
||||
static const struct gpio latch_gpios[] __initconst = {
|
||||
{
|
||||
.gpio = LATCH1_GPIO_BASE + 6,
|
||||
@@ -238,11 +259,6 @@ static const struct gpio latch_gpios[] __initconst = {
|
||||
.flags = GPIOF_OUT_INIT_LOW,
|
||||
.label = "scard_cmdvcc",
|
||||
},
|
||||
{
|
||||
.gpio = AMS_DELTA_GPIO_PIN_MODEM_CODEC,
|
||||
.flags = GPIOF_OUT_INIT_LOW,
|
||||
.label = "modem_codec",
|
||||
},
|
||||
{
|
||||
.gpio = AMS_DELTA_LATCH2_GPIO_BASE + 14,
|
||||
.flags = GPIOF_OUT_INIT_LOW,
|
||||
@@ -323,6 +339,22 @@ static struct platform_device ams_delta_nand_device = {
|
||||
.resource = ams_delta_nand_resources,
|
||||
};
|
||||
|
||||
#define OMAP_GPIO_LABEL "gpio-0-15"
|
||||
|
||||
static struct gpiod_lookup_table ams_delta_nand_gpio_table = {
|
||||
.table = {
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_NAND_RB, "rdy",
|
||||
0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NCE, "nce", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NRE, "nre", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWP, "nwp", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWE, "nwe", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_ALE, "ale", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_CLE, "cle", 0),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
static struct resource ams_delta_kp_resources[] = {
|
||||
[0] = {
|
||||
.start = INT_KEYBOARD,
|
||||
@@ -358,6 +390,14 @@ static struct platform_device ams_delta_lcd_device = {
|
||||
.id = -1,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table ams_delta_lcd_gpio_table = {
|
||||
.table = {
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_LCD_VBLEN, "vblen", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_LCD_NDISP, "ndisp", 0),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
static const struct gpio_led gpio_leds[] __initconst = {
|
||||
{
|
||||
.name = "camera",
|
||||
@@ -449,11 +489,35 @@ static struct platform_device ams_delta_audio_device = {
|
||||
.id = -1,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table ams_delta_audio_gpio_table = {
|
||||
.table = {
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_HOOK_SWITCH,
|
||||
"hook_switch", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_MODEM_CODEC,
|
||||
"modem_codec", 0),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device cx20442_codec_device = {
|
||||
.name = "cx20442-codec",
|
||||
.id = -1,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table ams_delta_serio_gpio_table = {
|
||||
.table = {
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_KEYBRD_DATA,
|
||||
"data", 0),
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_KEYBRD_CLK,
|
||||
"clock", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_KEYBRD_PWR,
|
||||
"power", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT,
|
||||
"dataout", 0),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device *ams_delta_devices[] __initdata = {
|
||||
&latch1_gpio_device,
|
||||
&latch2_gpio_device,
|
||||
@@ -468,6 +532,16 @@ static struct platform_device *late_devices[] __initdata = {
|
||||
&cx20442_codec_device,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table *ams_delta_gpio_tables[] __initdata = {
|
||||
&ams_delta_audio_gpio_table,
|
||||
&ams_delta_serio_gpio_table,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table *late_gpio_tables[] __initdata = {
|
||||
&ams_delta_lcd_gpio_table,
|
||||
&ams_delta_nand_gpio_table,
|
||||
};
|
||||
|
||||
static void __init ams_delta_init(void)
|
||||
{
|
||||
/* mux pins for uarts */
|
||||
@@ -500,6 +574,20 @@ static void __init ams_delta_init(void)
|
||||
gpio_led_register_device(-1, &leds_pdata);
|
||||
platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
|
||||
|
||||
/*
|
||||
* As soon as devices have been registered, assign their dev_names
|
||||
* to respective GPIO lookup tables before they are added.
|
||||
*/
|
||||
ams_delta_audio_gpio_table.dev_id =
|
||||
dev_name(&ams_delta_audio_device.dev);
|
||||
/*
|
||||
* No device name is assigned to GPIO lookup table for serio device
|
||||
* as long as serio driver is not converted to platform device driver.
|
||||
*/
|
||||
|
||||
gpiod_add_lookup_tables(ams_delta_gpio_tables,
|
||||
ARRAY_SIZE(ams_delta_gpio_tables));
|
||||
|
||||
ams_delta_init_fiq();
|
||||
|
||||
omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);
|
||||
@@ -570,6 +658,15 @@ static int __init late_init(void)
|
||||
|
||||
platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
|
||||
|
||||
/*
|
||||
* As soon as devices have been registered, assign their dev_names
|
||||
* to respective GPIO lookup tables before they are added.
|
||||
*/
|
||||
ams_delta_lcd_gpio_table.dev_id = dev_name(&ams_delta_lcd_device.dev);
|
||||
ams_delta_nand_gpio_table.dev_id = dev_name(&ams_delta_nand_device.dev);
|
||||
|
||||
gpiod_add_lookup_tables(late_gpio_tables, ARRAY_SIZE(late_gpio_tables));
|
||||
|
||||
err = platform_device_register(&modem_nreset_device);
|
||||
if (err) {
|
||||
pr_err("Couldn't register the modem regulator device\n");
|
||||
|
||||
@@ -303,22 +303,22 @@ static const struct omap_lcd_config osk_lcd_config __initconst = {
|
||||
#ifdef CONFIG_OMAP_OSK_MISTRAL
|
||||
|
||||
#include <linux/input.h>
|
||||
#include <linux/platform_data/at24.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/ads7846.h>
|
||||
|
||||
#include <linux/platform_data/keypad-omap.h>
|
||||
|
||||
static struct at24_platform_data at24c04 = {
|
||||
.byte_len = SZ_4K / 8,
|
||||
.page_size = 16,
|
||||
static const struct property_entry mistral_at24_properties[] = {
|
||||
PROPERTY_ENTRY_U32("pagesize", 16),
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct i2c_board_info __initdata mistral_i2c_board_info[] = {
|
||||
{
|
||||
/* NOTE: powered from LCD supply */
|
||||
I2C_BOARD_INFO("24c04", 0x50),
|
||||
.platform_data = &at24c04,
|
||||
.properties = mistral_at24_properties,
|
||||
},
|
||||
/* TODO when driver support is ready:
|
||||
* - optionally ov9640 camera sensor at 0x30
|
||||
|
||||
在新工单中引用
屏蔽一个用户