From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 30 Nov 2016 21:30:32 +0000 (+0100)
Subject: Merge tag 'samsung-dt-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9782979e5a61538f1abd45cfc79c1059a2b7402b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'samsung-dt-4.10-2' of git://git./linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DeviceTree second update for v4.10" from Krzysztof Kozłowski:

1. Cleanups in MSHC nodes.
2. Enable ADC on Odroid boards.
3. Fix interrupt flags on recently added DMA sound nodes in Exynos5410.

* tag 'samsung-dt-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Remove the cd-gpios property for eMMC of Odroid XU3/4
  ARM: dts: exynos: Specify snps, dwmac in compatible string for gmac
  ARM: dts: exynos: Fix invalid GIC interrupt flags in audio block of Exynos5410
  ARM: dts: exynos: Add ADCs on 4412 and 5422 based odroid boards.
  ARM: dts: exynos: Replace "clock-freq-min-max" with "max-frequency"
---

9782979e5a61538f1abd45cfc79c1059a2b7402b
diff --cc arch/arm/boot/dts/exynos5440.dtsi
index 97c9f0e38526,1012659888f0..2a2e570bbee6
--- 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>;