From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wim Van Sebroeck <wim@iguana.be>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Fu Wei <fu.wei@linaro.org>, Guenter Roeck <linux@roeck-us.net>,
Andre Przywara <andre.przywara@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree
Date: Sun, 6 Mar 2016 21:41:06 -0800 [thread overview]
Message-ID: <CAOesGMjD51rNqd3V8BE6xHkYZQdB8nc_Azppk1U+m8GwrtUv6w@mail.gmail.com> (raw)
In-Reply-To: <20160307150402.191ba735@canb.auug.org.au>
Hi Wim,
It's much easier for us if all DTS changes go in through the arm-soc
trees, to avoid these kind of conflicts. Is this on a branch where you
can easily drop it and we pick it up instead, or is it on a now-stable
branch?
-Olof
On Sun, Mar 6, 2016 at 8:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Wim,
>
> Today's linux-next merge of the watchdog tree got a conflict in:
>
> arch/arm64/boot/dts/arm/foundation-v8.dts
>
> between commit:
>
> d11a89796678 ("arm64: dts: split Foundation model dts to put the GIC separately")
>
> from the arm-soc tree and commit:
>
> fe3a97e8ed02 ("ARM64: add SBSA Generic Watchdog device node in foundation-v8.dts")
>
> from the watchdog tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/boot/dts/arm/foundation-v8.dts
> index 71168077312d,66cb9aaa9135..000000000000
> --- a/arch/arm64/boot/dts/arm/foundation-v8.dts
> +++ b/arch/arm64/boot/dts/arm/foundation-v8.dts
> @@@ -18,4 -83,165 +18,11 @@@
> <0x0 0x2c006000 0 0x2000>;
> interrupts = <1 9 0xf04>;
> };
> -
> - timer {
> - compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xf08>,
> - <1 14 0xf08>,
> - <1 11 0xf08>,
> - <1 10 0xf08>;
> - clock-frequency = <100000000>;
> - };
> -
> - pmu {
> - compatible = "arm,armv8-pmuv3";
> - interrupts = <0 60 4>,
> - <0 61 4>,
> - <0 62 4>,
> - <0 63 4>;
> - };
> -
> - smb {
> - compatible = "arm,vexpress,v2m-p1", "simple-bus";
> - arm,v2m-memory-map = "rs1";
> - #address-cells = <2>; /* SMB chipselect number and offset */
> - #size-cells = <1>;
> -
> - ranges = <0 0 0 0x08000000 0x04000000>,
> - <1 0 0 0x14000000 0x04000000>,
> - <2 0 0 0x18000000 0x04000000>,
> - <3 0 0 0x1c000000 0x04000000>,
> - <4 0 0 0x0c000000 0x04000000>,
> - <5 0 0 0x10000000 0x04000000>;
> -
> - #interrupt-cells = <1>;
> - interrupt-map-mask = <0 0 63>;
> - interrupt-map = <0 0 0 &gic 0 0 4>,
> - <0 0 1 &gic 0 1 4>,
> - <0 0 2 &gic 0 2 4>,
> - <0 0 3 &gic 0 3 4>,
> - <0 0 4 &gic 0 4 4>,
> - <0 0 5 &gic 0 5 4>,
> - <0 0 6 &gic 0 6 4>,
> - <0 0 7 &gic 0 7 4>,
> - <0 0 8 &gic 0 8 4>,
> - <0 0 9 &gic 0 9 4>,
> - <0 0 10 &gic 0 10 4>,
> - <0 0 11 &gic 0 11 4>,
> - <0 0 12 &gic 0 12 4>,
> - <0 0 13 &gic 0 13 4>,
> - <0 0 14 &gic 0 14 4>,
> - <0 0 15 &gic 0 15 4>,
> - <0 0 16 &gic 0 16 4>,
> - <0 0 17 &gic 0 17 4>,
> - <0 0 18 &gic 0 18 4>,
> - <0 0 19 &gic 0 19 4>,
> - <0 0 20 &gic 0 20 4>,
> - <0 0 21 &gic 0 21 4>,
> - <0 0 22 &gic 0 22 4>,
> - <0 0 23 &gic 0 23 4>,
> - <0 0 24 &gic 0 24 4>,
> - <0 0 25 &gic 0 25 4>,
> - <0 0 26 &gic 0 26 4>,
> - <0 0 27 &gic 0 27 4>,
> - <0 0 28 &gic 0 28 4>,
> - <0 0 29 &gic 0 29 4>,
> - <0 0 30 &gic 0 30 4>,
> - <0 0 31 &gic 0 31 4>,
> - <0 0 32 &gic 0 32 4>,
> - <0 0 33 &gic 0 33 4>,
> - <0 0 34 &gic 0 34 4>,
> - <0 0 35 &gic 0 35 4>,
> - <0 0 36 &gic 0 36 4>,
> - <0 0 37 &gic 0 37 4>,
> - <0 0 38 &gic 0 38 4>,
> - <0 0 39 &gic 0 39 4>,
> - <0 0 40 &gic 0 40 4>,
> - <0 0 41 &gic 0 41 4>,
> - <0 0 42 &gic 0 42 4>;
> -
> - ethernet@2,02000000 {
> - compatible = "smsc,lan91c111";
> - reg = <2 0x02000000 0x10000>;
> - interrupts = <15>;
> - };
> -
> - v2m_clk24mhz: clk24mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <24000000>;
> - clock-output-names = "v2m:clk24mhz";
> - };
> -
> - v2m_refclk1mhz: refclk1mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <1000000>;
> - clock-output-names = "v2m:refclk1mhz";
> - };
> -
> - v2m_refclk32khz: refclk32khz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <32768>;
> - clock-output-names = "v2m:refclk32khz";
> - };
> -
> - iofpga@3,00000000 {
> - compatible = "arm,amba-bus", "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0 3 0 0x200000>;
> -
> - v2m_sysreg: sysreg@010000 {
> - compatible = "arm,vexpress-sysreg";
> - reg = <0x010000 0x1000>;
> - };
> -
> - v2m_serial0: uart@090000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x090000 0x1000>;
> - interrupts = <5>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial1: uart@0a0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0a0000 0x1000>;
> - interrupts = <6>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial2: uart@0b0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0b0000 0x1000>;
> - interrupts = <7>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial3: uart@0c0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0c0000 0x1000>;
> - interrupts = <8>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - virtio_block@0130000 {
> - compatible = "virtio,mmio";
> - reg = <0x130000 0x200>;
> - interrupts = <42>;
> - };
> - };
> - };
> + watchdog@2a440000 {
> + compatible = "arm,sbsa-gwdt";
> + reg = <0x0 0x2a440000 0 0x1000>,
> + <0x0 0x2a450000 0 0x1000>;
> + interrupts = <0 27 4>;
> + timeout-sec = <30>;
> + };
> };
next prev parent reply other threads:[~2016-03-07 5:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 4:04 linux-next: manual merge of the watchdog tree with the arm-soc tree Stephen Rothwell
2016-03-07 5:41 ` Olof Johansson [this message]
2016-03-07 12:19 ` Sudeep Holla
2016-03-07 19:00 ` Olof Johansson
2016-03-08 10:10 ` Sudeep Holla
2016-03-07 18:54 ` Wim Van Sebroeck
2016-03-07 19:00 ` Olof Johansson
2016-03-08 15:52 ` André Przywara
2016-03-08 16:03 ` Fu Wei
2016-03-08 16:55 ` Sudeep Holla
2016-03-08 16:06 ` Sudeep Holla
2016-03-08 16:07 ` André Przywara
-- strict thread matches above, loose matches on Subject: below --
2017-09-11 0:58 Stephen Rothwell
2014-03-03 5:38 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=CAOesGMjD51rNqd3V8BE6xHkYZQdB8nc_Azppk1U+m8GwrtUv6w@mail.gmail.com \
--to=olof@lixom.net \
--cc=andre.przywara@arm.com \
--cc=arnd@arndb.de \
--cc=fu.wei@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sfr@canb.auug.org.au \
--cc=sudeep.holla@arm.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).