From patchwork Mon May 9 14:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 571277 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7290C433FE for ; Mon, 9 May 2022 14:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237613AbiEIOvY (ORCPT ); Mon, 9 May 2022 10:51:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237670AbiEIOvU (ORCPT ); Mon, 9 May 2022 10:51:20 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 726F324BB13 for ; Mon, 9 May 2022 07:47:25 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id dk23so27302625ejb.8 for ; Mon, 09 May 2022 07:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9xRTrI9WocAtlulH6OCScXZ4ICM1Jp6yEojhtKo1MlE=; b=IcxXe3YOAgVNx9iZE1MzK3khoVKlhLo3o8CnfHO1XE31/CHYWK1u7sjG+FLAZdMzrQ D5OYeJ/eyxd3EdXmDlq2fpT6ts0ZWblq7G6+3C7Vm5VOgIvDGzcYygnGnR0i4SYRLtVO H8BVRqv3QmEKXn1E0yRO475DC2cBMf6Y/h/f1PLosLTXcz86Ae1O2O0vTtb/YZe8QPtP +7kG0+kSj+Vr4ApYFgJLRxeW+Ar8rmLyC7HtaWCLA8SRwNkSgFiQEmuzJkQ1jQlJGtRy rXzyTyuGTKE6csuq8zdtIsBI5pjEgeCdvepu7gZe6E46L9NGhyliHGaJGK0KJZ+N91Sc mF4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9xRTrI9WocAtlulH6OCScXZ4ICM1Jp6yEojhtKo1MlE=; b=ZrVx9WSCAHNrmzookcac6u9J4de8wsavY/bpaJK19mO6A+bM99xaXIcuAQfOw441c4 yfl2X8zFbAq8z0Wyranu2cgGvhHniPFTEwRflZSPVRpUAeSCguZtFAn8rhSf3/wllDnO GWO4Z+2z+SXs5tXYazWSkLIcQ/WOk0NmKVIRfzDZFWoS1f/cAA7Q88HuKJ41+UlGiZHC Ch+GQYxTAAVk6qnFHU0ppSKtH9Klh91aJtR9GKhO+pAecIKLmm5j4J7yQeCR9bVwdIy8 yP43bdEJJlh9/CtBESsvvori1fYO1s+Fwa1bmMb/Kmz9fV+bLsvpSKqba5FnSlb19KmC oZsQ== X-Gm-Message-State: AOAM532QQANEZ1NIz29HgljpROqWbXVuiEDfttMaByFHHMDPqVmc32RC NaocrBLFMKJbtXtHrOpcrkdH6g== X-Google-Smtp-Source: ABdhPJyH2mzabaK/ko/NHtQYxwJwz5wtJK9y40PCttihpkD1MkIMrDLyJ3GIPC7RaVkk/udDlHi+uA== X-Received: by 2002:a17:907:1ca4:b0:6f4:68b8:99d2 with SMTP id nb36-20020a1709071ca400b006f468b899d2mr15485120ejc.616.1652107644053; Mon, 09 May 2022 07:47:24 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id u9-20020a05640207c900b0042617ba637bsm6451828edy.5.2022.05.09.07.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 07:47:23 -0700 (PDT) From: Krzysztof Kozlowski To: Robert Foss , Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Del Regno , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/4] media: dt-bindings: qcom,sdm660-camss: document interconnects Date: Mon, 9 May 2022 16:47:11 +0200 Message-Id: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Document the interconnect properties used in the Qualcomm CAMSS on SDM660: sdm630-sony-xperia-nile-discovery.dtb: camss@ca00000: 'interconnect-names', 'interconnects' do not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring --- .../devicetree/bindings/media/qcom,sdm660-camss.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml index 338ab28d5f3b..b28c8e17f158 100644 --- a/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml @@ -84,6 +84,13 @@ properties: - const: vfe0 - const: vfe1 + interconnects: + maxItems: 1 + + interconnect-names: + items: + - const: vfe-mem + iommus: maxItems: 4 From patchwork Mon May 9 14:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 571276 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DFA2C433FE for ; Mon, 9 May 2022 14:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237647AbiEIOvX (ORCPT ); Mon, 9 May 2022 10:51:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237605AbiEIOvV (ORCPT ); Mon, 9 May 2022 10:51:21 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67A1B24BB17 for ; Mon, 9 May 2022 07:47:26 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id g23so16573332edy.13 for ; Mon, 09 May 2022 07:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=321PIVHP5NJ8SF3xR+tSNAO8vJqKIBbackfeUoBjZ+c=; b=A3Nb8Y+LUrYzmdwdJbKfMhZtRSTCJT8VBKQOj3PrAp5YoGdPotzJsvNHSvE612mEcT d8iHkoHwKm4uLnXYR1RCXGzzjuQjlSMR9CVSCplh38TYcrWmm+I4SGZLsOvpb4oA1OuI UVV+fiNSw+MphnToqCO9LbesE0FxnUvMfekhVflm2+WRBvEkthWhUOCda9Te6UWzUcx1 oTmBDqlrGxnW6Vfx7uTLcDhct+QXXAliLmDg7hmifj+18de1K8B/+16wH+V5YF8VaQBF uUcKRyZ0flBokpi7LLxeomzZp/k/8DpWUQPripOXIT+4rfOAXhEfKkX72SgT3T9JzPdi fafg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=321PIVHP5NJ8SF3xR+tSNAO8vJqKIBbackfeUoBjZ+c=; b=DcHS8CObOM3YIR81RMCjVFikxYObBqW5mqhk/6J6go5Ahu1sViM42Cx8f0OWYOJa7U 6RX5X3J9kuuDsUnOSwb7F1sLKL2QNRN/0tmSVPbn+7bsDfCjEj7/9vKHibtiIQAulJy2 k3UE4o/ZfIs2Rm8XkwJ3VYly6rvNT5cGJSlNhWQk8z4kBlZEDYLZebrwCzm/QdgaZIXY fkxA3CqUpG02dV2btcJJzom2bytKH8mNgfnY0LscBUA8BQF9BivWxHh96hpFnmORgWM7 CUxVpaYMY5A9vBRlSbQ0/+xZJzI0J/lyANc0RjGx8A07HrRW4HoHnDdUOW44sgHbCcG0 U+IQ== X-Gm-Message-State: AOAM532QA4kX88jPd35Wbz1pTXNck7+k+EM27KdyPkWzS+ulkGjOYfkp aBcCGZ9gWAFrLLqz47WKm+FnyQ== X-Google-Smtp-Source: ABdhPJy8EUbRnlfNNEi9YDRlh9pQH4O0ylgZYVEUYy+S92gHznMpJhxvsi3ak/7fwvbY5Di3GzuOig== X-Received: by 2002:a05:6402:4396:b0:427:f2dc:b11 with SMTP id o22-20020a056402439600b00427f2dc0b11mr17919840edc.298.1652107645011; Mon, 09 May 2022 07:47:25 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id u9-20020a05640207c900b0042617ba637bsm6451828edy.5.2022.05.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 07:47:24 -0700 (PDT) From: Krzysztof Kozlowski To: Robert Foss , Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Del Regno , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/4] arm64: dts: qcom: sdm630: order clocks according to bindings Date: Mon, 9 May 2022 16:47:12 +0200 Message-Id: <20220509144714.144154-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> References: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The CAMSS DTSI device node, which came after the bindings were merged, got the clocks ordered differently then specified in the bindings: sdm636-sony-xperia-ganges-mermaid.dtb: camss@ca00000: reg-names:4: 'csid3' was expected Reordering them to match bindings should not cause ABI issues, because the driver relies on names, not ordering. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 168 +++++++++++++-------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 7f875bf9390a..8f623238c238 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1890,90 +1890,90 @@ camss: camss@ca00000 { "ispif", "vfe0", "vfe1"; - clocks = <&mmcc CAMSS_TOP_AHB_CLK>, - <&mmcc THROTTLE_CAMSS_AXI_CLK>, - <&mmcc CAMSS_ISPIF_AHB_CLK>, - <&mmcc CAMSS_CSI0PHYTIMER_CLK>, - <&mmcc CAMSS_CSI1PHYTIMER_CLK>, - <&mmcc CAMSS_CSI2PHYTIMER_CLK>, - <&mmcc CAMSS_CSI0_AHB_CLK>, - <&mmcc CAMSS_CSI0_CLK>, - <&mmcc CAMSS_CPHY_CSID0_CLK>, - <&mmcc CAMSS_CSI0PIX_CLK>, - <&mmcc CAMSS_CSI0RDI_CLK>, - <&mmcc CAMSS_CSI1_AHB_CLK>, - <&mmcc CAMSS_CSI1_CLK>, - <&mmcc CAMSS_CPHY_CSID1_CLK>, - <&mmcc CAMSS_CSI1PIX_CLK>, - <&mmcc CAMSS_CSI1RDI_CLK>, - <&mmcc CAMSS_CSI2_AHB_CLK>, - <&mmcc CAMSS_CSI2_CLK>, - <&mmcc CAMSS_CPHY_CSID2_CLK>, - <&mmcc CAMSS_CSI2PIX_CLK>, - <&mmcc CAMSS_CSI2RDI_CLK>, - <&mmcc CAMSS_CSI3_AHB_CLK>, - <&mmcc CAMSS_CSI3_CLK>, - <&mmcc CAMSS_CPHY_CSID3_CLK>, - <&mmcc CAMSS_CSI3PIX_CLK>, - <&mmcc CAMSS_CSI3RDI_CLK>, - <&mmcc CAMSS_AHB_CLK>, - <&mmcc CAMSS_VFE0_CLK>, - <&mmcc CAMSS_CSI_VFE0_CLK>, - <&mmcc CAMSS_VFE0_AHB_CLK>, - <&mmcc CAMSS_VFE0_STREAM_CLK>, - <&mmcc CAMSS_VFE1_CLK>, - <&mmcc CAMSS_CSI_VFE1_CLK>, - <&mmcc CAMSS_VFE1_AHB_CLK>, - <&mmcc CAMSS_VFE1_STREAM_CLK>, - <&mmcc CAMSS_VFE_VBIF_AHB_CLK>, - <&mmcc CAMSS_VFE_VBIF_AXI_CLK>, - <&mmcc CSIPHY_AHB2CRIF_CLK>, - <&mmcc CAMSS_CPHY_CSID0_CLK>, - <&mmcc CAMSS_CPHY_CSID1_CLK>, - <&mmcc CAMSS_CPHY_CSID2_CLK>, - <&mmcc CAMSS_CPHY_CSID3_CLK>; - clock-names = "top_ahb", - "throttle_axi", - "ispif_ahb", - "csiphy0_timer", - "csiphy1_timer", - "csiphy2_timer", - "csi0_ahb", - "csi0", - "csi0_phy", - "csi0_pix", - "csi0_rdi", - "csi1_ahb", - "csi1", - "csi1_phy", - "csi1_pix", - "csi1_rdi", - "csi2_ahb", - "csi2", - "csi2_phy", - "csi2_pix", - "csi2_rdi", - "csi3_ahb", - "csi3", - "csi3_phy", - "csi3_pix", - "csi3_rdi", - "ahb", - "vfe0", - "csi_vfe0", - "vfe0_ahb", - "vfe0_stream", - "vfe1", - "csi_vfe1", - "vfe1_ahb", - "vfe1_stream", - "vfe_ahb", - "vfe_axi", - "csiphy_ahb2crif", - "cphy_csid0", - "cphy_csid1", - "cphy_csid2", - "cphy_csid3"; + clocks = <&mmcc CAMSS_AHB_CLK>, + <&mmcc CAMSS_CPHY_CSID0_CLK>, + <&mmcc CAMSS_CPHY_CSID1_CLK>, + <&mmcc CAMSS_CPHY_CSID2_CLK>, + <&mmcc CAMSS_CPHY_CSID3_CLK>, + <&mmcc CAMSS_CSI0_AHB_CLK>, + <&mmcc CAMSS_CSI0_CLK>, + <&mmcc CAMSS_CPHY_CSID0_CLK>, + <&mmcc CAMSS_CSI0PIX_CLK>, + <&mmcc CAMSS_CSI0RDI_CLK>, + <&mmcc CAMSS_CSI1_AHB_CLK>, + <&mmcc CAMSS_CSI1_CLK>, + <&mmcc CAMSS_CPHY_CSID1_CLK>, + <&mmcc CAMSS_CSI1PIX_CLK>, + <&mmcc CAMSS_CSI1RDI_CLK>, + <&mmcc CAMSS_CSI2_AHB_CLK>, + <&mmcc CAMSS_CSI2_CLK>, + <&mmcc CAMSS_CPHY_CSID2_CLK>, + <&mmcc CAMSS_CSI2PIX_CLK>, + <&mmcc CAMSS_CSI2RDI_CLK>, + <&mmcc CAMSS_CSI3_AHB_CLK>, + <&mmcc CAMSS_CSI3_CLK>, + <&mmcc CAMSS_CPHY_CSID3_CLK>, + <&mmcc CAMSS_CSI3PIX_CLK>, + <&mmcc CAMSS_CSI3RDI_CLK>, + <&mmcc CAMSS_CSI0PHYTIMER_CLK>, + <&mmcc CAMSS_CSI1PHYTIMER_CLK>, + <&mmcc CAMSS_CSI2PHYTIMER_CLK>, + <&mmcc CSIPHY_AHB2CRIF_CLK>, + <&mmcc CAMSS_CSI_VFE0_CLK>, + <&mmcc CAMSS_CSI_VFE1_CLK>, + <&mmcc CAMSS_ISPIF_AHB_CLK>, + <&mmcc THROTTLE_CAMSS_AXI_CLK>, + <&mmcc CAMSS_TOP_AHB_CLK>, + <&mmcc CAMSS_VFE0_AHB_CLK>, + <&mmcc CAMSS_VFE0_CLK>, + <&mmcc CAMSS_VFE0_STREAM_CLK>, + <&mmcc CAMSS_VFE1_AHB_CLK>, + <&mmcc CAMSS_VFE1_CLK>, + <&mmcc CAMSS_VFE1_STREAM_CLK>, + <&mmcc CAMSS_VFE_VBIF_AHB_CLK>, + <&mmcc CAMSS_VFE_VBIF_AXI_CLK>; + clock-names = "ahb", + "cphy_csid0", + "cphy_csid1", + "cphy_csid2", + "cphy_csid3", + "csi0_ahb", + "csi0", + "csi0_phy", + "csi0_pix", + "csi0_rdi", + "csi1_ahb", + "csi1", + "csi1_phy", + "csi1_pix", + "csi1_rdi", + "csi2_ahb", + "csi2", + "csi2_phy", + "csi2_pix", + "csi2_rdi", + "csi3_ahb", + "csi3", + "csi3_phy", + "csi3_pix", + "csi3_rdi", + "csiphy0_timer", + "csiphy1_timer", + "csiphy2_timer", + "csiphy_ahb2crif", + "csi_vfe0", + "csi_vfe1", + "ispif_ahb", + "throttle_axi", + "top_ahb", + "vfe0_ahb", + "vfe0", + "vfe0_stream", + "vfe1_ahb", + "vfe1", + "vfe1_stream", + "vfe_ahb", + "vfe_axi"; interconnects = <&mnoc 5 &bimc 5>; interconnect-names = "vfe-mem"; iommus = <&mmss_smmu 0xc00>, From patchwork Mon May 9 14:47:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 571055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75CE7C433F5 for ; Mon, 9 May 2022 14:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237688AbiEIOvZ (ORCPT ); Mon, 9 May 2022 10:51:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237697AbiEIOvW (ORCPT ); Mon, 9 May 2022 10:51:22 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61FD824BB28 for ; Mon, 9 May 2022 07:47:27 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id gh6so27359446ejb.0 for ; Mon, 09 May 2022 07:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mjrvp1Hm7vOindUfGtrE7gurv1Xo3OI98bE9K/MwSFs=; b=GrpaA/8vdoQ0feSdPdXYv/uw6XfWC1FuzNh2IOeG7iyRn6cCulGzW/oyDovSCHjX4U lhH1h/GcPPy/XQKpdDjwZy71iS4HDrZYz1ft6hbApC2eUkFhFnSTVEHCvOY02CFx2DVB WIxptKgEp5wHXcmDflRJjL0jv3y3RbBO/FN+on09ULb7t45iDVrQBMhPJp9pQky7un1Y hHjupf/To+xpulFQVg7f5toTR2Inmkh8eykR3Q73l8NnZJHQhq2EecnNC8zLThUocm0E +gVOLicDKMEvQCeeoL+93JH0xPuXNVILC9ItVU7dImsqfU3HFoTFM778IAAcWaN/TueS 65og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mjrvp1Hm7vOindUfGtrE7gurv1Xo3OI98bE9K/MwSFs=; b=oMX84T8euE7NmnczsPHGJohMvJwYlNiTm1TryA1bTMbwhYzmBgJPIHk4J74i/UcOov ncq8uAHw3WtfC+cH2QOo8ymiGUmRJUHJcT3jjsbDMrMOcy757P7coYP6DKReAiiHyThV Cb+WgmOwQ3T8jDUS4i7OwF7gNQH8KAUiCfVzkfg5lWRxbGavPnP8SkiYJWKHONsGpEnF bFIXLGtvZt0YH95MeTAh8sOWKitxdrKaPVgy0mZ3MfeZfjWVaob/S1ta5ZgL7rzZQTqC sVljAaIs555O4eiaSVt2OKy8q+/J8eFqn3V4+spYiJneF0PlxpRLdDU0r9DBoKWqafc5 2TpA== X-Gm-Message-State: AOAM532VdJqbIXNITFIhAMPWw+wxk1+fuIvVeYDXWtedTAwHbaR2n9zy 2mMgEfVp9FEs+ms3bXm4erxYFg== X-Google-Smtp-Source: ABdhPJyV85p3CRvl/hPJcJeHo3iJvQ+mcdXiasUjKX53LqOQ9TCcXbuwVG86Cb92HrSh1QPu6SWsjA== X-Received: by 2002:a17:907:1625:b0:6f4:55aa:4213 with SMTP id hb37-20020a170907162500b006f455aa4213mr15254274ejc.594.1652107645930; Mon, 09 May 2022 07:47:25 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id u9-20020a05640207c900b0042617ba637bsm6451828edy.5.2022.05.09.07.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 07:47:25 -0700 (PDT) From: Krzysztof Kozlowski To: Robert Foss , Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Del Regno , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/4] arm64: dts: qcom: sdm630: order regs according to bindings Date: Mon, 9 May 2022 16:47:13 +0200 Message-Id: <20220509144714.144154-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> References: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The CAMSS DTSI device node, which came after the bindings were merged, got the regs ordered differently then specified in the bindings: sdm636-sony-xperia-ganges-mermaid.dtb: camss@ca00000: reg-names:0: 'csi_clk_mux' was expected Reordering them to match bindings should not cause ABI issues, because the driver relies on names, not ordering. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 8f623238c238..594a802e9429 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1842,32 +1842,32 @@ pil-reloc@94c { camss: camss@ca00000 { compatible = "qcom,sdm660-camss"; - reg = <0x0c824000 0x1000>, + reg = <0x0ca00020 0x10>, + <0x0ca30000 0x100>, + <0x0ca30400 0x100>, + <0x0ca30800 0x100>, + <0x0ca30c00 0x100>, + <0x0c824000 0x1000>, <0x0ca00120 0x4>, <0x0c825000 0x1000>, <0x0ca00124 0x4>, <0x0c826000 0x1000>, <0x0ca00128 0x4>, - <0x0ca30000 0x100>, - <0x0ca30400 0x100>, - <0x0ca30800 0x100>, - <0x0ca30c00 0x100>, <0x0ca31000 0x500>, - <0x0ca00020 0x10>, <0x0ca10000 0x1000>, <0x0ca14000 0x1000>; - reg-names = "csiphy0", + reg-names = "csi_clk_mux", + "csid0", + "csid1", + "csid2", + "csid3", + "csiphy0", "csiphy0_clk_mux", "csiphy1", "csiphy1_clk_mux", "csiphy2", "csiphy2_clk_mux", - "csid0", - "csid1", - "csid2", - "csid3", "ispif", - "csi_clk_mux", "vfe0", "vfe1"; interrupts = , From patchwork Mon May 9 14:47:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 571056 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 009D1C43217 for ; Mon, 9 May 2022 14:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237728AbiEIOvY (ORCPT ); Mon, 9 May 2022 10:51:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237708AbiEIOvW (ORCPT ); Mon, 9 May 2022 10:51:22 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5171824BB0C for ; Mon, 9 May 2022 07:47:28 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id m20so27267890ejj.10 for ; Mon, 09 May 2022 07:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YReIlo2SA3OXXKOlZqVzpBGAEFmTXwOCuNhJW0SaYWY=; b=y0ykTPwUXzT2B12UESk2c0mNSFQvN19HIPC41BgWOWm9eApr1uFuPMRCsUTLEs11CI muoGtMrqLjqf5PFE0+nt1zB/vVkfRloOupyM7xusCrQWJi+ynB9xH2wA6Wvsmpm0+PLg nsBUUB+OA7phZqFyQEUOieLzoNavymWASJaVSaveRwZGAwERjslwj6Z+qc62VqsVnr84 Nx3wJJs9GBiHVjxLFT+vk05g48a+flBS/lMy/MNEJK86ZAS0I961yNQglucmXV1YNix1 bggkMitanpVmRFCJ1KAg9t2SU7fCqKhhqzIFzqtA7+H5v9sHkRMN+pm2RwjSGlj++0O5 8zMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YReIlo2SA3OXXKOlZqVzpBGAEFmTXwOCuNhJW0SaYWY=; b=seFvVuGH7Ylgiuksqd8PapyLOUCRzIkC73nfCOK8f95J21HBWDNdr11ty+S8VgB5Lf dEK5EEXZlvWvCAwq9OzgaO5arkOiqNnLS0pwUKw9aHRYAZTzSC3VYiiMUDHzY6TO2ZoV GjT0dPDWRkmfH58mkw7EEhFW/YeImxTgbVS/kxR6d2s9dZrfBpNYZHyjrrTHqBODIuBr IWE21cV3THI/2tUYx9WkzN2yPZb3wWXSb7+oLfHj1t+BEkXz99r8Ql7cjxuhVYuX5oN3 y+BRHt8IOl3X/1WzdrD7UpLWiRrBUOBtoLkHE2Lz03xYF0C2Z2eCbpX5nxZRkfohUjdM IwSw== X-Gm-Message-State: AOAM531t/JUsNY2ZuH1an2E4gZoCHGOuEVo3bsiqOd98w98eXCb0PYy0 4yj6VTtCal8+1QW/hGB4TX2iUA== X-Google-Smtp-Source: ABdhPJwUe+Mhortp2BoeLfOz+JnBpHFhsaIHaA71zlpV1VUi6ZcfHMF4GT0uGgC1stNA9o4EZpyHQw== X-Received: by 2002:a17:906:ece3:b0:6f3:da10:138a with SMTP id qt3-20020a170906ece300b006f3da10138amr15043405ejb.438.1652107646916; Mon, 09 May 2022 07:47:26 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id u9-20020a05640207c900b0042617ba637bsm6451828edy.5.2022.05.09.07.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 07:47:26 -0700 (PDT) From: Krzysztof Kozlowski To: Robert Foss , Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Del Regno , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/4] arm64: dts: qcom: sdm630: order interrupts according to bindings Date: Mon, 9 May 2022 16:47:14 +0200 Message-Id: <20220509144714.144154-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> References: <20220509144714.144154-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The CAMSS DTSI device node, which came after the bindings were merged, got the interrupts ordered differently then specified in the bindings: sdm630-sony-xperia-nile-pioneer.dtb: camss@ca00000: interrupt-names:0: 'csid0' was expected Reordering them to match bindings should not cause ABI issues, because the driver relies on names, not ordering. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 594a802e9429..2c540476a8be 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1870,23 +1870,23 @@ camss: camss@ca00000 { "ispif", "vfe0", "vfe1"; - interrupts = , - , - , - , + interrupts = , , , , + , + , + , , , ; - interrupt-names = "csiphy0", - "csiphy1", - "csiphy2", - "csid0", + interrupt-names = "csid0", "csid1", "csid2", "csid3", + "csiphy0", + "csiphy1", + "csiphy2", "ispif", "vfe0", "vfe1";