From patchwork Wed Mar 20 20:13:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10862577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 13E9817E0 for ; Wed, 20 Mar 2019 20:14:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E654129755 for ; Wed, 20 Mar 2019 20:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA1AA29CD6; Wed, 20 Mar 2019 20:14:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E84129755 for ; Wed, 20 Mar 2019 20:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=FvBRQ8149zHAErOR44wXzckCyoAIuqOMphCT9GXu8yQ=; b=XywJakfJRSnSIV cMPkHKFObx1WzI1AjjTqJv0is24DmXdHRvpiSYogYaNI6NaqEBvdUi9k1aBT58r8LPlQEZDyyLWIR m+c+wXKqI/GlD5cgmftMBPEWQ6jaNfazEwPbNOOiG87GXIp80jaVd1nOeVJzifoXe5CrfMNfzDXim 5JDMVNiTC/uI7HEcGtM6kz7pOZUhRGF87ENN12Ly605yA1tV1+YeX5mJACWalW804Op5s1RKq20+W O05oEH4jOFOvS/SKcbtdKYFjPH1ZWUpoWXK6g1A9EHf6iXhgEVzJrCZ1aiHLzJIY9+H2SeVuRgQft NgHAQPYcpMLHw4lZpr2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6hbl-0006XQ-Gg; Wed, 20 Mar 2019 20:14:41 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6hbc-0006NT-TO for linux-rockchip@lists.infradead.org; Wed, 20 Mar 2019 20:14:33 +0000 Received: by mail-pg1-x542.google.com with SMTP id y3so2568562pgk.12 for ; Wed, 20 Mar 2019 13:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BwAL0mV+1FttEgIOQakV729npRqitV7Qq6VFlsH1DAc=; b=CF56dwRc0kcExLqpNMLtJKAUCzMYeRDxEQMIzB66UrEA/ByceK4PsHTU0bd7wHd/Ol tPOJcmMMjfOGo2ZGnVzoP12wpYOrZgdndFwVxj9vUo4zadcejK8LV4eB4wRlo14V+L0p XH1zkOURjB/UuoBhcOXRTnA8hpH2TpKqKdznM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BwAL0mV+1FttEgIOQakV729npRqitV7Qq6VFlsH1DAc=; b=MlX7NVhT0hHECurc7b1y9FFQ82y2Idb03upVS6FJDMO6V2PBm+Py4JATIhvIHHO+IN E5Aecrb5MnogNZU/x8aawnA3Y6x/GQAw/+be/i9l6CI9RMyvXT2CQFqO3V/v7YPi8Jmx pjUjZBxwCEIDH3g6HJjyR+QGpN12R9vfvZnrECekQtzqxmKrA7AS602DiRG5uWXq0H9G K0d0fbH/SpDBhdslrozWJgeud2OftGCfRWt/EyL+5EowDyuQpetf4XMaxGRSBQvvXUOM aZaVmG0wcxUNlKUZ0oiy6Z83yb8n8mBMOgTIcJlVdH51xLZwXwzVnFHNn4W2WvjcPTwH DeMg== X-Gm-Message-State: APjAAAV2fG9sDJfw/0ZvDpAPQyHkyZVznJeSBzdhMh6ZHsFuT2lrXej7 4o79DhQZ8HxrdCGRbi99867MXg== X-Google-Smtp-Source: APXvYqzksDF0LWorAWmcuK1UEWcOmUQthtXTn+RXcid15g5LEqsvQA+1tZqZUcwTc7XhW6Opq/045Q== X-Received: by 2002:a63:7c07:: with SMTP id x7mr9292968pgc.284.1553112871771; Wed, 20 Mar 2019 13:14:31 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id z77sm6220388pfi.155.2019.03.20.13.14.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 13:14:30 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner Subject: [PATCH 1/4] ARM: dts: rockchip: Fix gic/efuse sort ordering for rk3288 Date: Wed, 20 Mar 2019 13:13:59 -0700 Message-Id: <20190320201402.114309-1-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190320_131433_011646_4FFB07D6 X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Douglas Anderson , Rob Herring , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP It can be seen that 0xffb40000 < 0xffc01000, thus efuse comes first. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- arch/arm/boot/dts/rk3288.dtsi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 09868dcee34b..e9f454248398 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1378,19 +1378,6 @@ reg = <0x0 0xffaf0080 0x0 0x20>; }; - gic: interrupt-controller@ffc01000 { - compatible = "arm,gic-400"; - interrupt-controller; - #interrupt-cells = <3>; - #address-cells = <0>; - - reg = <0x0 0xffc01000 0x0 0x1000>, - <0x0 0xffc02000 0x0 0x2000>, - <0x0 0xffc04000 0x0 0x2000>, - <0x0 0xffc06000 0x0 0x2000>; - interrupts = ; - }; - efuse: efuse@ffb40000 { compatible = "rockchip,rk3288-efuse"; reg = <0x0 0xffb40000 0x0 0x20>; @@ -1404,6 +1391,19 @@ }; }; + gic: interrupt-controller@ffc01000 { + compatible = "arm,gic-400"; + interrupt-controller; + #interrupt-cells = <3>; + #address-cells = <0>; + + reg = <0x0 0xffc01000 0x0 0x1000>, + <0x0 0xffc02000 0x0 0x2000>, + <0x0 0xffc04000 0x0 0x2000>, + <0x0 0xffc06000 0x0 0x2000>; + interrupts = ; + }; + pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>;