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

Commit 917ec63b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull arm-soc bug fixes from Arnd Bergmann:
 "Here are all the fixes I got after sending the last pull request.
  These fix mostly regressions on exynos, at91, pxa and ep93xx.

  Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de&gt;">

* tag 'fixes-3.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: ep93xx: convert vision_ep9307 to MULTI_IRQ_HANDLER
  ARM: EXYNOS: fix touchscreen IRQ setup on Universal C210 board
  ARM: pxa: fix invalid mfp pin issue
  ARM: pxa: remove duplicated registeration on pxa-gpio
  ARM: pxa: add dummy clock for pxa25x and pxa27x
  ARM: S3C24XX: DMA resume regression fix
  ARM: S3C24XX: Fix restart on S3C2442
  ARM: SAMSUNG: Fix memory size for hsotg
  ARM: at91/dma: DMA controller registering with DT support
  ARM: at91/dma: remove platform data from DMA controller
parents 4704fe65 6b608055

arch/arm/mach-at91/at91sam9g45_devices.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -38,10 +38,6 @@ 
#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

static u64 hdmac_dmamask = DMA_BIT_MASK(32);

static u64 hdmac_dmamask = DMA_BIT_MASK(32);





static struct at_dma_platform_data atdma_pdata = {

	.nr_channels	= 8,

};



static struct resource hdmac_resources[] = {

static struct resource hdmac_resources[] = {

	[0] = {

	[0] = {

		.start	= AT91SAM9G45_BASE_DMA,

		.start	= AT91SAM9G45_BASE_DMA,
@@ -56,12 +52,11 @@ static struct resource hdmac_resources[] = { 
};

};





static struct platform_device at_hdmac_device = {

static struct platform_device at_hdmac_device = {

	.name		= "at_hdmac",

	.name		= "at91sam9g45_dma",

	.id		= -1,

	.id		= -1,

	.dev		= {

	.dev		= {

				.dma_mask		= &hdmac_dmamask,

				.dma_mask		= &hdmac_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &atdma_pdata,

	},

	},

	.resource	= hdmac_resources,

	.resource	= hdmac_resources,

	.num_resources	= ARRAY_SIZE(hdmac_resources),

	.num_resources	= ARRAY_SIZE(hdmac_resources),
@@ -69,8 +64,14 @@ static struct platform_device at_hdmac_device = { 




void __init at91_add_device_hdmac(void)

void __init at91_add_device_hdmac(void)

{

{

	dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);

#if defined(CONFIG_OF)

	dma_cap_set(DMA_SLAVE, atdma_pdata.cap_mask);

	struct device_node *of_node =

		of_find_node_by_name(NULL, "dma-controller");



	if (of_node)

		of_node_put(of_node);

	else

#endif

		platform_device_register(&at_hdmac_device);

		platform_device_register(&at_hdmac_device);

}

}

#else

#else

arch/arm/mach-at91/at91sam9rl_devices.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -33,10 +33,6 @@ 
#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

static u64 hdmac_dmamask = DMA_BIT_MASK(32);

static u64 hdmac_dmamask = DMA_BIT_MASK(32);





static struct at_dma_platform_data atdma_pdata = {

	.nr_channels	= 2,

};



static struct resource hdmac_resources[] = {

static struct resource hdmac_resources[] = {

	[0] = {

	[0] = {

		.start	= AT91SAM9RL_BASE_DMA,

		.start	= AT91SAM9RL_BASE_DMA,
@@ -51,12 +47,11 @@ static struct resource hdmac_resources[] = { 
};

};





static struct platform_device at_hdmac_device = {

static struct platform_device at_hdmac_device = {

	.name		= "at_hdmac",

	.name		= "at91sam9rl_dma",

	.id		= -1,

	.id		= -1,

	.dev		= {

	.dev		= {

				.dma_mask		= &hdmac_dmamask,

				.dma_mask		= &hdmac_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &atdma_pdata,

	},

	},

	.resource	= hdmac_resources,

	.resource	= hdmac_resources,

	.num_resources	= ARRAY_SIZE(hdmac_resources),

	.num_resources	= ARRAY_SIZE(hdmac_resources),
@@ -64,7 +59,6 @@ static struct platform_device at_hdmac_device = { 




void __init at91_add_device_hdmac(void)

void __init at91_add_device_hdmac(void)

{

{

	dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);

	platform_device_register(&at_hdmac_device);

	platform_device_register(&at_hdmac_device);

}

}

#else

#else

arch/arm/mach-ep93xx/vision_ep9307.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <mach/ep93xx_spi.h>

#include <mach/ep93xx_spi.h>

#include <mach/gpio-ep93xx.h>

#include <mach/gpio-ep93xx.h>





#include <asm/hardware/vic.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -361,6 +362,7 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307") 
	.atag_offset	= 0x100,

	.atag_offset	= 0x100,

	.map_io		= vision_map_io,

	.map_io		= vision_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.timer		= &ep93xx_timer,

	.init_machine	= vision_init_machine,

	.init_machine	= vision_init_machine,

	.restart	= ep93xx_restart,

	.restart	= ep93xx_restart,

arch/arm/mach-exynos/mach-universal_c210.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/gpio_keys.h>

#include <linux/gpio_keys.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/mfd/max8998.h>

#include <linux/mfd/max8998.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>
@@ -595,6 +596,7 @@ static struct mxt_platform_data qt602240_platform_data = { 
	.threshold	= 0x28,

	.threshold	= 0x28,

	.voltage	= 2800000,		/* 2.8V */

	.voltage	= 2800000,		/* 2.8V */

	.orient		= MXT_DIAGONAL,

	.orient		= MXT_DIAGONAL,

	.irqflags	= IRQF_TRIGGER_FALLING,

};

};





static struct i2c_board_info i2c3_devs[] __initdata = {

static struct i2c_board_info i2c3_devs[] __initdata = {

arch/arm/mach-pxa/generic.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ extern unsigned pxa3xx_get_clk_frequency_khz(int); 
#endif

#endif





extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa_gpio_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;