From patchwork Thu Dec 12 19:35:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11289325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 290056C1 for ; Thu, 12 Dec 2019 19:36:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F22FE22B48 for ; Thu, 12 Dec 2019 19:36:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="T7BwW0N9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730715AbfLLTgZ (ORCPT ); Thu, 12 Dec 2019 14:36:25 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:33248 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730716AbfLLTgZ (ORCPT ); Thu, 12 Dec 2019 14:36:25 -0500 Received: by mail-pj1-f68.google.com with SMTP id r67so1511215pjb.0 for ; Thu, 12 Dec 2019 11:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I/PREmgXNFnXrCjIoeu5i0RRy2A/HbW6IGnfPCXczl8=; b=T7BwW0N92zCoHek8Miu1pfCKC9fml6uE1NVnvPqt0NoWdvtGNsju43eyhF+BUXyrpd 0Rq1kbOCLHJIYBNcoTT6xDnXxN6xmzlWnf88Z71Sp+s3OYB4Sivya/1b/eVKQvjjgWPt wNVHABAq0b1OtbRxNVufqPAwho5y16plDn0y4= 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=I/PREmgXNFnXrCjIoeu5i0RRy2A/HbW6IGnfPCXczl8=; b=S2zTW8lgLkgSankJqg8PsaykXQKwNUyOPMpb4wjFrUNnLCgVBTAdkDeG8H9ZYjq8Pw cMYqqdpIsCjEfaO2xd8bcpSnLIE8XHGXNyrH1/Paj8c+k6W9B4Jkw4oDyZA52rzeiQwC zFjQy3Divaqie5sti8WVcUT6mstEUfX2l0jg6q33wBGSN66HfLWBZv1GlS+Jk2eKlFMA +AyWw7nvWwPabfoCM3h02S9Uknz7YTVkZ08A1IroCCsDFM8R6s1wX97PwO2GMdb39rxy 34rLawQjkvUj9UEsLjw1Z0UZ5tvKATHmoUV7YvUOoxkmyaWBBOE5iCXSKm2LlTvxoBgy IRaQ== X-Gm-Message-State: APjAAAX9ru8fP0bSYixVPVT/iWQlF1KO7pdszSlw/BkUgBXd/+t1ivE8 gb+cKcUovFsViMA0GuCYyVy3Ng== X-Google-Smtp-Source: APXvYqxRviElYQ2WA06uHTXpvSGeaTso4kQnAEIIpHNJETMQIyHgH1+LsV+muNtwvYIJnfvf+ujIIg== X-Received: by 2002:a17:902:6b0a:: with SMTP id o10mr11105366plk.15.1576179384001; Thu, 12 Dec 2019 11:36:24 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id m34sm7568302pgb.26.2019.12.12.11.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 11:36:23 -0800 (PST) From: Douglas Anderson To: Andy Gross , Bjorn Andersson Cc: Vinod Koul , Kiran Gunda , Rajendra Nayak , swboyd@chromium.org, mka@chromium.org, Sandeep Maheswaram , Amit Kucheria , Maulik Shah , Douglas Anderson , Taniya Das , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Mark Rutland Subject: [PATCH 7/7] arm64: dts: qcom: sc7180: Use 'ranges' in arm,armv7-timer-mem node Date: Thu, 12 Dec 2019 11:35:43 -0800 Message-Id: <20191212113540.7.Ia9bd3fca24ad34a5faaf1c3e58095c74b38abca1@changeid> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog In-Reply-To: <20191212193544.80640-1-dianders@chromium.org> References: <20191212193544.80640-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Running `make dtbs_check` yells: arch/arm64/boot/dts/qcom/sc7180-idp.dt.yaml: timer@17c20000: #size-cells:0:0: 1 was expected It appears that someone was trying to assert the fact that sub-nodes describing frames would never have a size that's more than 32-bits big. That's certainly true in the case of sc7180. I guess this is a hint that it's time to do the thing that nobody seems to do but that "writing-bindings.txt" says we should all do. Specifically it says: "DO use non-empty 'ranges' to limit the size of child buses/devices". That means we should probably limit the I believe that this patch is the way to do it and there should be no bad side effects here. I believe that since we're far enough down (not trying to describe an actual device, just some sub-pieces) that this won't cause us to run into the problems that caused us to increase the soc-level #address-cells and #size-cells to 2 in sdm845 in commit bede7d2dc8f3 ("arm64: dts: qcom: sdm845: Increase address and size cells for soc"). I can at least confirm that "arch_mem_timer" seems to keep getting interrupts in "/proc/interrupts" after this change. Fixes: 90db71e48070 ("arm64: dts: sc7180: Add minimal dts/dtsi files for SC7180 soc") Signed-off-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index c671f0719d42..336cf65bdcc2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1206,59 +1206,59 @@ watchdog@17c10000 { }; timer@17c20000{ - #address-cells = <2>; - #size-cells = <2>; - ranges; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x17c21000 0x10000>; compatible = "arm,armv7-timer-mem"; reg = <0 0x17c20000 0 0x1000>; - frame@17c21000 { + frame@0 { frame-number = <0>; interrupts = , ; - reg = <0 0x17c21000 0 0x1000>, - <0 0x17c22000 0 0x1000>; + reg = <0x0000 0x1000>, + <0x1000 0x1000>; }; - frame@17c23000 { + frame@2000 { frame-number = <1>; interrupts = ; - reg = <0 0x17c23000 0 0x1000>; + reg = <0x2000 0x1000>; status = "disabled"; }; - frame@17c25000 { + frame@4000 { frame-number = <2>; interrupts = ; - reg = <0 0x17c25000 0 0x1000>; + reg = <0x4000 0x1000>; status = "disabled"; }; - frame@17c27000 { + frame@6000 { frame-number = <3>; interrupts = ; - reg = <0 0x17c27000 0 0x1000>; + reg = <0x6000 0x1000>; status = "disabled"; }; - frame@17c29000 { + frame@8000 { frame-number = <4>; interrupts = ; - reg = <0 0x17c29000 0 0x1000>; + reg = <0x8000 0x1000>; status = "disabled"; }; - frame@17c2b000 { + frame@a000 { frame-number = <5>; interrupts = ; - reg = <0 0x17c2b000 0 0x1000>; + reg = <0xa000 0x1000>; status = "disabled"; }; - frame@17c2d000 { + frame@c000 { frame-number = <6>; interrupts = ; - reg = <0 0x17c2d000 0 0x1000>; + reg = <0xc000 0x1000>; status = "disabled"; }; };