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

Commit 5b34b089 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm/imx: fix imx6q mmc error when mounting rootfs
  arm/imx: fix AUTO_ZRELADDR selection
  arm/imx: fix the references to ARCH_MX3
  ARM: mx51/53: set pwm clock parent to ipg_perclk
  arm/tegra: enable headphone detection gpio on seaboard
  arm/dt: Fix ventana SDHCI power-gpios
  arm/tegra: Don't create duplicate gpio and pinmux devices
  ARM: at91: Fix USBA gadget registration
  atmel/spi: fix missing probe
  at91/yl-9200: Fix section mismatch
  at91: vmalloc fix missing AT91_VIRT_BASE define
  ARM: at91: usart: drop static map regs for dbgu
  ARM: picoxcell: add extra temp register to addruart
  ARM: msm: fix compilation flags for MSM_SCM
  arm/mxs: fix mmc device adding for mach-mx28evk
  ARM: mxc: Remove test_for_ltirq
  ARM:i.MX: fix build error in clock-mx51-mx53.c
  ARM:i.MX: fix build error in tzic/avic.c
  ARM: mxc: fix local timer interrupt handling
  msm: boards: Fix fallout from removal of machine_desc in fixup
parents eb0b38a5 ab8fe93b

arch/arm/boot/dts/tegra-ventana.dts

+1 −2
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
	sdhci@c8000400 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};



	sdhci@c8000600 {

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};

};

arch/arm/mach-at91/at91cap9_devices.c

+3 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB HS Device (Gadget)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)

#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)



static struct resource usba_udc_resources[] = {

	[0] = {
@@ -1021,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -1035,7 +1035,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91rm9200_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -891,7 +891,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91sam9260_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -837,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -851,7 +851,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91sam9261_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);