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

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

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting
  ARM: pxa/raumfeld: fix device name for codec ak4104
  ARM: pxa/raumfeld: display initialisation fixes
  ARM: pxa/raumfeld: adapt to upcoming hardware change
  ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace
  genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
  arm: mach-vt8500: add forgotten irq_data conversion
  ARM: pxa168: correct nand pmu setting
  ARM: pxa910: correct nand pmu setting
  ARM: pxa: fix PGSR register address calculation
parents d1ca1a00 24109afd

arch/arm/mach-davinci/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) 


	gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);

	ct = gc->chip_types;

	ct->chip.irq_ack = irq_gc_ack;

	ct->chip.irq_ack = irq_gc_ack_set_bit;

	ct->chip.irq_mask = irq_gc_mask_clr_bit;

	ct->chip.irq_unmask = irq_gc_mask_set_bit;

arch/arm/mach-mmp/pxa168.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static APBC_CLK(ssp4, PXA168_SSP4, 4, 0); 
static APBC_CLK(ssp5, PXA168_SSP5, 4, 0);

static APBC_CLK(keypad, PXA168_KPC, 0, 32000);



static APMU_CLK(nand, NAND, 0x01db, 208000000);

static APMU_CLK(nand, NAND, 0x19b, 156000000);

static APMU_CLK(lcd, LCD, 0x7f, 312000000);



/* device and clock bindings */

arch/arm/mach-mmp/pxa910.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000); 
static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);

static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);



static APMU_CLK(nand, NAND, 0x01db, 208000000);

static APMU_CLK(nand, NAND, 0x19b, 156000000);

static APMU_CLK(u2o, USB, 0x1b, 480000000);



/* device and clock bindings */

arch/arm/mach-pxa/mfp-pxa2xx.c

+2 −2
Original line number Diff line number Diff line
@@ -347,9 +347,9 @@ static int pxa2xx_mfp_suspend(void) 
		if ((gpio_desc[i].config & MFP_LPM_KEEP_OUTPUT) &&

		    (GPDR(i) & GPIO_bit(i))) {

			if (GPLR(i) & GPIO_bit(i))

				PGSR(i) |= GPIO_bit(i);

				PGSR(gpio_to_bank(i)) |= GPIO_bit(i);

			else

				PGSR(i) &= ~GPIO_bit(i);

				PGSR(gpio_to_bank(i)) &= ~GPIO_bit(i);

		}

	}

arch/arm/mach-pxa/raumfeld.c

+19 −17
Original line number Diff line number Diff line
@@ -573,10 +573,10 @@ static struct pxafb_mode_info sharp_lq043t3dx02_mode = { 
	.xres		= 480,

	.yres		= 272,

	.bpp		= 16,

	.hsync_len	= 4,

	.hsync_len	= 41,

	.left_margin	= 2,

	.right_margin	= 1,

	.vsync_len	= 1,

	.vsync_len	= 10,

	.upper_margin	= 3,

	.lower_margin	= 1,

	.sync		= 0,
@@ -596,29 +596,31 @@ static void __init raumfeld_lcd_init(void) 
{

	int ret;



	pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info);



	/* Earlier devices had the backlight regulator controlled

	 * via PWM, later versions use another controller for that */

	if ((system_rev & 0xff) < 2) {

		mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT;

		pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1);

		platform_device_register(&raumfeld_pwm_backlight_device);

	} else

		platform_device_register(&raumfeld_lt3593_device);



	ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable");

	if (ret < 0)

		pr_warning("Unable to request GPIO_TFT_VA_EN\n");

	else

		gpio_direction_output(GPIO_TFT_VA_EN, 1);



	msleep(100);



	ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable");

	if (ret < 0)

		pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n");

	else

		gpio_direction_output(GPIO_DISPLAY_ENABLE, 1);



	/* Hardware revision 2 has the backlight regulator controlled

	 * by an LT3593, earlier and later devices use PWM for that. */

	if ((system_rev & 0xff) == 2) {

		platform_device_register(&raumfeld_lt3593_device);

	} else {

		mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT;

		pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1);

		platform_device_register(&raumfeld_pwm_backlight_device);

	}



	pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info);

	platform_device_register(&pxa3xx_device_gcu);

}
@@ -657,7 +659,7 @@ static struct lis3lv02d_platform_data lis3_pdata = { 


#define SPI_AK4104	\

{			\

	.modalias	= "ak4104",	\

	.modalias	= "ak4104-codec",	\

	.max_speed_hz	= 10000,		\

	.bus_num	= 0,			\

	.chip_select	= 0,			\