public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
	Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Joshua Kinard <kumba@gentoo•org>
Subject: linux-next: manual merge of the akpm tree with the mips tree
Date: Tue, 31 Mar 2015 23:35:43 +1100	[thread overview]
Message-ID: <20150331233543.5adbfe3a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/mips/sgi-ip32/ip32-platform.c between commit 2045a53b8e3f ("MIPS:
IP32: ip32-platform is not a module") from the mips tree and commit
8076ee8258d6 ("mips: ip32: add platform data hooks to use DS1685
driver") from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

diff --cc arch/mips/sgi-ip32/ip32-platform.c
index 94191a19588d,ec9eb7f3c628..000000000000
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@@ -97,10 -108,38 +107,34 @@@ static struct resource ip32_rtc_resourc
  	}
  };
  
- static __init int sgio2_cmos_devinit(void)
+ 
+ /* RTC registers on IP32 are each padded by 256 bytes (0x100). */
+ static struct ds1685_rtc_platform_data
+ ip32_rtc_platform_data[] = {
+ 	{
+ 		.regstep = 0x100,
+ 		.bcd_mode = true,
+ 		.no_irq = false,
+ 		.uie_unsupported = false,
+ 		.alloc_io_resources = true,
+ 		.plat_prepare_poweroff = ip32_prepare_poweroff,
+ 	},
+ };
+ 
+ struct platform_device ip32_rtc_device = {
+ 	.name			= "rtc-ds1685",
+ 	.id			= -1,
+ 	.dev			= {
+ 		.platform_data	= ip32_rtc_platform_data,
+ 	},
+ 	.num_resources		= ARRAY_SIZE(ip32_rtc_resources),
+ 	.resource		= ip32_rtc_resources,
+ };
+ 
+ static int __init sgio2_rtc_devinit(void)
  {
- 	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
- 						      sgio2_cmos_rsrc, 1));
+ 	return platform_device_register(&ip32_rtc_device);
+ 
  }
  
- device_initcall(sgio2_cmos_devinit);
+ device_initcall(sgio2_rtc_devinit);
 -
 -MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips•org>");
 -MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("IP32 platform setup for SGI IP32 aka O2");

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

next             reply	other threads:[~2015-03-31 12:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-31 12:35 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-02-11  6:42 linux-next: manual merge of the akpm tree with the mips tree Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150331233543.5adbfe3a@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=kumba@gentoo$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=ralf@linux-mips$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox