| Message ID | 1308610812-3479-6-git-send-email-horms@verge.net.au (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hi Paul, On Mon, Jun 20 2011, Simon Horman wrote: > The SDHI block on the ag5evm requires waiting for idle > before writing to some registers. > > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Cc: Magnus Damm <magnus.damm@gmail.com> > Signed-off-by: Simon Horman <horms@verge.net.au> > > --- > > Dependencies: > "mmc: sdhi: Add write16_hook" > "ARM: mach-shmobile: ag5evm: consistently name sdhi info structures" > --- > arch/arm/mach-shmobile/board-ag5evm.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c > index ce5c251..cdfdd62 100644 > --- a/arch/arm/mach-shmobile/board-ag5evm.c > +++ b/arch/arm/mach-shmobile/board-ag5evm.c > @@ -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, Could I get your ACK for this one, so that I can merge patches 1/2/3/5 together via the MMC tree? Thanks, - Chris.
On Tue, Jun 21, 2011 at 12:10:22PM -0400, Chris Ball wrote: > On Mon, Jun 20 2011, Simon Horman wrote: > > Dependencies: > > "mmc: sdhi: Add write16_hook" > > "ARM: mach-shmobile: ag5evm: consistently name sdhi info structures" > > Could I get your ACK for this one, so that I can merge patches 1/2/3/5 > together via the MMC tree? > Well, this has a dependency on 4/5 which I've already applied. I was simply going to wait for 1-3 to be merged via your tree and then roll in this last one on top of that. If you want to take them all that's ok too, git should be able to deal with any merge conflicts fine. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Tue, Jun 21 2011, Paul Mundt wrote: > On Tue, Jun 21, 2011 at 12:10:22PM -0400, Chris Ball wrote: >> On Mon, Jun 20 2011, Simon Horman wrote: >> > Dependencies: >> > "mmc: sdhi: Add write16_hook" >> > "ARM: mach-shmobile: ag5evm: consistently name sdhi info structures" >> >> Could I get your ACK for this one, so that I can merge patches 1/2/3/5 >> together via the MMC tree? >> > Well, this has a dependency on 4/5 which I've already applied. I was > simply going to wait for 1-3 to be merged via your tree and then roll in > this last one on top of that. If you want to take them all that's ok too, > git should be able to deal with any merge conflicts fine. Ah, okay -- I've pushed 1-3 now to mmc-next for 3.1, you can take 4-5. (I was thinking I should try to avoid requiring you to wait for Linus to pull MMC before you can send sh to him.) - Chris.
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index ce5c251..cdfdd62 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -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,
The SDHI block on the ag5evm requires waiting for idle before writing to some registers. Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- Dependencies: "mmc: sdhi: Add write16_hook" "ARM: mach-shmobile: ag5evm: consistently name sdhi info structures" --- arch/arm/mach-shmobile/board-ag5evm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)