Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753989AbcKRMpF (ORCPT ); Fri, 18 Nov 2016 07:45:05 -0500 Received: from mail.kernel.org ([198.145.29.136]:56592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753968AbcKRMpD (ORCPT ); Fri, 18 Nov 2016 07:45:03 -0500 From: Krzysztof Kozlowski To: Olof Johansson , Arnd Bergmann , Kevin Hilman , arm@kernel.org Cc: Krzysztof Kozlowski , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Martinez Canillas Subject: [GIT PULL 2/2] ARM: dts: exynos: Topic dts for v4.10 Date: Fri, 18 Nov 2016 14:44:35 +0200 Message-Id: <1479473075-9787-2-git-send-email-krzk@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479473075-9787-1-git-send-email-krzk@kernel.org> References: <1479473075-9787-1-git-send-email-krzk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4831 Lines: 104 Hi, Topic branch with a GIC interrupt fixes and cleanup (human-friendly symbols). Possible rather trivial conflicts: diff --cc arch/arm/boot/dts/exynos4x12.dtsi index 0074f566cd3b,505f047e81c6..85a7122658f1 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@@ -147,9 -147,10 +147,10 @@@ }; fimc_is: fimc-is@12000000 { - compatible = "samsung,exynos4212-fimc-is", "simple-bus"; + compatible = "samsung,exynos4212-fimc-is"; reg = <0x12000000 0x260000>; - interrupts = <0 90 0>, <0 95 0>; + interrupts = , + ; power-domains = <&pd_isp>; clocks = <&clock CLK_FIMC_LITE0>, <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>, diff --cc arch/arm/boot/dts/exynos5410.dtsi index 9a91685d8890,2501249d97aa..bb90bbdbe2d9 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@@ -190,58 -181,8 +190,58 @@@ pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5410-pinctrl"; reg = <0x03860000 0x1000>; - interrupts = <0 47 0>; + interrupts = ; }; + + amba { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges; Best regards, Krzysztof The following changes since commit 1001354ca34179f3db924eb66672442a173147dc: Linux 4.9-rc1 (2016-10-15 12:17:50 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-gic-flags-4.10 for you to fetch changes up to 04a886727ca7e841afa2fbc5d87aff81ae256dbf: ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440 (2016-11-03 22:44:56 +0200) ---------------------------------------------------------------- Topic branch with DT changes for v4.10. Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC interrupts. Although this was working but with error messages like: genirq: Setting trigger mode 0 for irq 16 failed Use level high interrupt instead of type none. The choice of level high was rather an arbitrary decision hoping it will work on each platform. Tests shown no issues so far. ---------------------------------------------------------------- Krzysztof Kozlowski (14): ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4210 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos3250 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5250 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5410/exynos542x ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260 ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5440 ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos3250 ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos4 ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5 ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5260 ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440 arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 20 +++++-- arch/arm/boot/dts/exynos3250.dtsi | 97 ++++++++++++++++++------------- arch/arm/boot/dts/exynos4.dtsi | 95 ++++++++++++++++-------------- arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 20 +++++-- arch/arm/boot/dts/exynos4210.dtsi | 36 ++++++++---- arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 20 +++++-- arch/arm/boot/dts/exynos4x12.dtsi | 48 ++++++++++----- arch/arm/boot/dts/exynos5.dtsi | 64 ++++++++++++++------ arch/arm/boot/dts/exynos5250.dtsi | 80 ++++++++++++------------- arch/arm/boot/dts/exynos5260.dtsi | 43 +++++++++----- arch/arm/boot/dts/exynos5410.dtsi | 26 ++++----- arch/arm/boot/dts/exynos5420.dtsi | 78 ++++++++++++------------- arch/arm/boot/dts/exynos5440.dtsi | 70 +++++++++++++--------- arch/arm/boot/dts/exynos54xx.dtsi | 34 +++++------ 14 files changed, 437 insertions(+), 294 deletions(-)