Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5889fc32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM: SoC fixes from Olof Johansson:
 "I was hoping to be done with fixes for 3.4 but we got two branches
  from subarch maintainers the last couple of days.  So here is one
  last(?) pull request for arm-soc containing 7 patches:

   - Five of them are for shmobile dealing with SMP setup and compile
     failures
   - The remaining two are for regressions on the Samsung platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
  ARM: EXYNOS: use s5p-timer for UniversalC210 board
  ARM / mach-shmobile: Invalidate caches when booting secondary cores
  ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
  ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
  ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
  ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
parents 1bc4a5be 85d5c4a3

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -232,6 +232,9 @@ config MACH_ARMLEX4210 
config MACH_UNIVERSAL_C210

config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select S5P_HRT

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK

	select S5P_GPIO_INT

	select S5P_GPIO_INT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC1

arch/arm/mach-exynos/clock-exynos5.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -678,7 +678,7 @@ static struct clk exynos5_clk_pdma1 = { 
	.name		= "dma",

	.name		= "dma",

	.devname	= "dma-pl330.1",

	.devname	= "dma-pl330.1",

	.enable		= exynos5_clk_ip_fsys_ctrl,

	.enable		= exynos5_clk_ip_fsys_ctrl,

	.ctrlbit	= (1 << 1),

	.ctrlbit	= (1 << 2),

};

};





static struct clk exynos5_clk_mdma1 = {

static struct clk exynos5_clk_mdma1 = {

arch/arm/mach-exynos/mach-universal_c210.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <plat/pd.h>

#include <plat/pd.h>

#include <plat/regs-fb-v4.h>

#include <plat/regs-fb-v4.h>

#include <plat/fimc-core.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/camport.h>

#include <plat/camport.h>

#include <plat/mipi_csis.h>

#include <plat/mipi_csis.h>
@@ -1063,6 +1064,7 @@ static void __init universal_map_io(void) 
	exynos_init_io(NULL, 0);

	exynos_init_io(NULL, 0);

	s3c24xx_init_clocks(24000000);

	s3c24xx_init_clocks(24000000);

	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));

	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));

	s5p_set_timer_source(S5P_PWM2, S5P_PWM4);

}

}





static void s5p_tv_setup(void)

static void s5p_tv_setup(void)
@@ -1113,7 +1115,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") 
	.map_io		= universal_map_io,

	.map_io		= universal_map_io,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= universal_machine_init,

	.init_machine	= universal_machine_init,

	.timer		= &exynos4_timer,

	.timer		= &s5p_timer,

	.reserve        = &universal_reserve,

	.reserve        = &universal_reserve,

	.restart	= exynos4_restart,

	.restart	= exynos4_restart,

MACHINE_END
 
MACHINE_END

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

+2 −20
Original line number Original line Diff line number Diff line
@@ -365,23 +365,13 @@ static struct platform_device mipidsi0_device = { 
};

};





/* SDHI0 */

/* SDHI0 */

static irqreturn_t ag5evm_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 = {

static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

	.cd_gpio	= GPIO_PORT251,

};

};





static struct resource sdhi0_resources[] = {

static struct resource sdhi0_resources[] = {
@@ -557,7 +547,6 @@ static void __init ag5evm_init(void) 
	lcd_backlight_reset();

	lcd_backlight_reset();





	/* enable SDHI0 on CN15 [SD I/F] */

	/* enable SDHI0 on CN15 [SD I/F] */

	gpio_request(GPIO_FN_SDHICD0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);
@@ -566,13 +555,6 @@ static void __init ag5evm_init(void) 
	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);





	if (!request_irq(intcs_evt2irq(0x3c0), ag5evm_sdhi0_gpio_cd,

			 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

			 "sdhi0 cd", &sdhi0_device.dev))

		sdhi0_info.tmio_flags |= TMIO_MMC_HAS_COLD_CD;

	else

		pr_warn("Unable to setup SDHI0 GPIO IRQ\n");



	/* enable SDHI1 on CN4 [WLAN I/F] */

	/* enable SDHI1 on CN4 [WLAN I/F] */

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHICMD1_PU, NULL);

	gpio_request(GPIO_FN_SDHICMD1_PU, NULL);

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

+2 −20
Original line number Original line Diff line number Diff line
@@ -1011,21 +1011,12 @@ static int slot_cn7_get_cd(struct platform_device *pdev) 
}

}





/* SDHI0 */

/* 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 = {

static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.cd_gpio	= GPIO_PORT172,

};

};





static struct resource sdhi0_resources[] = {

static struct resource sdhi0_resources[] = {
@@ -1384,7 +1375,6 @@ static void __init mackerel_init(void) 
{

{

	u32 srcr4;

	u32 srcr4;

	struct clk *clk;

	struct clk *clk;

	int ret;





	/* External clock source */

	/* External clock source */

	clk_set_rate(&sh7372_dv_clki_clk, 27000000);

	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
@@ -1481,7 +1471,6 @@ static void __init mackerel_init(void) 
	irq_set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH);

	irq_set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH);





	/* enable SDHI0 */

	/* enable SDHI0 */

	gpio_request(GPIO_FN_SDHICD0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);
@@ -1490,13 +1479,6 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, 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)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

	/* enable SDHI1 */

	/* enable SDHI1 */

	gpio_request(GPIO_FN_SDHICMD1, NULL);

	gpio_request(GPIO_FN_SDHICMD1, NULL);