ARM: SoC fixes for 3.13-rc

Hopefully the last set of arm-soc fixes for 3.13, or at least only a
 few stray patches after this.
 
 There are a few fixes for Renesas platforms to fixup DMA masks (this
 started causing errors once the DMA API added checks for valid masks in
 3.13). Two more dealing with resources for MMC and PWM setup.
 
 There's also a few TI/OMAP/DRA fixes for smaller stuff and a fix for
 compilation failures on a PXA platform.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSzmLqAAoJEIwa5zzehBx3AIMP/i/Br36+IPTft/v6EN1dON3p
 RXLTSh5bAO7uS5lEd7osRKvFGAM7kk7V1xwpixJaweiDBhJYgCC08fLQsmXr2ktL
 uQZsWNqPzvNOUib8qmJSeYjuu4Otr+4KOS1FNhPmLJppnnZCnF0SsCaOTT/UZiV1
 dgwB3JwRZvSE+twqbeL6LDHdh3qF3Kp85IeeFMZjvRAlAtwwwK4zBc0mbAHUUYs9
 +h18T1iaJ+/j/5MQDVED6sJOWH4+cNh/DIvvWKGKe1z56Ji6wuMmrAFAhSiyeVNA
 sxRXgtaqeegXu/LQkxTeFI4PYOzU/LGXPuO6lDqKJ8h5/YfHoxdiAnkxA1WFrq6z
 sB4mc2A6WPKu13HbjqZOeVkFSZTL6lZDlLEP4f6mTDoHW5kJ6X7WabCBJswLpi9c
 d5PvAu+jYF20OXks2ctnsITHk5xcYXMK1VSNiv6z7Dff63x7Lh078bkns5E1YLqs
 vhkmZRGBWSsofFvyobNFKOsVvIW4Z6CGOiwW8RkQr6nlYzzoytnMU8E4yOUeXFRJ
 c4veMRPn4pgNkbRXdxvUXmRado6hs53YFcRWYXX3fuFTC5x8KTjR2hxLm6J+Ca/m
 2d9EFbBZQB1oZoHT6n/ghZCRIBjgVkbaaxNrdoMozF/ryOOj9ujj0xTB5dRoiX21
 0Fhq/UVUxj0i5XWLgxQA
 =edy8
 -----END PGP SIGNATURE-----

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:
 "A few fixes for Renesas platforms to fixup DMA masks (this started
  causing errors once the DMA API added checks for valid masks in 3.13)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: mackerel: Fix coherent DMA mask
  ARM: shmobile: kzm9g: Fix coherent DMA mask
  ARM: shmobile: armadillo: Fix coherent DMA mask
This commit is contained in:
Linus Torvalds 2014-01-10 15:54:49 +07:00
commit 2aa63ce000
3 changed files with 5 additions and 5 deletions

View File

@ -483,7 +483,7 @@ static struct platform_device lcdc0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &lcdc0_info, .platform_data = &lcdc0_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
@ -580,7 +580,7 @@ static struct platform_device hdmi_lcdc_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &hdmi_lcdc_info, .platform_data = &hdmi_lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };

View File

@ -334,7 +334,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources, .resource = lcdc_resources,
.dev = { .dev = {
.platform_data = &lcdc_info, .platform_data = &lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };

View File

@ -409,7 +409,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources, .resource = lcdc_resources,
.dev = { .dev = {
.platform_data = &lcdc_info, .platform_data = &lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
@ -499,7 +499,7 @@ static struct platform_device hdmi_lcdc_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &hdmi_lcdc_info, .platform_data = &hdmi_lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };