diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-12-01 00:30:32 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-12-01 00:30:32 +0300 |
| commit | 9782979e5a61538f1abd45cfc79c1059a2b7402b (patch) | |
| tree | dc2ce7ae1e4cda2256434a000e62359e5719344c /arch/arm/boot/dts/exynos5440.dtsi | |
| parent | bb986384d1d63a60c682b8bfe35fc1119be5f141 (diff) | |
| parent | 79700041b37f0aca5da3ea27858ad6c42f99a474 (diff) | |
| download | linux-9782979e5a61538f1abd45cfc79c1059a2b7402b.tar.xz | |
Merge tag 'samsung-dt-4.10-2' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'arch/arm/boot/dts/exynos5440.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos5440.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi index 97c9f0e38526..2a2e570bbee6 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi @@ -197,7 +197,7 @@ }; gmac: ethernet@00230000 { - compatible = "snps,dwmac-3.70a"; + compatible = "snps,dwmac-3.70a", "snps,dwmac"; reg = <0x00230000 0x8000>; interrupt-parent = <&gic>; interrupts = <GIC_SPI 31 4>; |