All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzk@kernel.org>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	Kevin Hilman <khilman@kernel.org>,
	arm@kernel.org
Cc: Krzysztof Kozlowski <krzk@kernel.org>,
	Kukjin Kim <kgene@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Javier Martinez Canillas <javier@osg.samsung.com>
Subject: [GIT PULL 2/3] ARM: dts: exynos: DT for v4.10, second round
Date: Thu, 24 Nov 2016 08:08:28 +0200	[thread overview]
Message-ID: <1479967709-6619-3-git-send-email-krzk@kernel.org> (raw)
In-Reply-To: <1479967709-6619-1-git-send-email-krzk@kernel.org>

Hi,

On top of previous pull/tag.

Possible trivial conflict:
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@@ -197,10 -188,10 +197,10 @@@
        };
  
        gmac: ethernet@00230000 {
-               compatible = "snps,dwmac-3.70a";
+               compatible = "snps,dwmac-3.70a", "snps,dwmac";
                reg = <0x00230000 0x8000>;
                interrupt-parent = <&gic>;
 -              interrupts = <0 31 4>;
 +              interrupts = <GIC_SPI 31 4>;
                interrupt-names = "macirq";
                phy-mode = "sgmii";
                clocks = <&clock CLK_GMAC0>;


Best regards,
Krzysztof


The following changes since commit 05a3589f46f913fbe91704f12fdca46a0eb0a27b:

  ARM: dts: exynos: Add SCU device node to exynos4.dtsi (2016-11-05 17:39:50 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.10-2

for you to fetch changes up to 79700041b37f0aca5da3ea27858ad6c42f99a474:

  ARM: dts: exynos: Remove the cd-gpios property for eMMC of Odroid XU3/4 (2016-11-23 19:17:11 +0200)

----------------------------------------------------------------
Samsung DeviceTree second update for v4.10:
1. Cleanups in MSHC nodes.
2. Enable ADC on Odroid boards.
3. Fix interrupt flags on recently added DMA sound nodes in Exynos5410.

----------------------------------------------------------------
Jaehoon Chung (2):
      ARM: dts: exynos: Replace "clock-freq-min-max" with "max-frequency"
      ARM: dts: exynos: Remove the cd-gpios property for eMMC of Odroid XU3/4

Krzysztof Kozlowski (1):
      ARM: dts: exynos: Fix invalid GIC interrupt flags in audio block of Exynos5410

Markus Reichl (1):
      ARM: dts: exynos: Add ADCs on 4412 and 5422 based odroid boards.

Niklas Cassel (1):
      ARM: dts: exynos: Specify snps, dwmac in compatible string for gmac

 arch/arm/boot/dts/exynos3250-artik5-eval.dts       |  2 +-
 arch/arm/boot/dts/exynos3250-artik5.dtsi           |  2 +-
 arch/arm/boot/dts/exynos3250-monk.dts              |  2 +-
 arch/arm/boot/dts/exynos3250-rinato.dts            |  2 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |  5 +++++
 arch/arm/boot/dts/exynos5410.dtsi                  |  4 ++--
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 12 +++++++++++-
 arch/arm/boot/dts/exynos5440.dtsi                  |  2 +-
 8 files changed, 23 insertions(+), 8 deletions(-)

WARNING: multiple messages have this Message-ID (diff)
From: krzk@kernel.org (Krzysztof Kozlowski)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/3] ARM: dts: exynos: DT for v4.10, second round
Date: Thu, 24 Nov 2016 08:08:28 +0200	[thread overview]
Message-ID: <1479967709-6619-3-git-send-email-krzk@kernel.org> (raw)
In-Reply-To: <1479967709-6619-1-git-send-email-krzk@kernel.org>

Hi,

On top of previous pull/tag.

Possible trivial conflict:
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@@ -197,10 -188,10 +197,10 @@@
        };
  
        gmac: ethernet at 00230000 {
-               compatible = "snps,dwmac-3.70a";
+               compatible = "snps,dwmac-3.70a", "snps,dwmac";
                reg = <0x00230000 0x8000>;
                interrupt-parent = <&gic>;
 -              interrupts = <0 31 4>;
 +              interrupts = <GIC_SPI 31 4>;
                interrupt-names = "macirq";
                phy-mode = "sgmii";
                clocks = <&clock CLK_GMAC0>;


Best regards,
Krzysztof


The following changes since commit 05a3589f46f913fbe91704f12fdca46a0eb0a27b:

  ARM: dts: exynos: Add SCU device node to exynos4.dtsi (2016-11-05 17:39:50 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.10-2

for you to fetch changes up to 79700041b37f0aca5da3ea27858ad6c42f99a474:

  ARM: dts: exynos: Remove the cd-gpios property for eMMC of Odroid XU3/4 (2016-11-23 19:17:11 +0200)

----------------------------------------------------------------
Samsung DeviceTree second update for v4.10:
1. Cleanups in MSHC nodes.
2. Enable ADC on Odroid boards.
3. Fix interrupt flags on recently added DMA sound nodes in Exynos5410.

----------------------------------------------------------------
Jaehoon Chung (2):
      ARM: dts: exynos: Replace "clock-freq-min-max" with "max-frequency"
      ARM: dts: exynos: Remove the cd-gpios property for eMMC of Odroid XU3/4

Krzysztof Kozlowski (1):
      ARM: dts: exynos: Fix invalid GIC interrupt flags in audio block of Exynos5410

Markus Reichl (1):
      ARM: dts: exynos: Add ADCs on 4412 and 5422 based odroid boards.

Niklas Cassel (1):
      ARM: dts: exynos: Specify snps, dwmac in compatible string for gmac

 arch/arm/boot/dts/exynos3250-artik5-eval.dts       |  2 +-
 arch/arm/boot/dts/exynos3250-artik5.dtsi           |  2 +-
 arch/arm/boot/dts/exynos3250-monk.dts              |  2 +-
 arch/arm/boot/dts/exynos3250-rinato.dts            |  2 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |  5 +++++
 arch/arm/boot/dts/exynos5410.dtsi                  |  4 ++--
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 12 +++++++++++-
 arch/arm/boot/dts/exynos5440.dtsi                  |  2 +-
 8 files changed, 23 insertions(+), 8 deletions(-)

  parent reply	other threads:[~2016-11-24  6:08 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-24  6:08 [GIT PULL 0/3] ARM: exynos: Second round for v4.10 Krzysztof Kozlowski
2016-11-24  6:08 ` Krzysztof Kozlowski
2016-11-24  6:08 ` [GIT PULL 1/3] ARM: exynos: Soc/mach " Krzysztof Kozlowski
2016-11-24  6:08   ` Krzysztof Kozlowski
2016-12-01 18:34   ` Krzysztof Kozlowski
2016-12-01 18:34     ` Krzysztof Kozlowski
2016-12-02 21:52     ` Arnd Bergmann
2016-12-02 21:52       ` Arnd Bergmann
2016-12-02 21:52       ` Arnd Bergmann
2016-12-03 17:03       ` Krzysztof Kozlowski
2016-12-03 17:03         ` Krzysztof Kozlowski
2016-12-08 15:28         ` Pankaj Dubey
2016-12-08 15:28           ` Pankaj Dubey
2016-12-08 18:25           ` Olof Johansson
2016-12-08 18:25             ` Olof Johansson
2016-12-08 18:46             ` Krzysztof Kozlowski
2016-12-08 18:46               ` Krzysztof Kozlowski
2016-11-24  6:08 ` Krzysztof Kozlowski [this message]
2016-11-24  6:08   ` [GIT PULL 2/3] ARM: dts: exynos: DT for v4.10, second round Krzysztof Kozlowski
2016-11-30 21:39   ` Arnd Bergmann
2016-11-30 21:39     ` Arnd Bergmann
2016-11-30 21:39     ` Arnd Bergmann
2016-11-24  6:08 ` [GIT PULL 3/3] arm64: " Krzysztof Kozlowski
2016-11-24  6:08   ` Krzysztof Kozlowski
2016-11-30 21:47   ` Arnd Bergmann
2016-11-30 21:47     ` Arnd Bergmann

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=1479967709-6619-3-git-send-email-krzk@kernel.org \
    --to=krzk@kernel.org \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=javier@osg.samsung.com \
    --cc=kgene@kernel.org \
    --cc=khilman@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=olof@lixom.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.