Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux (f621c533) · Commits · e / devices / android_kernel_fairphone_FP5

MAINTAINERS

+2 −5

Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ S: Orphan
		F: drivers/platform/x86/wmi.c

		AD1889 ALSA SOUND DRIVER
		M: Kyle McMartin <kyle@mcmartin.ca>
		M: Thibaut Varene <T-Bone@parisc-linux.org>
		W: http://wiki.parisc-linux.org/AD1889
		L: linux-parisc@vger.kernel.org
		@@ -3047,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_*
		F: include/linux/hwspinlock.h

		HARMONY SOUND DRIVER
		M: Kyle McMartin <kyle@mcmartin.ca>
		L: linux-parisc@vger.kernel.org
		S: Maintained
		F: sound/parisc/harmony.*
		@@ -3782,7 +3780,7 @@ F: Documentation/kdump/

		KERNEL AUTOMOUNTER v4 (AUTOFS4)
		M: Ian Kent <raven@themaw.net>
		L: autofs@linux.kernel.org
		L: autofs@vger.kernel.org
		S: Maintained
		F: fs/autofs4/

		@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt
		F: drivers/block/paride/

		PARISC ARCHITECTURE
		M: Kyle McMartin <kyle@mcmartin.ca>
		M: Helge Deller <deller@gmx.de>
		M: "James E.J. Bottomley" <jejb@parisc-linux.org>
		M: Helge Deller <deller@gmx.de>
		L: linux-parisc@vger.kernel.org
		W: http://www.parisc-linux.org/
		Q: http://patchwork.kernel.org/project/linux-parisc/list/

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 3
		SUBLEVEL = 0
		EXTRAVERSION = -rc4
		EXTRAVERSION = -rc5
		NAME = Saber-toothed Squirrel

		# DOCUMENTATION

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

+15 −14

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <linux/serial_sci.h>
		#include <linux/smsc911x.h>
		#include <linux/gpio.h>
		#include <linux/videodev2.h>
		#include <linux/input.h>
		#include <linux/input/sh_keysc.h>
		#include <linux/mmc/host.h>
		@@ -37,7 +38,6 @@
		#include <linux/mmc/sh_mobile_sdhi.h>
		#include <linux/mfd/tmio.h>
		#include <linux/sh_clk.h>
		#include <linux/dma-mapping.h>
		#include <video/sh_mobile_lcdc.h>
		#include <video/sh_mipi_dsi.h>
		#include <sound/sh_fsi.h>
		@@ -159,19 +159,12 @@ static struct resource sh_mmcif_resources[] = {
		},
		};

		static struct sh_mmcif_dma sh_mmcif_dma = {
		.chan_priv_rx = {
		.slave_id = SHDMA_SLAVE_MMCIF_RX,
		},
		.chan_priv_tx = {
		.slave_id = SHDMA_SLAVE_MMCIF_TX,
		},
		};
		static struct sh_mmcif_plat_data sh_mmcif_platdata = {
		.sup_pclk = 0,
		.ocr = MMC_VDD_165_195,
		.caps = MMC_CAP_8_BIT_DATA \| MMC_CAP_NONREMOVABLE,
		.dma = &sh_mmcif_dma,
		.slave_id_tx = SHDMA_SLAVE_MMCIF_TX,
		.slave_id_rx = SHDMA_SLAVE_MMCIF_RX,
		};

		static struct platform_device mmc_device = {
		@@ -321,12 +314,11 @@ static struct resource mipidsi0_resources[] = {
		},
		};

		#define DSI0PHYCR 0xe615006c
		static int sh_mipi_set_dot_clock(struct platform_device *pdev,
		void __iomem *base,
		int enable)
		{
		struct clk *pck;
		struct clk pck, phy;
		int ret;

		pck = clk_get(&pdev->dev, "dsip_clk");
		@@ -335,18 +327,27 @@ static int sh_mipi_set_dot_clock(struct platform_device *pdev,
		goto sh_mipi_set_dot_clock_pck_err;
		}

		phy = clk_get(&pdev->dev, "dsiphy_clk");
		if (IS_ERR(phy)) {
		ret = PTR_ERR(phy);
		goto sh_mipi_set_dot_clock_phy_err;
		}

		if (enable) {
		clk_set_rate(pck, clk_round_rate(pck, 24000000));
		__raw_writel(0x2a809010, DSI0PHYCR);
		clk_set_rate(phy, clk_round_rate(pck, 510000000));
		clk_enable(pck);
		clk_enable(phy);
		} else {
		clk_disable(pck);
		clk_disable(phy);
		}

		ret = 0;

		clk_put(phy);
		sh_mipi_set_dot_clock_phy_err:
		clk_put(pck);

		sh_mipi_set_dot_clock_pck_err:
		return ret;
		}

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -295,15 +295,6 @@ static struct resource sh_mmcif_resources[] = {
		},
		};

		static struct sh_mmcif_dma sh_mmcif_dma = {
		.chan_priv_rx = {
		.slave_id = SHDMA_SLAVE_MMCIF_RX,
		},
		.chan_priv_tx = {
		.slave_id = SHDMA_SLAVE_MMCIF_TX,
		},
		};

		static struct sh_mmcif_plat_data sh_mmcif_plat = {
		.sup_pclk = 0,
		.ocr = MMC_VDD_165_195 \| MMC_VDD_32_33 \| MMC_VDD_33_34,
		@@ -311,7 +302,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
		MMC_CAP_8_BIT_DATA \|
		MMC_CAP_NEEDS_POLL,
		.get_cd = slot_cn7_get_cd,
		.dma = &sh_mmcif_dma,
		.slave_id_tx = SHDMA_SLAVE_MMCIF_TX,
		.slave_id_rx = SHDMA_SLAVE_MMCIF_RX,
		};

		static struct platform_device sh_mmcif_device = {

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -143,11 +143,10 @@ static struct gpio_keys_button gpio_buttons[] = {
		static struct gpio_keys_platform_data gpio_key_info = {
		.buttons = gpio_buttons,
		.nbuttons = ARRAY_SIZE(gpio_buttons),
		.poll_interval = 250, /* polled for now */
		};

		static struct platform_device gpio_keys_device = {
		.name = "gpio-keys-polled", /* polled for now */
		.name = "gpio-keys",
		.id = -1,
		.dev = {
		.platform_data = &gpio_key_info,