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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6205/1: perf: ensure counter delta is treated as unsigned
  ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220
  ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220
  ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU
  ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore
  ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section
  ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section
  ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround
  ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP
  ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds
  ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI
  [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA
  [ARM] pxa/mioa701: fix camera regression
  [ARM] pxa/z2: fix flash layout to final version
  [ARM] pxa/z2: fix missing include in battery driver
  [ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h
parents 3f7d7b4b 446a5a8b

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -955,7 +955,8 @@ config XSCALE_PMU 
	default y



config CPU_HAS_PMU

	depends on CPU_V6 || CPU_V7 || XSCALE_PMU

	depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \

		   (!ARCH_OMAP3 || OMAP3_EMU)

	default y

	bool

arch/arm/include/asm/mach/udc_pxa2xx.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info { 
	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	u16	gpio_vbus;			/* high == vbus present */

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	u16	gpio_pullup;			/* high == pullup activated */

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/include/asm/processor.h

+4 −0
Original line number Diff line number Diff line
@@ -91,7 +91,11 @@ extern void release_thread(struct task_struct *); 


unsigned long get_wchan(struct task_struct *p);



#if __LINUX_ARM_ARCH__ == 6

#define cpu_relax()			smp_mb()

#else

#define cpu_relax()			barrier()

#endif



/*

 * Create a new kernel thread

arch/arm/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ armpmu_event_update(struct perf_event *event, 
{

	int shift = 64 - 32;

	s64 prev_raw_count, new_raw_count;

	s64 delta;

	u64 delta;



again:

	prev_raw_count = atomic64_read(&hwc->prev_count);

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

+22 −11
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ static struct platform_device physmap_flash_device = { 


/* USB */



#if defined(CONFIG_USB_ULPI)



#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \

			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
@@ -244,10 +246,20 @@ static struct mxc_usbh_platform_data usbh2_pdata = { 
	.flags	= MXC_EHCI_POWER_PINS_ENABLED,

};



static struct platform_device *devices[] __initdata = {

	&smsc91x_device,

	&physmap_flash_device,

};

static void lilly1131_usb_init(void)

{

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

}



#else

static inline void lilly1131_usb_init(void) {}

#endif /* CONFIG_USB_ULPI */



/* SPI */
@@ -279,6 +291,11 @@ static struct spi_board_info mc13783_dev __initdata = { 
	.platform_data	= &mc13783_pdata,

};



static struct platform_device *devices[] __initdata = {

	&smsc91x_device,

	&physmap_flash_device,

};



static int mx31lilly_baseboard;

core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);
@@ -321,13 +338,7 @@ static void __init mx31lilly_board_init(void) 
	platform_add_devices(devices, ARRAY_SIZE(devices));



	/* USB */

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

	lilly1131_usb_init();

}



static void __init mx31lilly_timer_init(void)