From patchwork Sun Jun 26 21:06:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9199611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83FFB60754 for ; Sun, 26 Jun 2016 21:07:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70EDA28555 for ; Sun, 26 Jun 2016 21:07:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64D9628557; Sun, 26 Jun 2016 21:07:16 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0094928555 for ; Sun, 26 Jun 2016 21:07:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHHGr-0001QD-QZ; Sun, 26 Jun 2016 21:07:13 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHHGZ-0001JL-L5; Sun, 26 Jun 2016 21:06:57 +0000 Received: by mail-wm0-x243.google.com with SMTP id c82so19747049wme.3; Sun, 26 Jun 2016 14:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kJKUtT+4bNgmE7xjIrGO+rJsBN6f+FrB8BGjfKtrjWk=; b=CCCesC60ZoPJl2ewEFGL9miaiBobPdBZXF4NSh2gXJqINhGMyi1Do9uoCJEzLR1k4A KaAc3AltyCr++dfVDWDSO+lpuL7uv+/65WjspQZkNSM1I+LRIPcAVFZBBQlXI+E1MYwg WUvc1OCvTvhUp0/tyMQ3GcWkIlvwt1NATlMv1GhiWUyq0+UZetMprSxVlyR98pj88zM7 tPT3RTmcaD2YSUYoimaD9EyMjOobcL7rHgaW8OH0OvdDMaGnCRukZg3F7IsSuzJ8AQTk 8CafyiV8uC33XT9kGof2jdo14s0gUo2LbZd17Q6Ez6+vvdN/uZbHOUy/WJ+FgUh3g6nY 5Ecw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kJKUtT+4bNgmE7xjIrGO+rJsBN6f+FrB8BGjfKtrjWk=; b=iaSOMjXEAEN2GYVfioihhX5ysB0WrQrtb/Q95cJXnxBu5gMOW0H0zdXT6pLKA1c997 Hnizzst28xzVgVEgIsR0kk297WpFihcy5eqDO21/hA9OdTBj//EHwKGhoh6cA34K0bA4 524QkCc96eJtxF0CRPKhHsJPO37SPueSCrUN7msHsNMioQlYQ4CudnTd3YM5ofdb0NaI QV3fz+Gx25PPVMyIZy4yWmQTCqkLF2ZsSB1zP1wMhm+51TOrF12OgxPtrJVN2NcgHbcy AqZsjg5vNXNQpd3G4aBc/miLoqZg5ZSJo7UC5nUFcSkuscL1P63aDsWwjecmyMLAKa85 3JNQ== X-Gm-Message-State: ALyK8tKXmxqZPMmB6lUJiKChisZV0c6v+qYQVExCngTmeC+1zv8KpRmLvNkG335V+Cn/zw== X-Received: by 10.28.125.71 with SMTP id y68mr7462279wmc.103.1466975193166; Sun, 26 Jun 2016 14:06:33 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1B04BC56BB9C73E3153B.dip0.t-ipconnect.de. [2003:dc:d3cd:1b04:bc56:bb9c:73e3:153b]) by smtp.googlemail.com with ESMTPSA id el4sm3639812wjd.23.2016.06.26.14.06.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jun 2016 14:06:32 -0700 (PDT) From: Martin Blumenstingl To: b.galvani@gmail.com, linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH v2 2/2] ARM: dts: meson: fixed size of the meson-ir registers Date: Sun, 26 Jun 2016 23:06:22 +0200 Message-Id: <20160626210622.5257-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160626210622.5257-1-martin.blumenstingl@googlemail.com> References: <20160626210622.5257-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160626_140656_026903_AE0A48CD X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, pawel.moll@arm.com, Martin Blumenstingl , khilman@baylibre.com, tobetter@gmail.com, robh+dt@kernel.org, carlo@caione.org, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP According to the reference driver (and the datasheet of the newer Meson8b/S805 and GXBB/S905 SoCs) there are 14 registers, each 32 bit wide. Adjust the register size to reflect that, as register offset 0x20 is now also needed by the meson-ir driver. Signed-off-by: Martin Blumenstingl --- changes in v1 -> v2: - new patch, this is needed because we are now trying to read/write offset 0x20 which is beyond the space which was reserved previously arch/arm/boot/dts/meson.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 8c77c87..0f5722a 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -147,7 +147,7 @@ ir_receiver: ir-receiver@c8100480 { compatible= "amlogic,meson6-ir"; - reg = <0xc8100480 0x20>; + reg = <0xc8100480 0x34>; interrupts = <0 15 1>; status = "disabled"; };