Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into fixes (099b4d3b) · Commits · e / devices / android_kernel_xiaomi_markw

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 0
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Sneaky Weasel

		# DOCUMENTATION

arch/arm/mach-davinci/devices-da8xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ static struct platform_device da850_mcasp_device = {
		.resource = da850_mcasp_resources,
		};

		struct platform_device davinci_pcm_device = {
		static struct platform_device davinci_pcm_device = {
		.name = "davinci-pcm-audio",
		.id = -1,
		};

arch/arm/mach-davinci/devices.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ static void davinci_init_wdt(void)

		/-------------------------------------------------------------------------/

		struct platform_device davinci_pcm_device = {
		static struct platform_device davinci_pcm_device = {
		.name = "davinci-pcm-audio",
		.id = -1,
		};

arch/arm/mach-davinci/gpio.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -252,9 +252,11 @@ static struct irq_chip gpio_irqchip = {
		static void
		gpio_irq_handler(unsigned irq, struct irq_desc *desc)
		{
		struct davinci_gpio_regs __iomem *g = irq2regs(irq);
		struct davinci_gpio_regs __iomem *g;
		u32 mask = 0xffff;

		g = (__force struct davinci_gpio_regs __iomem *) irq_desc_get_handler_data(desc);

		/* we only care about one bank */
		if (irq & 1)
		mask <<= 16;
		@@ -422,8 +424,7 @@ static int __init davinci_gpio_irq_setup(void)

		/* set up all irqs in this bank */
		irq_set_chained_handler(bank_irq, gpio_irq_handler);
		irq_set_chip_data(bank_irq, (__force void *)g);
		irq_set_handler_data(bank_irq, (void *)irq);
		irq_set_handler_data(bank_irq, (__force void *)g);

		for (i = 0; i < 16 && gpio < ngpio; i++, irq++, gpio++) {
		irq_set_chip(irq, &gpio_irqchip);

arch/arm/mach-shmobile/board-ap4evb.c

+56 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,29 @@ static int slot_cn7_get_cd(struct platform_device *pdev)
		{
		return !gpio_get_value(GPIO_PORT41);
		}
		/* MERAM */
		static struct sh_mobile_meram_info meram_info = {
		.addr_mode = SH_MOBILE_MERAM_MODE1,
		};

		static struct resource meram_resources[] = {
		[0] = {
		.name = "MERAM",
		.start = 0xe8000000,
		.end = 0xe81fffff,
		.flags = IORESOURCE_MEM,
		},
		};

		static struct platform_device meram_device = {
		.name = "sh_mobile_meram",
		.id = 0,
		.num_resources = ARRAY_SIZE(meram_resources),
		.resource = meram_resources,
		.dev = {
		.platform_data = &meram_info,
		},
		};

		/* SH_MMCIF */
		static struct resource sh_mmcif_resources[] = {
		@@ -447,13 +470,29 @@ const static struct fb_videomode ap4evb_lcdc_modes[] = {
		#endif
		},
		};
		static struct sh_mobile_meram_cfg lcd_meram_cfg = {
		.icb[0] = {
		.marker_icb = 28,
		.cache_icb = 24,
		.meram_offset = 0x0,
		.meram_size = 0x40,
		},
		.icb[1] = {
		.marker_icb = 29,
		.cache_icb = 25,
		.meram_offset = 0x40,
		.meram_size = 0x40,
		},
		};

		static struct sh_mobile_lcdc_info lcdc_info = {
		.meram_dev = &meram_info,
		.ch[0] = {
		.chan = LCDC_CHAN_MAINLCD,
		.bpp = 16,
		.lcd_cfg = ap4evb_lcdc_modes,
		.num_cfg = ARRAY_SIZE(ap4evb_lcdc_modes),
		.meram_cfg = &lcd_meram_cfg,
		}
		};

		@@ -724,15 +763,31 @@ static struct platform_device fsi_device = {
		static struct platform_device fsi_ak4643_device = {
		.name = "sh_fsi2_a_ak4643",
		};
		static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
		.icb[0] = {
		.marker_icb = 30,
		.cache_icb = 26,
		.meram_offset = 0x80,
		.meram_size = 0x100,
		},
		.icb[1] = {
		.marker_icb = 31,
		.cache_icb = 27,
		.meram_offset = 0x180,
		.meram_size = 0x100,
		},
		};

		static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {
		.clock_source = LCDC_CLK_EXTERNAL,
		.meram_dev = &meram_info,
		.ch[0] = {
		.chan = LCDC_CHAN_MAINLCD,
		.bpp = 16,
		.interface_type = RGB24,
		.clock_divider = 1,
		.flags = LCDC_FLAGS_DWPOL,
		.meram_cfg = &hdmi_meram_cfg,
		}
		};

		@@ -961,6 +1016,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
		&csi2_device,
		&ceu_device,
		&ap4evb_camera,
		&meram_device,
		};

		static void __init hdmi_init_pm_clock(void)