On Wed, Feb 27, 2013 at 12:17:06PM +1100, Stephen Rothwell wrote:
> 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 Linus' tree and commit
> 73b21f40b61c ("ARM: shmobile: sh73a0: Do not use early devices with DT
> reference") from the renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen,
resolution below looks correct to me.
>
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
> index bdab575,6e80c5d..0000000
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@@ -781,36 -781,7 +782,36 @@@ 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 platform_device *sh73a0_devices_dt[] __initdata = {
> &scif0_device,
> &scif1_device,
> &scif2_device,
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
