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

Commit d81f5875 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-fixes-for-v3.11' of... 

Merge tag 'renesas-fixes-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Renesas ARM based SoC fixes for v3.11

* Correct GIO3 base addresses for EMEV2 SoC
  - This bug bug added when GPIO support was added for the EMEV2 SoC
    in v3.5

* Correct SCIFB0 resources for r8a77a4 SoC
  - This was a bug was added when SCIF support was added for the r8a77a4 SoC
    in v3.10

* tag 'renesas-fixes-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: emev2 GIO3 resource fix
  ARM: shmobile: r8a73a4: Fix resources for SCIFB0
parents 9cc98f01 1eb14ea1

arch/arm/mach-shmobile/setup-emev2.c

+4 −4
Original line number Diff line number Diff line
@@ -287,14 +287,14 @@ static struct gpio_em_config gio3_config = { 
static struct resource gio3_resources[] = {

	[0] = {

		.name	= "GIO_096",

		.start	= 0xe0050100,

		.end	= 0xe005012b,

		.start	= 0xe0050180,

		.end	= 0xe00501ab,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.name	= "GIO_096",

		.start	= 0xe0050140,

		.end	= 0xe005015f,

		.start	= 0xe00501c0,

		.end	= 0xe00501df,

		.flags	= IORESOURCE_MEM,

	},

	[2] = {

arch/arm/mach-shmobile/setup-r8a73a4.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFB3 }; 
static const struct plat_sci_port scif[] = {

	SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */

	SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */

	SCIFB_DATA(SCIFB0, 0xe6c50000, gic_spi(145)), /* SCIFB0 */

	SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */

	SCIFB_DATA(SCIFB1, 0xe6c30000, gic_spi(149)), /* SCIFB1 */

	SCIFB_DATA(SCIFB2, 0xe6ce0000, gic_spi(150)), /* SCIFB2 */

	SCIFB_DATA(SCIFB3, 0xe6cf0000, gic_spi(151)), /* SCIFB3 */