Merge remote-tracking branch 'origin' into spi/merge (b6336ca2) · Commits · e / devices / android_kernel_fairphone_FP5

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-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)

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

+78 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		#include <linux/mtd/mtd.h>
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/physmap.h>
		#include <linux/pm_runtime.h>
		#include <linux/smsc911x.h>
		#include <linux/sh_intc.h>
		#include <linux/tca6416_keypad.h>
		@@ -314,6 +315,30 @@ static struct platform_device smc911x_device = {
		},
		};

		/* MERAM */
		static struct sh_mobile_meram_info mackerel_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 = &mackerel_meram_info,
		},
		};

		/* LCDC */
		static struct fb_videomode mackerel_lcdc_modes[] = {
		{
		@@ -342,7 +367,23 @@ static int mackerel_get_brightness(void *board_data)
		return gpio_get_value(GPIO_PORT31);
		}

		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 = &mackerel_meram_info,
		.clock_source = LCDC_CLK_BUS,
		.ch[0] = {
		.chan = LCDC_CHAN_MAINLCD,
		@@ -362,6 +403,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
		.name = "sh_mobile_lcdc_bl",
		.max_brightness = 1,
		},
		.meram_cfg = &lcd_meram_cfg,
		}
		};

		@@ -388,8 +430,23 @@ static struct platform_device lcdc_device = {
		},
		};

		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,
		},
		};
		/* HDMI */
		static struct sh_mobile_lcdc_info hdmi_lcdc_info = {
		.meram_dev = &mackerel_meram_info,
		.clock_source = LCDC_CLK_EXTERNAL,
		.ch[0] = {
		.chan = LCDC_CHAN_MAINLCD,
		@@ -397,6 +454,7 @@ static struct sh_mobile_lcdc_info hdmi_lcdc_info = {
		.interface_type = RGB24,
		.clock_divider = 1,
		.flags = LCDC_FLAGS_DWPOL,
		.meram_cfg = &hdmi_meram_cfg,
		}
		};

		@@ -856,6 +914,17 @@ static int slot_cn7_get_cd(struct platform_device *pdev)
		}

		/* SDHI0 */
		static irqreturn_t mackerel_sdhi0_gpio_cd(int irq, void *arg)
		{
		struct device *dev = arg;
		struct sh_mobile_sdhi_info *info = dev->platform_data;
		struct tmio_mmc_data *pdata = info->pdata;

		tmio_mmc_cd_wakeup(pdata);

		return IRQ_HANDLED;
		}

		static struct sh_mobile_sdhi_info sdhi0_info = {
		.dma_slave_tx = SHDMA_SLAVE_SDHI0_TX,
		.dma_slave_rx = SHDMA_SLAVE_SDHI0_RX,
		@@ -1150,6 +1219,7 @@ static struct platform_device *mackerel_devices[] __initdata = {
		&mackerel_camera,
		&hdmi_lcdc_device,
		&hdmi_device,
		&meram_device,
		};

		/* Keypad Initialization */
		@@ -1238,6 +1308,7 @@ static void __init mackerel_init(void)
		{
		u32 srcr4;
		struct clk *clk;
		int ret;

		sh7372_pinmux_init();

		@@ -1343,6 +1414,13 @@ static void __init mackerel_init(void)
		gpio_request(GPIO_FN_SDHID0_1, NULL);
		gpio_request(GPIO_FN_SDHID0_0, NULL);

		ret = request_irq(evt2irq(0x3340), mackerel_sdhi0_gpio_cd,
		IRQF_TRIGGER_FALLING, "sdhi0 cd", &sdhi0_device.dev);
		if (!ret)
		sdhi0_info.tmio_flags \|= TMIO_MMC_HAS_COLD_CD;
		else
		pr_err("Cannot get IRQ #%d: %d\n", evt2irq(0x3340), ret);

		#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
		/* enable SDHI1 */
		gpio_request(GPIO_FN_SDHICMD1, NULL);

arch/arm/mach-shmobile/clock-sh7372.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,7 @@ enum { MSTP001,
		MSTP118, MSTP117, MSTP116, MSTP113,
		MSTP106, MSTP101, MSTP100,
		MSTP223,
		MSTP218, MSTP217, MSTP216,
		MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
		MSTP329, MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312,
		MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403,
		@@ -534,6 +535,9 @@ static struct clk mstp_clks[MSTP_NR] = {
		[MSTP101] = MSTP(&div4_clks[DIV4_M1], SMSTPCR1, 1, 0), /* VPU */
		[MSTP100] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */
		[MSTP223] = MSTP(&div6_clks[DIV6_SPU], SMSTPCR2, 23, 0), /* SPU2 */
		[MSTP218] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* DMAC1 */
		[MSTP217] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 17, 0), /* DMAC2 */
		[MSTP216] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 16, 0), /* DMAC3 */
		[MSTP207] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 7, 0), /* SCIFA5 */
		[MSTP206] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 6, 0), /* SCIFB */
		[MSTP204] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 4, 0), /* SCIFA0 */
		@@ -626,6 +630,9 @@ static struct clk_lookup lookups[] = {
		CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
		CLKDEV_DEV_ID("uio_pdrv_genirq.6", &mstp_clks[MSTP223]), /* SPU2DSP0 */
		CLKDEV_DEV_ID("uio_pdrv_genirq.7", &mstp_clks[MSTP223]), /* SPU2DSP1 */
		CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* DMAC1 */
		CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* DMAC2 */
		CLKDEV_DEV_ID("sh-dma-engine.2", &mstp_clks[MSTP216]), /* DMAC3 */
		CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
		CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP206]), /* SCIFB */
		CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */

arch/arm/mach-tegra/board-harmony-power.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@

		#include <mach/irqs.h>

		#include "board-harmony.h"

		#define PMC_CTRL 0x0
		#define PMC_CTRL_INTR_LOW (1 << 17)

		@@ -98,7 +100,7 @@ static struct tps6586x_platform_data tps_platform = {
		.irq_base = TEGRA_NR_IRQS,
		.num_subdevs = ARRAY_SIZE(tps_devs),
		.subdevs = tps_devs,
		.gpio_base = TEGRA_NR_GPIOS,
		.gpio_base = HARMONY_GPIO_TPS6586X(0),
		};

		static struct i2c_board_info __initdata harmony_regulators[] = {