diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 22:30:32 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 22:30:32 +0100 |
| commit | 9782979e5a61538f1abd45cfc79c1059a2b7402b (patch) | |
| tree | dc2ce7ae1e4cda2256434a000e62359e5719344c /arch/arm/boot/dts/exynos5410.dtsi | |
| parent | bb986384d1d63a60c682b8bfe35fc1119be5f141 (diff) | |
| parent | 79700041b37f0aca5da3ea27858ad6c42f99a474 (diff) | |
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/exynos5410.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos5410.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index bb90bbdbe2d9..2b6adafe18e2 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -203,7 +203,7 @@ pdma0: pdma@12680000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x121A0000 0x1000>; - interrupts = <GIC_SPI 34 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clock CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; @@ -214,7 +214,7 @@ pdma1: pdma@12690000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x121B0000 0x1000>; - interrupts = <GIC_SPI 35 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clock CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; |