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 = ,