Commit c44efbaa 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: (32 commits)
  ARM: mmp: Change the way we use timer 0 as clockevent timer.
  ARM: mmp: Switch to using timer 1 as clocksource timer.
  ARM: mmp: Also start timer 1 on boot.
  ARM: pxa168/gplugd: free correct GPIO
  ARM: pxa168/gplugd: get rid of mfp-gplugd.h
  ARM: pxa: fix logic error in PJ4 iWMMXt handling
  mach-sa1100: fix PCI build problem
  omap: timer: Set dmtimer used as clocksource in autoreload mode
  OMAP3: am3517crane: remove NULL board_mux from board file
  arm: mach-omap2: mux: use kstrdup()
  arch:arm:plat-omap:iovmm: remove unused variable 'va'
  Update Nook Color machine 3284 to common Encore name
  am3505/3517: Various platform defines for UART4
  OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds
  OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
  iMX: Fix build for iMX53
  ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage
  OMAP2+: PM: SmartReflex: use put_sync_suspend for IRQ-safe disabling
  OMAP3: beagle: don't touch omap_device internals
  OMAP1: enable GENERIC_IRQ_CHIP
  ...
parents ce8a84ef 696314cf

arch/arm/kernel/iwmmxt.S

+3 −3
Original line number Original line Diff line number Diff line
@@ -195,10 +195,10 @@ ENTRY(iwmmxt_task_disable) 




	@ enable access to CP0 and CP1

	@ enable access to CP0 and CP1

	XSC(mrc	p15, 0, r4, c15, c1, 0)

	XSC(mrc	p15, 0, r4, c15, c1, 0)

	XSC(orr	r4, r4, #0xf)

	XSC(orr	r4, r4, #0x3)

	XSC(mcr	p15, 0, r4, c15, c1, 0)

	XSC(mcr	p15, 0, r4, c15, c1, 0)

	PJ4(mrc p15, 0, r4, c1, c0, 2)

	PJ4(mrc p15, 0, r4, c1, c0, 2)

	PJ4(orr	r4, r4, #0x3)

	PJ4(orr	r4, r4, #0xf)

	PJ4(mcr	p15, 0, r4, c1, c0, 2)

	PJ4(mcr	p15, 0, r4, c1, c0, 2)





	mov	r0, #0				@ nothing to load

	mov	r0, #0				@ nothing to load
@@ -313,7 +313,7 @@ ENTRY(iwmmxt_task_switch) 
	teq	r2, r3				@ next task owns it?

	teq	r2, r3				@ next task owns it?

	movne	pc, lr				@ no: leave Concan disabled

	movne	pc, lr				@ no: leave Concan disabled





1:	@ flip Conan access

1:	@ flip Concan access

	XSC(eor	r1, r1, #0x3)

	XSC(eor	r1, r1, #0x3)

	XSC(mcr	p15, 0, r1, c15, c1, 0)

	XSC(mcr	p15, 0, r1, c15, c1, 0)

	PJ4(eor r1, r1, #0xf)

	PJ4(eor r1, r1, #0xf)

arch/arm/mach-imx/clock-imx25.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -331,6 +331,9 @@ int __init mx25_clocks_init(void) 
	__raw_writel(__raw_readl(CRM_BASE+0x64) | (1 << 7) | (1 << 0),

	__raw_writel(__raw_readl(CRM_BASE+0x64) | (1 << 7) | (1 << 0),

			CRM_BASE + 0x64);

			CRM_BASE + 0x64);





	/* Clock source for gpt is ahb_div */

	__raw_writel(__raw_readl(CRM_BASE+0x64) & ~(1 << 5), CRM_BASE + 0x64);



	mxc_timer_init(&gpt_clk, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54);

	mxc_timer_init(&gpt_clk, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54);





	return 0;

	return 0;

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

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

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <sound/tlv320aic32x4.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>
@@ -196,6 +197,17 @@ static struct pca953x_platform_data visstrim_m10_pca9555_pdata = { 
	.invert = 0,

	.invert = 0,

};

};





static struct aic32x4_pdata visstrim_m10_aic32x4_pdata = {

	.power_cfg = AIC32X4_PWR_MICBIAS_2075_LDOIN |

		     AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE |

		     AIC32X4_PWR_AIC32X4_LDO_ENABLE |

		     AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36 |

		     AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED,

	.micpga_routing = AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K |

			 AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K,

	.swapdacs = false,

};



static struct i2c_board_info visstrim_m10_i2c_devices[] = {

static struct i2c_board_info visstrim_m10_i2c_devices[] = {

	{

	{

		I2C_BOARD_INFO("pca9555", 0x20),

		I2C_BOARD_INFO("pca9555", 0x20),
@@ -203,6 +215,7 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = { 
	},

	},

	{

	{

		I2C_BOARD_INFO("tlv320aic32x4", 0x18),

		I2C_BOARD_INFO("tlv320aic32x4", 0x18),

		.platform_data = &visstrim_m10_aic32x4_pdata,

	}

	}

};

};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -468,7 +468,7 @@ static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = { 
#endif

#endif

};

};





static void mxc_init_i2c(void)

static void __init mxc_init_i2c(void)

{

{

	i2c_register_board_info(1, mx31ads_i2c1_devices,

	i2c_register_board_info(1, mx31ads_i2c1_devices,

				ARRAY_SIZE(mx31ads_i2c1_devices));

				ARRAY_SIZE(mx31ads_i2c1_devices));
@@ -486,7 +486,7 @@ static unsigned int ssi_pins[] = { 
	MX31_PIN_STXD5__STXD5,

	MX31_PIN_STXD5__STXD5,

};

};





static void mxc_init_audio(void)

static void __init mxc_init_audio(void)

{

{

	imx31_add_imx_ssi(0, NULL);

	imx31_add_imx_ssi(0, NULL);

	mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");

	mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = { 
	.portsc	= MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,

	.portsc	= MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,

};

};





static void lilly1131_usb_init(void)

static void __init lilly1131_usb_init(void)

{

{

	imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	imx31_add_mxc_ehci_hs(1, &usbh1_pdata);