Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes (143ed290) · Commits · e / devices / android_kernel_sony_msm8994

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

+3 −0

Original line number	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),
		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);

		return 0;

+13 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <linux/input.h>
		#include <linux/gpio.h>
		#include <linux/delay.h>
		#include <sound/tlv320aic32x4.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/time.h>
		@@ -196,6 +197,17 @@ static struct pca953x_platform_data visstrim_m10_pca9555_pdata = {
		.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[] = {
		{
		I2C_BOARD_INFO("pca9555", 0x20),
		@@ -203,6 +215,7 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = {
		},
		{
		I2C_BOARD_INFO("tlv320aic32x4", 0x18),
		.platform_data = &visstrim_m10_aic32x4_pdata,
		}
		};

+2 −2

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

		static void mxc_init_i2c(void)
		static void __init mxc_init_i2c(void)
		{
		i2c_register_board_info(1, mx31ads_i2c1_devices,
		ARRAY_SIZE(mx31ads_i2c1_devices));
		@@ -486,7 +486,7 @@ static unsigned int ssi_pins[] = {
		MX31_PIN_STXD5__STXD5,
		};

		static void mxc_init_audio(void)
		static void __init mxc_init_audio(void)
		{
		imx31_add_imx_ssi(0, NULL);
		mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");

+1 −1

Original line number	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,
		};

		static void lilly1131_usb_init(void)
		static void __init lilly1131_usb_init(void)
		{
		imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
		.flags = UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST \| UPF_IOREMAP,
		}, {
		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000),
		.irq = irq_to_gpio(CPUIMX51_QUARTD_GPIO),
		.irq = gpio_to_irq(CPUIMX51_QUARTD_GPIO),
		.irqflags = IRQF_TRIGGER_HIGH,
		.uartclk = CPUIMX51_QUART_XTAL,
		.regshift = CPUIMX51_QUART_REGSHIFT,