linux-next: manual merge of the renesas tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM:
mach-shmobile: sh73a0: Add IPMMU device") from the  tree and commits
73b21f40b61c ("ARM: shmobile: sh73a0: Do not use early devices with DT
reference") and 2a2b1f1bb063 ("ARM: shmobile: INTC External IRQ pin
driver on sh73a0") from the renesas tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index bdab575,95a75af..0000000
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -31,7 -32,7 +32,8 @@@
  #include <linux/sh_dma.h>
  #include <linux/sh_intc.h>
  #include <linux/sh_timer.h>
 +#include <linux/platform_data/sh_ipmmu.h>
+ #include <linux/platform_data/irq-renesas-intc-irqpin.h>
  #include <mach/dma-register.h>
  #include <mach/hardware.h>
  #include <mach/irqs.h>
@@@ -781,36 -782,128 +783,157 @@@ static struct platform_device pmu_devic
  	.resource	= pmu_resources,
  };
  
 +/* an IPMMU module for ICB */
 +static struct resource ipmmu_resources[] = {
 +	[0] = {
 +		.name	= "IPMMU",
 +		.start	= 0xfe951000,
 +		.end	= 0xfe9510ff,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +};
 +
 +static const char * const ipmmu_dev_names[] = {
 +	"sh_mobile_lcdc_fb.0",
 +};
 +
 +static struct shmobile_ipmmu_platform_data ipmmu_platform_data = {
 +	.dev_names = ipmmu_dev_names,
 +	.num_dev_names = ARRAY_SIZE(ipmmu_dev_names),
 +};
 +
 +static struct platform_device ipmmu_device = {
 +	.name           = "ipmmu",
 +	.id             = -1,
 +	.dev = {
 +		.platform_data = &ipmmu_platform_data,
 +	},
 +	.resource       = ipmmu_resources,
 +	.num_resources  = ARRAY_SIZE(ipmmu_resources),
 +};
 +
- static struct platform_device *sh73a0_early_devices_dt[] __initdata = {
+ static struct renesas_intc_irqpin_config irqpin0_platform_data = {
+ 	.irq_base = irq_pin(0), /* IRQ0 -> IRQ7 */
+ };
+ 
+ static struct resource irqpin0_resources[] = {
+ 	DEFINE_RES_MEM(0xe6900000, 4), /* ICR1A */
+ 	DEFINE_RES_MEM(0xe6900010, 4), /* INTPRI00A */
+ 	DEFINE_RES_MEM(0xe6900020, 1), /* INTREQ00A */
+ 	DEFINE_RES_MEM(0xe6900040, 1), /* INTMSK00A */
+ 	DEFINE_RES_MEM(0xe6900060, 1), /* INTMSKCLR00A */
+ 	DEFINE_RES_IRQ(gic_spi(1)), /* IRQ0 */
+ 	DEFINE_RES_IRQ(gic_spi(2)), /* IRQ1 */
+ 	DEFINE_RES_IRQ(gic_spi(3)), /* IRQ2 */
+ 	DEFINE_RES_IRQ(gic_spi(4)), /* IRQ3 */
+ 	DEFINE_RES_IRQ(gic_spi(5)), /* IRQ4 */
+ 	DEFINE_RES_IRQ(gic_spi(6)), /* IRQ5 */
+ 	DEFINE_RES_IRQ(gic_spi(7)), /* IRQ6 */
+ 	DEFINE_RES_IRQ(gic_spi(8)), /* IRQ7 */
+ };
+ 
+ static struct platform_device irqpin0_device = {
+ 	.name		= "renesas_intc_irqpin",
+ 	.id		= 0,
+ 	.resource	= irqpin0_resources,
+ 	.num_resources	= ARRAY_SIZE(irqpin0_resources),
+ 	.dev		= {
+ 		.platform_data	= &irqpin0_platform_data,
+ 	},
+ };
+ 
+ static struct renesas_intc_irqpin_config irqpin1_platform_data = {
+ 	.irq_base = irq_pin(8), /* IRQ8 -> IRQ15 */
+ 	.control_parent = true, /* Disable spurious IRQ10 */
+ };
+ 
+ static struct resource irqpin1_resources[] = {
+ 	DEFINE_RES_MEM(0xe6900004, 4), /* ICR2A */
+ 	DEFINE_RES_MEM(0xe6900014, 4), /* INTPRI10A */
+ 	DEFINE_RES_MEM(0xe6900024, 1), /* INTREQ10A */
+ 	DEFINE_RES_MEM(0xe6900044, 1), /* INTMSK10A */
+ 	DEFINE_RES_MEM(0xe6900064, 1), /* INTMSKCLR10A */
+ 	DEFINE_RES_IRQ(gic_spi(9)), /* IRQ8 */
+ 	DEFINE_RES_IRQ(gic_spi(10)), /* IRQ9 */
+ 	DEFINE_RES_IRQ(gic_spi(11)), /* IRQ10 */
+ 	DEFINE_RES_IRQ(gic_spi(12)), /* IRQ11 */
+ 	DEFINE_RES_IRQ(gic_spi(13)), /* IRQ12 */
+ 	DEFINE_RES_IRQ(gic_spi(14)), /* IRQ13 */
+ 	DEFINE_RES_IRQ(gic_spi(15)), /* IRQ14 */
+ 	DEFINE_RES_IRQ(gic_spi(16)), /* IRQ15 */
+ };
+ 
+ static struct platform_device irqpin1_device = {
+ 	.name		= "renesas_intc_irqpin",
+ 	.id		= 1,
+ 	.resource	= irqpin1_resources,
+ 	.num_resources	= ARRAY_SIZE(irqpin1_resources),
+ 	.dev		= {
+ 		.platform_data	= &irqpin1_platform_data,
+ 	},
+ };
+ 
+ static struct renesas_intc_irqpin_config irqpin2_platform_data = {
+ 	.irq_base = irq_pin(16), /* IRQ16 -> IRQ23 */
+ };
+ 
+ static struct resource irqpin2_resources[] = {
+ 	DEFINE_RES_MEM(0xe6900008, 4), /* ICR3A */
+ 	DEFINE_RES_MEM(0xe6900018, 4), /* INTPRI20A */
+ 	DEFINE_RES_MEM(0xe6900028, 1), /* INTREQ20A */
+ 	DEFINE_RES_MEM(0xe6900048, 1), /* INTMSK20A */
+ 	DEFINE_RES_MEM(0xe6900068, 1), /* INTMSKCLR20A */
+ 	DEFINE_RES_IRQ(gic_spi(17)), /* IRQ16 */
+ 	DEFINE_RES_IRQ(gic_spi(18)), /* IRQ17 */
+ 	DEFINE_RES_IRQ(gic_spi(19)), /* IRQ18 */
+ 	DEFINE_RES_IRQ(gic_spi(20)), /* IRQ19 */
+ 	DEFINE_RES_IRQ(gic_spi(21)), /* IRQ20 */
+ 	DEFINE_RES_IRQ(gic_spi(22)), /* IRQ21 */
+ 	DEFINE_RES_IRQ(gic_spi(23)), /* IRQ22 */
+ 	DEFINE_RES_IRQ(gic_spi(24)), /* IRQ23 */
+ };
+ 
+ static struct platform_device irqpin2_device = {
+ 	.name		= "renesas_intc_irqpin",
+ 	.id		= 2,
+ 	.resource	= irqpin2_resources,
+ 	.num_resources	= ARRAY_SIZE(irqpin2_resources),
+ 	.dev		= {
+ 		.platform_data	= &irqpin2_platform_data,
+ 	},
+ };
+ 
+ static struct renesas_intc_irqpin_config irqpin3_platform_data = {
+ 	.irq_base = irq_pin(24), /* IRQ24 -> IRQ31 */
+ };
+ 
+ static struct resource irqpin3_resources[] = {
+ 	DEFINE_RES_MEM(0xe690000c, 4), /* ICR4A */
+ 	DEFINE_RES_MEM(0xe690001c, 4), /* INTPRI30A */
+ 	DEFINE_RES_MEM(0xe690002c, 1), /* INTREQ30A */
+ 	DEFINE_RES_MEM(0xe690004c, 1), /* INTMSK30A */
+ 	DEFINE_RES_MEM(0xe690006c, 1), /* INTMSKCLR30A */
+ 	DEFINE_RES_IRQ(gic_spi(25)), /* IRQ24 */
+ 	DEFINE_RES_IRQ(gic_spi(26)), /* IRQ25 */
+ 	DEFINE_RES_IRQ(gic_spi(27)), /* IRQ26 */
+ 	DEFINE_RES_IRQ(gic_spi(28)), /* IRQ27 */
+ 	DEFINE_RES_IRQ(gic_spi(29)), /* IRQ28 */
+ 	DEFINE_RES_IRQ(gic_spi(30)), /* IRQ29 */
+ 	DEFINE_RES_IRQ(gic_spi(31)), /* IRQ30 */
+ 	DEFINE_RES_IRQ(gic_spi(32)), /* IRQ31 */
+ };
+ 
+ static struct platform_device irqpin3_device = {
+ 	.name		= "renesas_intc_irqpin",
+ 	.id		= 3,
+ 	.resource	= irqpin3_resources,
+ 	.num_resources	= ARRAY_SIZE(irqpin3_resources),
+ 	.dev		= {
+ 		.platform_data	= &irqpin3_platform_data,
+ 	},
+ };
+ 
+ static struct platform_device *sh73a0_devices_dt[] __initdata = {
  	&scif0_device,
  	&scif1_device,
  	&scif2_device,

Attachment: pgpbnB0v3nHfR.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux