From patchwork Tue Jun 4 16:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 10975679 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 B11D714B6 for ; Tue, 4 Jun 2019 16:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0755285F7 for ; Tue, 4 Jun 2019 16:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94045286F6; Tue, 4 Jun 2019 16:31:36 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 2AB01285F7 for ; Tue, 4 Jun 2019 16:31:36 +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:References:In-Reply-To: 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: List-Owner; bh=UaBkIFxQs6cyfqZoRRiPw4RENsWBN7LO4uwx73rUXRc=; b=NDpJ0US4j6TRL9 KipSwlSW5YGRi6F5LPLDWu4U3SFah8hMVjRa0N5mdgVUOS6py3qj4xfXfiCE9F8UnO6v6rcP16FoC rF3/rEQ5NoshGux9kWICJ2KDKcePyLdd8G1RMZ8uvw0AP2hOK0kLAcRhbfb5yj8qWV5Ju7zXtXc/W NRRIm2x837vP/M6a/xD63BhcsBtbk34dCbbN0wKKUv0rZ7A0eggeQNanYA8lV3VgIesoQ2i849fo8 3ax3geHpCfVwUpO416HhvOkmjV4g+Gm69IBXhtqEZZMLG1bMUXn9uiuPXEzsV9fJwZX5n84Q93XrT Wzd4ELTYolWxoX11vaJQ==; 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 1hYCLR-0007y2-6u; Tue, 04 Jun 2019 16:31:29 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hYCKC-0006LE-OE for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2019 16:30:19 +0000 Received: by mail-wr1-x444.google.com with SMTP id n4so13484421wrs.3 for ; Tue, 04 Jun 2019 09:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E4E30xpqxw1cyUThhqcs8LcBlilNIoX4BY+l8x9uJrk=; b=WOubF3Lko3LWSDIpWvmPAXAAhm2TuHCaP4QPXH2488QmNOENFFYoAgMqN5DzcwyL81 BgNWnnfwKGgPjXQp6DeX9jYpb03pAyoIBRiBwncmw7FGhCieHwtPhAE93HKy1V36SzpH MwxGiuBokritpXqReXZHO6xYRgAeU2b7cXRE+9bKJIpA9u6coE64Zz07PGYX1Zk7S0f1 gPjmLgC28L9L+F+ZgF4FP+sKykC9vJ/ynlvoO/Aa2gwkGCS4f/jhdB4AngnI+hJZSo9Z gf4FzgXmJK1T09TyPrSiWRd3/LZwQP2bHy2eSOnymIcNSBkbaEgvcsM9i2xOLLrgzMG4 aJbQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=E4E30xpqxw1cyUThhqcs8LcBlilNIoX4BY+l8x9uJrk=; b=AHhDgOOl3rFK9dEhwFInIU6LvBQTHqlEi0t2gFUwR14birpX1DVTHZXVVuDByzF6uv X71iuLgM5gqJA8CZ4Vx8UNvbEbJpwNYqbxQYJQt20pWrSqAFympR9e7oCzjnAnoHbVWg LwKKc5OV5TWQOmW5qchCe3otfEeWpP8/d/05dk2fI9Ug1B+LikFp/7NwBt4Zh3aeLbmA tiHFZNq++QKmA88kacB8wpht16un36VbzhBJggS41GQMapxyK1mJLKiLh5knAJ0YD+gS FShttQ7OUsoEKRYNHcZP4tkwyo9se2VQ8HsA+qd0U4fdCGrDbDjur2ZEAOC9lHZti270 nC3Q== X-Gm-Message-State: APjAAAVWphAz6ql4q98bAQv9HJmHM/S3yVOvU3qnJAK0b1iYmyasup3R XQhHUqinM/H3N22fT7Qi7gLD6QZEL4sN0g== X-Google-Smtp-Source: APXvYqzAdmrYB00nq1AF6bb6WEBSVA5fc135x0zqnHQocdDVwGW9tJVeQEfsQVvvFzBzsVsHaTBAzw== X-Received: by 2002:adf:c60e:: with SMTP id n14mr7423912wrg.255.1559665811137; Tue, 04 Jun 2019 09:30:11 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::4e2b:d7ca]) by smtp.gmail.com with ESMTPSA id y12sm15108176wrh.40.2019.06.04.09.30.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 04 Jun 2019 09:30:10 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Mauro Carvalho Chehab , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v4 05/13] ARM: dts: sunxi: Prefer A31 bindings for IR Date: Tue, 4 Jun 2019 18:29:51 +0200 Message-Id: <20190604162959.29199-6-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604162959.29199-1-peron.clem@gmail.com> References: <20190604162959.29199-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190604_093013_118619_CEBD8F94 X-CRM114-Status: GOOD ( 14.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Sean Young , linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?utf-8?b?Q2w=?= =?utf-8?b?w6ltZW50IFDDqXJvbg==?= , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since A31, memory mapping of the IR driver has changed. Prefer the A31 bindings instead of A13. Signed-off-by: Clément Péron Acked-by: Sean Young --- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index c04efad81bbc..110622b30796 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -1351,7 +1351,7 @@ }; ir: ir@1f02000 { - compatible = "allwinner,sun5i-a13-ir"; + compatible = "allwinner,sun6i-a31-ir"; clocks = <&apb0_gates 1>, <&ir_clk>; clock-names = "apb", "ir"; resets = <&apb0_rst 1>; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index 392b0cabbf0d..8d603f3309f2 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -1067,7 +1067,7 @@ r_cir: ir@1f02000 { compatible = "allwinner,sun8i-a83t-ir", - "allwinner,sun5i-a13-ir"; + "allwinner,sun6i-a31-ir"; clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>; clock-names = "apb", "ir"; resets = <&r_ccu RST_APB0_IR>; diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 0c1eec9000e3..310cd972ee5b 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -1167,7 +1167,7 @@ }; r_ir: ir@8002000 { - compatible = "allwinner,sun5i-a13-ir"; + compatible = "allwinner,sun6i-a31-ir"; interrupts = ; pinctrl-names = "default"; pinctrl-0 = <&r_ir_pins>;