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

Commit b53c7582 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/sh' into for-linus

parents 7d3beab1 3cd44dcd

Documentation/devicetree/bindings/dma/rcar-audmapp.txt

deleted100644 → 0
+0 −29
Original line number Original line Diff line number Diff line 
* R-Car Audio DMAC peri peri Device Tree bindings



Required properties:

- compatible:	should be "renesas,rcar-audmapp"

- #dma-cells:	should be <1>, see "dmas" property below



Example:

	audmapp: audio-dma-pp@0xec740000 {

		compatible = "renesas,rcar-audmapp";

		#dma-cells = <1>;



		reg = <0 0xec740000 0 0x200>;

	};





* DMA client



Required properties:

- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.

		where SRS/DRS are specified in the SoC manual.

		It will be written into PDMACHCR as high 16-bit parts.

- dma-names:	a list of DMA channel names, one per "dmas" entry



Example:



	dmas = <&audmapp 0x2d00

		&audmapp 0x3700>;

	dma-names =  "src0_ssiu0",

		     "dvc0_ssiu0";

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -173,9 +173,9 @@ static const struct resource mmcif0_resources[] __initconst = { 
};

};





/* SDHI0 */

/* SDHI0 */

static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = {

static const struct tmio_mmc_data sdhi0_pdata __initconst = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

};

};





static const struct resource sdhi0_resources[] __initconst = {

static const struct resource sdhi0_resources[] __initconst = {
@@ -184,9 +184,9 @@ static const struct resource sdhi0_resources[] __initconst = { 
};

};





/* SDHI1 */

/* SDHI1 */

static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = {

static const struct tmio_mmc_data sdhi1_pdata __initconst = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_NEEDS_POLL,

			  MMC_CAP_NEEDS_POLL,

};

};

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

+10 −10
Original line number Original line Diff line number Diff line
@@ -754,12 +754,12 @@ static struct platform_device vcc_sdhi1 = { 
};

};





/* SDHI0 */

/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi0_info = {

static struct tmio_mmc_data sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI0_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.cd_gpio	= 167,

	.cd_gpio	= 167,

};

};
@@ -796,12 +796,12 @@ static struct platform_device sdhi0_device = { 
};

};





/* SDHI1 */

/* SDHI1 */

static struct sh_mobile_sdhi_info sdhi1_info = {

static struct tmio_mmc_data sdhi1_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI1_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	/* Port72 cannot generate IRQs, will be used in polling mode. */

	/* Port72 cannot generate IRQs, will be used in polling mode. */

	.cd_gpio	= 72,

	.cd_gpio	= 72,

};

};

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -201,12 +201,12 @@ static struct rcar_phy_platform_data usb_phy_platform_data __initdata = 








/* SDHI */

/* SDHI */

static struct sh_mobile_sdhi_info sdhi0_info __initdata = {

static struct tmio_mmc_data sdhi0_info __initdata = {

	.dma_slave_tx	= HPBDMA_SLAVE_SDHI0_TX,

	.chan_priv_tx	= (void *)HPBDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= HPBDMA_SLAVE_SDHI0_RX,

	.chan_priv_rx	= (void *)HPBDMA_SLAVE_SDHI0_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.capabilities	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.ocr_mask	= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT,

};

};





static struct resource sdhi0_resources[] __initdata = {

static struct resource sdhi0_resources[] __initdata = {
@@ -683,7 +683,7 @@ static void __init bockw_init(void) 
		platform_device_register_resndata(

		platform_device_register_resndata(

			NULL, "sh_mobile_sdhi", 0,

			NULL, "sh_mobile_sdhi", 0,

			sdhi0_resources, ARRAY_SIZE(sdhi0_resources),

			sdhi0_resources, ARRAY_SIZE(sdhi0_resources),

			&sdhi0_info, sizeof(struct sh_mobile_sdhi_info));

			&sdhi0_info, sizeof(struct tmio_mmc_data));

	}

	}





	/* for Audio */

	/* for Audio */

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

+10 −10
Original line number Original line Diff line number Diff line
@@ -442,11 +442,11 @@ static struct platform_device vcc_sdhi2 = { 
};

};





/* SDHI */

/* SDHI */

static struct sh_mobile_sdhi_info sdhi0_info = {

static struct tmio_mmc_data sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

			  MMC_CAP_POWER_OFF_CARD,

};

};
@@ -484,13 +484,13 @@ static struct platform_device sdhi0_device = { 
};

};





/* Micro SD */

/* Micro SD */

static struct sh_mobile_sdhi_info sdhi2_info = {

static struct tmio_mmc_data sdhi2_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI2_TX,

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI2_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI2_RX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI2_RX,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT |

	.flags		= TMIO_MMC_HAS_IDLE_WAIT |

			  TMIO_MMC_USE_GPIO_CD |

			  TMIO_MMC_USE_GPIO_CD |

			  TMIO_MMC_WRPROTECT_DISABLE,

			  TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD,

	.cd_gpio	= 13,

	.cd_gpio	= 13,

};

};