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

Commit 68fc6c83 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-soc-4.18' of... 

Merge tag 'imx-soc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

i.MX SoC update for 4.18:
 - A series from Bartosz to convert all i.MX plaform code using
   at24_platform_data to use at24 eeprom generic device properties.
 - Enable pinctrl driver support for i.MX6SLL SoC.
 - Clean up i.MX platform code using spi_imx platform data on outdated
   documentation and chip select array usage.

* tag 'imx-soc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx: select imx6sll pinctrl when imx6sll enabled
  ARM: imx: pcm037: use device properties for at24 eeprom
  ARM: imx: pca100: use device properties for at24 eeprom
  ARM: imx: pcm043: use device properties for at24 eeprom
  ARM: imx: vpr200: drop at24_platform_data
  ARM: imx: Update spi_imx platform data to reflect current state

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ace23582 0e8d1c4b

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ config SOC_IMX6SL 


config SOC_IMX6SLL

	bool "i.MX6 SoloLiteLite support"

	select PINCTRL_IMX6SLL

	select SOC_IMX6



	help

arch/arm/mach-imx/mach-mx31_3ds.c

+2 −16
Original line number Diff line number Diff line
@@ -374,26 +374,12 @@ static struct imx_ssi_platform_data mx31_3ds_ssi_pdata = { 
};



/* SPI */

static int spi0_internal_chipselect[] = {

	MXC_SPI_CS(0),

	MXC_SPI_CS(1),

	MXC_SPI_CS(2),

};



static const struct spi_imx_master spi0_pdata __initconst = {

	.chipselect	= spi0_internal_chipselect,

	.num_chipselect	= ARRAY_SIZE(spi0_internal_chipselect),

};



static int spi1_internal_chipselect[] = {

	MXC_SPI_CS(0),

	MXC_SPI_CS(1),

	MXC_SPI_CS(2),

	.num_chipselect	= 3,

};



static const struct spi_imx_master spi1_pdata __initconst = {

	.chipselect	= spi1_internal_chipselect,

	.num_chipselect	= ARRAY_SIZE(spi1_internal_chipselect),

	.num_chipselect	= 3,

};



static struct spi_board_info mx31_3ds_spi_devs[] __initdata = {

arch/arm/mach-imx/mach-mx31lilly.c

+2 −10
Original line number Diff line number Diff line
@@ -226,20 +226,12 @@ static void __init lilly1131_usb_init(void) 


/* SPI */



static int spi_internal_chipselect[] = {

	MXC_SPI_CS(0),

	MXC_SPI_CS(1),

	MXC_SPI_CS(2),

};



static const struct spi_imx_master spi0_pdata __initconst = {

	.chipselect = spi_internal_chipselect,

	.num_chipselect = ARRAY_SIZE(spi_internal_chipselect),

	.num_chipselect = 3,

};



static const struct spi_imx_master spi1_pdata __initconst = {

	.chipselect = spi_internal_chipselect,

	.num_chipselect = ARRAY_SIZE(spi_internal_chipselect),

	.num_chipselect = 3,

};



static struct mc13xxx_platform_data mc13783_pdata __initdata = {

arch/arm/mach-imx/mach-mx31lite.c

+2 −14
Original line number Diff line number Diff line
@@ -83,15 +83,8 @@ static const struct imxuart_platform_data uart_pdata __initconst = { 
};



/* SPI */

static int spi0_internal_chipselect[] = {

	MXC_SPI_CS(0),

	MXC_SPI_CS(1),

	MXC_SPI_CS(2),

};



static const struct spi_imx_master spi0_pdata __initconst = {

	.chipselect	= spi0_internal_chipselect,

	.num_chipselect	= ARRAY_SIZE(spi0_internal_chipselect),

	.num_chipselect	= 3,

};



static const struct mxc_nand_platform_data
@@ -133,13 +126,8 @@ static struct platform_device smsc911x_device = { 
 * The MC13783 is the only hard-wired SPI device on the module.

 */



static int spi1_internal_chipselect[] = {

	MXC_SPI_CS(0),

};



static const struct spi_imx_master spi1_pdata __initconst = {

	.chipselect	= spi1_internal_chipselect,

	.num_chipselect	= ARRAY_SIZE(spi1_internal_chipselect),

	.num_chipselect	= 1,

};



static struct mc13xxx_platform_data mc13783_pdata __initdata = {

arch/arm/mach-imx/mach-mx31moboard.c

+3 −14
Original line number Diff line number Diff line
@@ -152,14 +152,8 @@ static const struct imxi2c_platform_data moboard_i2c1_data __initconst = { 
	.bitrate = 100000,

};



static int moboard_spi1_cs[] = {

	MXC_SPI_CS(0),

	MXC_SPI_CS(2),

};



static const struct spi_imx_master moboard_spi1_pdata __initconst = {

	.chipselect	= moboard_spi1_cs,

	.num_chipselect	= ARRAY_SIZE(moboard_spi1_cs),

	.num_chipselect	= 3,

};



static struct regulator_consumer_supply sdhc_consumers[] = {
@@ -296,19 +290,14 @@ static struct spi_board_info moboard_spi_board_info[] __initdata = { 
		/* irq number is run-time assigned */

		.max_speed_hz = 300000,

		.bus_num = 1,

		.chip_select = 1,

		.chip_select = 0,

		.platform_data = &moboard_pmic,

		.mode = SPI_CS_HIGH,

	},

};



static int moboard_spi2_cs[] = {

	MXC_SPI_CS(0), MXC_SPI_CS(1),

};



static const struct spi_imx_master moboard_spi2_pdata __initconst = {

	.chipselect	= moboard_spi2_cs,

	.num_chipselect	= ARRAY_SIZE(moboard_spi2_cs),

	.num_chipselect	= 2,

};



#define SDHC1_CD IOMUX_TO_GPIO(MX31_PIN_ATA_CS0)