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

Commit dd58ecba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 

* 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
  ARM: msm: platsmp: determine number of CPU cores at boot time
  ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
  ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
  ARM: orion5x: fixup 5181 MPP mask check
  ARM: mxs-dma: include <linux/dmaengine.h>
  ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
  ARM: i.MX53: UARTn_CTS pin should not change RTS input select
  ARM: i.MX53: UARTn_TXD pin should not change RXD input select
  ARM: mx25: Fix typo on CAN1_RX pad setting
  iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
  ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: i.MX53: Fix IOMUX type o's
  ARM i.MX dma: Fix burstsize settings
  mach-mx5: fix the I2C clock parents
  ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
  ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
  ARM: mx53: Fix some interrupts marked as reserved.
  MXC: iomux-v3: correct NO_PAD_CTRL definition
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
parents 3f4a1221 604f4498

arch/arm/configs/mx51_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK=m

CONFIG_MMC_SDHCI=m
@@ -145,7 +146,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_UTF8=y

CONFIG_MAGIC_SYSRQ=y

arch/arm/configs/mxs_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ CONFIG_DISPLAY_SUPPORT=m 
# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_MXS=y

CONFIG_RTC_CLASS=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=m

CONFIG_DMADEVICES=y

CONFIG_MXS_DMA=y

arch/arm/mach-cns3xxx/include/mach/vmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ 
 * published by the Free Software Foundation.

 */



#define VMALLOC_END		0xd8000000
 
#define VMALLOC_END		0xd8000000UL

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

+24 −5
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ 


#include "devices-imx27.h"



#define SD1_EN_GPIO (GPIO_PORTB + 25)

#define OTG_PHY_RESET_GPIO (GPIO_PORTB + 23)

#define SPI2_SS0 (GPIO_PORTD + 21)

#define EXPIO_PARENT_INT	(MXC_INTERNAL_IRQS + GPIO_PORTC + 28)

#define SD1_EN_GPIO		IMX_GPIO_NR(2, 25)

#define OTG_PHY_RESET_GPIO	IMX_GPIO_NR(2, 23)

#define SPI2_SS0		IMX_GPIO_NR(4, 21)

#define EXPIO_PARENT_INT	gpio_to_irq(IMX_GPIO_NR(3, 28))

#define PMIC_INT		IMX_GPIO_NR(3, 14)



static const int mx27pdk_pins[] __initconst = {

	/* UART1 */
@@ -98,9 +99,12 @@ static const int mx27pdk_pins[] __initconst = { 
	PD22_PF_CSPI2_SCLK,

	PD23_PF_CSPI2_MISO,

	PD24_PF_CSPI2_MOSI,

	SPI2_SS0 | GPIO_GPIO | GPIO_OUT,

	/* I2C1 */

	PD17_PF_I2C_DATA,

	PD18_PF_I2C_CLK,

	/* PMIC INT */

	PMIC_INT | GPIO_GPIO | GPIO_IN,

};



static const struct imxuart_platform_data uart_pdata __initconst = {
@@ -193,6 +197,13 @@ static int __init mx27_3ds_otg_mode(char *options) 
__setup("otg_mode=", mx27_3ds_otg_mode);



/* Regulators */

static struct regulator_init_data gpo_init = {

	.constraints = {

		.boot_on = 1,

		.always_on = 1,

	}

};



static struct regulator_consumer_supply vmmc1_consumers[] = {

	REGULATOR_SUPPLY("lcd_2v8", NULL),

};
@@ -201,7 +212,9 @@ static struct regulator_init_data vmmc1_init = { 
	.constraints = {

		.min_uV	= 2800000,

		.max_uV = 2800000,

		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,

		.apply_uV = 1,

		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies = ARRAY_SIZE(vmmc1_consumers),

	.consumer_supplies = vmmc1_consumers,
@@ -228,6 +241,12 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = { 
	}, {

		.id = MC13783_REG_VGEN,

		.init_data = &vgen_init,

	}, {

		.id = MC13783_REG_GPO1, /* Turn on 1.8V */

		.init_data = &gpo_init,

	}, {

		.id = MC13783_REG_GPO3, /* Turn on 3.3V */

		.init_data = &gpo_init,

	},

};

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

+5 −5
Original line number Diff line number Diff line
@@ -54,11 +54,8 @@ static int mx31_3ds_pins[] = { 
	MX31_PIN_RXD1__RXD1,

	IOMUX_MODE(MX31_PIN_GPIO1_1, IOMUX_CONFIG_GPIO),

	/*SPI0*/

	MX31_PIN_CSPI1_SCLK__SCLK,

	MX31_PIN_CSPI1_MOSI__MOSI,

	MX31_PIN_CSPI1_MISO__MISO,

	MX31_PIN_CSPI1_SPI_RDY__SPI_RDY,

	MX31_PIN_CSPI1_SS2__SS2, /* CS for LCD */

	IOMUX_MODE(MX31_PIN_DSR_DCE1, IOMUX_CONFIG_ALT1),

	IOMUX_MODE(MX31_PIN_RI_DCE1, IOMUX_CONFIG_ALT1),

	/* SPI 1 */

	MX31_PIN_CSPI2_SCLK__SCLK,

	MX31_PIN_CSPI2_MOSI__MOSI,
@@ -692,6 +689,9 @@ static void __init mx31_3ds_init(void) 


	imx31_soc_init();



	/* Configure SPI1 IOMUX */

	mxc_iomux_set_gpr(MUX_PGP_CSPI_BB, true);



	mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),

				      "mx31_3ds");