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

Commit 380dc200 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rmobile-fixes-for-linus' of... 

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support
  ARM: mach-shmobile: sh7372 MSIOF clock support
  ARM: mach-shmobile: clock-sh7372: fixup USB-DMAC1 settings
  ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter
  ARM: mach-shmobile: Remove 3DG/SGX from sh7372 INTCS
  ARM: mach-shmobile: mackerel: Add USB-DMA ID
  mmc: sdhi, mmcif: zboot: Correct clock disable logic
  ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle
  ARM: static should be at beginning of declaration
  ARM: mach-shmobile: Use CMT2 for timer on sh7372
  ARM: mach-shmobile: sh7372: Add USB-DMAC support
parents c42a2634 a408baea

arch/arm/boot/compressed/mmcif-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ asmlinkage void mmc_loader(unsigned char *buf, unsigned long len) 




	/* Disable clock to MMC hardware block */

	__raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3);

	__raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3);



	mmc_update_progress(MMC_PROGRESS_DONE);

}

arch/arm/boot/compressed/sdhi-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ asmlinkage void mmc_loader(unsigned short *buf, unsigned long len) 
		goto err;



        /* Disable clock to SDHI1 hardware block */

        __raw_writel(__raw_readl(SMSTPCR3) & (1 << 13), SMSTPCR3);

        __raw_writel(__raw_readl(SMSTPCR3) | (1 << 13), SMSTPCR3);



	mmc_update_progress(MMC_PROGRESS_DONE);

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

+2 −1
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static struct platform_device mipidsi0_device = { 
static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

};
@@ -382,7 +383,7 @@ void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) 
}



static struct sh_mobile_sdhi_info sh_sdhi1_info = {

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_caps	= MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,

	.tmio_ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,

	.set_pwr	= ag5evm_sdhi1_set_pwr,

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

+4 −0
Original line number Diff line number Diff line
@@ -641,6 +641,8 @@ static struct usbhs_private usbhs0_private = { 
		},

		.driver_param = {

			.buswait_bwait	= 4,

			.d0_tx_id	= SHDMA_SLAVE_USB0_TX,

			.d1_rx_id	= SHDMA_SLAVE_USB0_RX,

		},

	},

};
@@ -810,6 +812,8 @@ static struct usbhs_private usbhs1_private = { 
			.buswait_bwait	= 4,

			.pipe_type	= usbhs1_pipe_cfg,

			.pipe_size	= ARRAY_SIZE(usbhs1_pipe_cfg),

			.d0_tx_id	= SHDMA_SLAVE_USB1_TX,

			.d1_rx_id	= SHDMA_SLAVE_USB1_RX,

		},

	},

};

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

+22 −7
Original line number Diff line number Diff line
@@ -503,16 +503,17 @@ static struct clk *late_main_clks[] = { 
	&sh7372_fsidivb_clk,

};



enum { MSTP001,

enum { MSTP001, MSTP000,

       MSTP131, MSTP130,

       MSTP129, MSTP128, MSTP127, MSTP126, MSTP125,

       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,

       MSTP218, MSTP217, MSTP216, MSTP214, MSTP208, MSTP207,

       MSTP206, MSTP205, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,

       MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312,

       MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP407, MSTP406,

       MSTP405, MSTP404, MSTP403, MSTP400,

       MSTP_NR };



#define MSTP(_parent, _reg, _bit, _flags) \
@@ -520,6 +521,7 @@ enum { MSTP001, 


static struct clk mstp_clks[MSTP_NR] = {

	[MSTP001] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR0, 1, 0), /* IIC2 */

	[MSTP000] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR0, 0, 0), /* MSIOF0 */

	[MSTP131] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 31, 0), /* VEU3 */

	[MSTP130] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 30, 0), /* VEU2 */

	[MSTP129] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 29, 0), /* VEU1 */
@@ -538,14 +540,16 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[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 */

	[MSTP214] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 14, 0), /* USBDMAC */

	[MSTP208] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 8, 0), /* MSIOF1 */

	[MSTP207] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 7, 0), /* SCIFA5 */

	[MSTP206] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 6, 0), /* SCIFB */

	[MSTP205] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 5, 0), /* MSIOF2 */

	[MSTP204] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 4, 0), /* SCIFA0 */

	[MSTP203] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 3, 0), /* SCIFA1 */

	[MSTP202] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 2, 0), /* SCIFA2 */

	[MSTP201] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 1, 0), /* SCIFA3 */

	[MSTP200] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 0, 0), /* SCIFA4 */

	[MSTP329] = MSTP(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */

	[MSTP328] = MSTP(&div6_clks[DIV6_SPU], SMSTPCR3, 28, 0), /* FSI2 */

	[MSTP323] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 23, 0), /* IIC1 */

	[MSTP322] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 22, 0), /* USB0 */
@@ -557,8 +561,12 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP413] = MSTP(&pllc1_div2_clk, SMSTPCR4, 13, 0), /* HDMI */

	[MSTP411] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 11, 0), /* IIC3 */

	[MSTP410] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 10, 0), /* IIC4 */

	[MSTP407] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 7, 0), /* USB-DMAC1 */

	[MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */

	[MSTP405] = MSTP(&r_clk, SMSTPCR4, 5, 0), /* CMT4 */

	[MSTP404] = MSTP(&r_clk, SMSTPCR4, 4, 0), /* CMT3 */

	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

	[MSTP400] = MSTP(&r_clk, SMSTPCR4, 0, 0), /* CMT2 */

};



static struct clk_lookup lookups[] = {
@@ -609,6 +617,7 @@ static struct clk_lookup lookups[] = { 


	/* MSTP32 clocks */

	CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */

	CLKDEV_DEV_ID("spi_sh_msiof.0", &mstp_clks[MSTP000]), /* MSIOF0 */

	CLKDEV_DEV_ID("uio_pdrv_genirq.4", &mstp_clks[MSTP131]), /* VEU3 */

	CLKDEV_DEV_ID("uio_pdrv_genirq.3", &mstp_clks[MSTP130]), /* VEU2 */

	CLKDEV_DEV_ID("uio_pdrv_genirq.2", &mstp_clks[MSTP129]), /* VEU1 */
@@ -629,14 +638,16 @@ static struct clk_lookup lookups[] = { 
	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-dma-engine.3", &mstp_clks[MSTP214]), /* USB-DMAC0 */

	CLKDEV_DEV_ID("spi_sh_msiof.1", &mstp_clks[MSTP208]), /* MSIOF1 */

	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */

	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP206]), /* SCIFB */

	CLKDEV_DEV_ID("spi_sh_msiof.2", &mstp_clks[MSTP205]), /* MSIOF2 */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */

	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI2 */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */

	CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP322]), /* USB0 */
@@ -650,10 +661,14 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-mobile-hdmi", &mstp_clks[MSTP413]), /* HDMI */

	CLKDEV_DEV_ID("i2c-sh_mobile.3", &mstp_clks[MSTP411]), /* IIC3 */

	CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* IIC4 */

	CLKDEV_DEV_ID("sh-dma-engine.4", &mstp_clks[MSTP407]), /* USB-DMAC1 */

	CLKDEV_DEV_ID("r8a66597_hcd.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("r8a66597_udc.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("sh_cmt.4", &mstp_clks[MSTP405]), /* CMT4 */

	CLKDEV_DEV_ID("sh_cmt.3", &mstp_clks[MSTP404]), /* CMT3 */

	CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */

	CLKDEV_DEV_ID("sh_cmt.2", &mstp_clks[MSTP400]), /* CMT2 */



	CLKDEV_ICK_ID("hdmi", "sh_mobile_lcdc_fb.1",

		      &div6_reparent_clks[DIV6_HDMI]),