From patchwork Wed Nov 16 16:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 625981 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 3E043C433FE for ; Wed, 16 Nov 2022 16:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234737AbiKPQgF (ORCPT ); Wed, 16 Nov 2022 11:36:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233325AbiKPQfe (ORCPT ); Wed, 16 Nov 2022 11:35:34 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F24085B59C for ; Wed, 16 Nov 2022 08:28:07 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id j15so30800683wrq.3 for ; Wed, 16 Nov 2022 08:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w9qHD2IlY8HDaN9Np6/rFRle6GqA3vYAg1s62WKFjkM=; b=COAZcUAYfTWSVH8kk6tXeN3WUHw4vgBo7fuFefw4wP72pYk2VIZIpM6X2CLI5rXX+C 2hVIhnNPFl+7zr9N3QPyx89Nt1KNxDiiTzY7XCeS28KJYfPKmDzhzDmtBq44ZJDFwBTp n/zhY/54CgiIWFSKFTwyc9EypSo0WiqXbxmXfTmRrtf27Wm+Lex6R6dGu0ec9TTlGIE4 fQUct3Ss3GUYBo9jFrNQGiPv9tD2jKgNBFqHxK2bYe9gnu01o66ygovgor9qfJRJsOQW uNNBgdWuN8qSaoKcAsQzJcQF36Ok+1hP97h1b48ci2aHaYkAd0NbljMS/yVC8R1U1yYQ cW6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w9qHD2IlY8HDaN9Np6/rFRle6GqA3vYAg1s62WKFjkM=; b=ObuI6WeA+UJonrvwUDxJMZ+/MYb5r2d9CFthjsELMzzDfwKQ52SMN2KRgo+rb3bHkF 2M+wm+cr34+RuB4A8X/vz+n011nMyxzqNkQB/NZ9AFbPe8SAWrrGRIqzsGKvl7fAriD0 DnmmtZmzNvhnb8Qaen8P8vYzvK5VxTRf8v4kmD2oUJBqvbQ5VoJh8NQfqNF+wvQY6BB8 NPjc/EY60x/PziMGczAH0eVC8WDaNXmuyXBYfpzmVKwn9RkBCMqlrCtD5lrVhn63FRAG loIJ75628dZKF/JK503CeNROIVQe5CF8k1IV5HUkqSHy+6vkk8ILfxiwrHu0iijKZzXC 5+Cg== X-Gm-Message-State: ANoB5pl6Xau1EMqt7XDiRVLN83lv7bnfDcfl+l91vpWwPBiw/+sByzfH 7z996HsBBRmXL9zUl09J7K2HAw== X-Google-Smtp-Source: AA0mqf7gLFmA+Luc3GP1ks5uoTyYHqk/bPEKSZ8ppyDjOQQ4amQt5jRn+X5OeSV6hfjgAV4T5bpXuw== X-Received: by 2002:a5d:4fce:0:b0:22e:4704:d042 with SMTP id h14-20020a5d4fce000000b0022e4704d042mr14270753wrw.547.1668616086587; Wed, 16 Nov 2022 08:28:06 -0800 (PST) Received: from localhost.localdomain (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm15459168wro.69.2022.11.16.08.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:28:06 -0800 (PST) From: Bryan O'Donoghue To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@somainline.org, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, dmitry.baryshkov@linaro.org, vladimir.zapolskiy@linaro.org Cc: sakari.ailus@iki.fi, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, quic_mmitkov@quicinc.com, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Bryan O'Donoghue Subject: [PATCH v6 1/7] arm64: dts: qcom: sdm845: Define the number of available ports Date: Wed, 16 Nov 2022 16:27:55 +0000 Message-Id: <20221116162801.546737-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116162801.546737-1-bryan.odonoghue@linaro.org> References: <20221116162801.546737-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The number of available ports is SoC specific so we should define it in the SoC dtsi. For the case of the sdm845 that is 4 CSI PHYs => four ports. Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 1a257f6728874..29e6d64e74c97 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4368,6 +4368,22 @@ camss: camss@a00000 { ports { #address-cells = <1>; #size-cells = <0>; + + port@0 { + reg = <0>; + }; + + port@1 { + reg = <1>; + }; + + port@2 { + reg = <2>; + }; + + port@3 { + reg = <3>; + }; }; }; From patchwork Wed Nov 16 16:27:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 625980 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 32452C43217 for ; Wed, 16 Nov 2022 16:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232584AbiKPQgK (ORCPT ); Wed, 16 Nov 2022 11:36:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233981AbiKPQfh (ORCPT ); Wed, 16 Nov 2022 11:35:37 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF0C35B595 for ; Wed, 16 Nov 2022 08:28:09 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id k8so30800544wrh.1 for ; Wed, 16 Nov 2022 08:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hcJ7ckAKj+TSphLa5849tAwMuokA6a0ep+HYiPX+3Ow=; b=oHrKRxA04iAj9pCWnrSypLG0zSX8qs7AKEP1cV75mt845OUgUPjn98qqiZV+wZVp5K 1RqwZNTolKt05H9r06VS3GOFABjlUkuuV0mBP4HU3XH6Jk/arfQWUxmVWpysL7KzEQXD JOWuyVzValnVzqawhEUZGPtMItgQTgJQMpYbTkFYAb4h7i0GKzlW23wagsFE0eT7c199 NRkWI1i1FEmw6mkXmcPBbnAvVjUyPNQl8xfEFhaeH73bsd8qacILFUF6KUadGI93XYCo qs+JRHAWnDMgAoqH6Eo6uPWVmKZHds+NwuCWgGqKF5a5foV44suoQql+OFxiJIXGZjWA t1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hcJ7ckAKj+TSphLa5849tAwMuokA6a0ep+HYiPX+3Ow=; b=shomRWbjyzkgo4VJbrI9UuRh84wijJN9rmSPoYPN7afWgLKIzY65XDUFcp5S4a58uj PBzBazkIhe+7NmVoVr8axXVP1tQvqlAOjBdp3Qft9JUa+Q1CAFaj0PiJrreSFmz81Weh tySjEqpAwHvw3ofV2tFQJW0RaQdda9pi8HwNzG3XOcYXdU2+2kHUHMq9Homhmre5DAJD GI8JdWrXBR95Cq0ZPNxDzlqi2NobyErf3JOfb1UkGCk++cb+a/8WgazriZwfsrPaN/Vw RLBPga12oOoOtCe6bRNfMhGoSgA5NLzxBkl/Gw5kBifjcyziLd9iuLmuICqR2aTdLfHw S60g== X-Gm-Message-State: ANoB5plucLHGKaVXtJHvzhZMFET5BgPMbsmn0hMjMbTc56D61hHdw2TL uH10DRbFIv1mhctK5TWpSsHfGw== X-Google-Smtp-Source: AA0mqf4Y4K/3mnENkTauwej3hcP2V4HHKRPFC1ohXK+hhIDxruJ77ArB06OzOzGTiAFnogCyEUdnHQ== X-Received: by 2002:adf:fc8f:0:b0:22e:362e:570a with SMTP id g15-20020adffc8f000000b0022e362e570amr13591485wrr.127.1668616088209; Wed, 16 Nov 2022 08:28:08 -0800 (PST) Received: from localhost.localdomain (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm15459168wro.69.2022.11.16.08.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:28:07 -0800 (PST) From: Bryan O'Donoghue To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@somainline.org, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, dmitry.baryshkov@linaro.org, vladimir.zapolskiy@linaro.org Cc: sakari.ailus@iki.fi, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, quic_mmitkov@quicinc.com, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Bryan O'Donoghue , Konrad Dybcio Subject: [PATCH v6 2/7] arm64: dts: qcom: sdm845-db845c: Drop redundant address-cells, size-cells declaration Date: Wed, 16 Nov 2022 16:27:56 +0000 Message-Id: <20221116162801.546737-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116162801.546737-1-bryan.odonoghue@linaro.org> References: <20221116162801.546737-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org sdm845.dtsi camss already defines the address-cells and size-cells for camss, no need to replicate in sdm845-db845c.dts. Reported-by: Konrad Dybcio Reviewed-by: Laurent Pinchart Reviewed-by: Konrad Dybcio Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 3e7ceb0861eb0..7c88312333c22 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1185,8 +1185,6 @@ &camss { status = "ok"; ports { - #address-cells = <1>; - #size-cells = <0>; port@0 { reg = <0>; csiphy0_ep: endpoint { From patchwork Wed Nov 16 16:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 625979 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 36D02C3E8A8 for ; Wed, 16 Nov 2022 16:36:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233604AbiKPQgN (ORCPT ); Wed, 16 Nov 2022 11:36:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233781AbiKPQfp (ORCPT ); Wed, 16 Nov 2022 11:35:45 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B92E65B5B8 for ; Wed, 16 Nov 2022 08:28:12 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id o4so30644417wrq.6 for ; Wed, 16 Nov 2022 08:28:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yWW8UuJ/BxO4nM6TqB3D45Z5tX0e7fD6LJhIzNErQBY=; b=vUIg21SbI5gEsFyKjUoQ70p3/hG7WZgAUgZXVuGDUErgNPrDEHQljxv9JlsvtrYdNh uwUngRX/5KyYEMJJ3UUCnBBXmtBvaEFGeCVlwCfwBVSwaI/JUTPs6q/5xRIp4By6eR3t AYqIVDy7yvzep074HC1lBUItW5TCAR6J0fesZxvhlM4juio+wTuV6ecJnSjaVjhwh1lE T7HOD+bCAqMs3/N0Vj/9/iSRzlL4f5mlPqaSBU0jRgHjLKEJokzWXWg6oBt059bj2r37 8vep+2GwwXcHEt9jnudHJ/u2pjs1wxW4Z0w2ykyq/k+PFDgOjshKe+Ej+I5mH+dM+T3y f3Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yWW8UuJ/BxO4nM6TqB3D45Z5tX0e7fD6LJhIzNErQBY=; b=b3uDag7J/f1TW0uLv0gT2AHQYfCLjCPZuZ6TfiOLnuX94ZWERbiovSb9j+7dA0KUU+ tLSTIrvdLt3E1ZR8x/VGnzeZvmT08K8lHTXf4fujVofrwN2QsqCiKro146mafpxI3dQg qY5heDGhHQ+YTmloVw3JbiqeyUixKom1pBzL+NbSO+6qMmWPmSQ2WAEFgPgynUbvzbw+ x/peAjcv5UM75z26QNDqveZx8jz4fC87Uo3yAzQ+ggSTxw4JJHbcUzWmKlpNbtO2VF9N pXk7NdCcN1etmtcwKXBsV9VO3kdezGW/TODWcJKXcl4nxIvomLs4yVG8jxN/z5UzQLdH A+jw== X-Gm-Message-State: ANoB5plTjlFWE5hUiFSmKykruLim+a+UwbiVAw6Xh3fydRD+nBy2LHNd xPPsRmQWcllXwIgADxtechhEOg== X-Google-Smtp-Source: AA0mqf6/naCGwIE/WeeM0zdUGT267gBJhJCx1AQzGwkyA5dZ3qKhZ7JqHf3TdFV3AkPHYCGC/C270A== X-Received: by 2002:adf:f650:0:b0:236:e271:ead4 with SMTP id x16-20020adff650000000b00236e271ead4mr13954591wrp.426.1668616092320; Wed, 16 Nov 2022 08:28:12 -0800 (PST) Received: from localhost.localdomain (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm15459168wro.69.2022.11.16.08.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:28:11 -0800 (PST) From: Bryan O'Donoghue To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@somainline.org, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, dmitry.baryshkov@linaro.org, vladimir.zapolskiy@linaro.org Cc: sakari.ailus@iki.fi, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, quic_mmitkov@quicinc.com, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Bryan O'Donoghue Subject: [PATCH v6 5/7] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add navigation mezzanine dts Date: Wed, 16 Nov 2022 16:27:59 +0000 Message-Id: <20221116162801.546737-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116162801.546737-1-bryan.odonoghue@linaro.org> References: <20221116162801.546737-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Move the dts data for the rb3 navigation mezzanine into its own dts file. Suggested-by: Dmitry Baryshkov Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../sdm845-db845c-navigation-mezzanine.dts | 104 ++++++++++++++++++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 96 ---------------- 3 files changed, 105 insertions(+), 96 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index afe496a93f945..4c81c1ee7f7c7 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -132,6 +132,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb +dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c-navigation-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyln.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyp.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-mtp.dtb diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts new file mode 100644 index 0000000000000..a21caa6f3fa25 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts @@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022, Linaro Ltd. + */ + +/dts-v1/; + +#include "sdm845-db845c.dts" + +&camss { + vdda-phy-supply = <&vreg_l1a_0p875>; + vdda-pll-supply = <&vreg_l26a_1p2>; + + status = "okay"; + + ports { + port@0 { + csiphy0_ep: endpoint { + data-lanes = <0 1 2 3>; + remote-endpoint = <&ov8856_ep>; + }; + }; + }; +}; + +&cci { + status = "okay"; +}; + +&cci_i2c0 { + camera@10 { + compatible = "ovti,ov8856"; + reg = <0x10>; + + /* CAM0_RST_N */ + reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_default>; + + clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; + clock-names = "xvclk"; + clock-frequency = <19200000>; + + /* + * The &vreg_s4a_1p8 trace is powered on as a, + * so it is represented by a fixed regulator. + * + * The 2.8V vdda-supply and 1.2V vddd-supply regulators + * both have to be enabled through the power management + * gpios. + */ + dovdd-supply = <&vreg_lvs1a_1p8>; + avdd-supply = <&cam0_avdd_2v8>; + dvdd-supply = <&cam0_dvdd_1v2>; + + port { + ov8856_ep: endpoint { + link-frequencies = /bits/ 64 + <360000000 180000000>; + data-lanes = <1 2 3 4>; + remote-endpoint = <&csiphy0_ep>; + }; + }; + }; +}; + +&cci_i2c1 { + camera@60 { + compatible = "ovti,ov7251"; + + /* I2C address as per ov7251.txt linux documentation */ + reg = <0x60>; + + /* CAM3_RST_N */ + enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam3_default>; + + clocks = <&clock_camcc CAM_CC_MCLK3_CLK>; + clock-names = "xclk"; + clock-frequency = <24000000>; + + /* + * The &vreg_s4a_1p8 trace always powered on. + * + * The 2.8V vdda-supply regulator is enabled when the + * vreg_s4a_1p8 trace is pulled high. + * It too is represented by a fixed regulator. + * + * No 1.2V vddd-supply regulator is used. + */ + vdddo-supply = <&vreg_lvs1a_1p8>; + vdda-supply = <&cam3_avdd_2v8>; + + status = "disabled"; + + port { + ov7251_ep: endpoint { + data-lanes = <0 1>; +/* remote-endpoint = <&csiphy3_ep>; */ + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index be946f71666bc..f41c6d600ea8c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1174,102 +1174,6 @@ &pm8998_gpio { }; -&cci { - status = "okay"; -}; - -&camss { - vdda-phy-supply = <&vreg_l1a_0p875>; - vdda-pll-supply = <&vreg_l26a_1p2>; - - status = "okay"; - - ports { - port@0 { - csiphy0_ep: endpoint { - data-lanes = <0 1 2 3>; - remote-endpoint = <&ov8856_ep>; - }; - }; - }; -}; - -&cci_i2c0 { - camera@10 { - compatible = "ovti,ov8856"; - reg = <0x10>; - - /* CAM0_RST_N */ - reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&cam0_default>; - - clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; - clock-names = "xvclk"; - clock-frequency = <19200000>; - - /* - * The &vreg_s4a_1p8 trace is powered on as a, - * so it is represented by a fixed regulator. - * - * The 2.8V vdda-supply and 1.2V vddd-supply regulators - * both have to be enabled through the power management - * gpios. - */ - dovdd-supply = <&vreg_lvs1a_1p8>; - avdd-supply = <&cam0_avdd_2v8>; - dvdd-supply = <&cam0_dvdd_1v2>; - - port { - ov8856_ep: endpoint { - link-frequencies = /bits/ 64 - <360000000 180000000>; - data-lanes = <1 2 3 4>; - remote-endpoint = <&csiphy0_ep>; - }; - }; - }; -}; - -&cci_i2c1 { - camera@60 { - compatible = "ovti,ov7251"; - - /* I2C address as per ov7251.txt linux documentation */ - reg = <0x60>; - - /* CAM3_RST_N */ - enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&cam3_default>; - - clocks = <&clock_camcc CAM_CC_MCLK3_CLK>; - clock-names = "xclk"; - clock-frequency = <24000000>; - - /* - * The &vreg_s4a_1p8 trace always powered on. - * - * The 2.8V vdda-supply regulator is enabled when the - * vreg_s4a_1p8 trace is pulled high. - * It too is represented by a fixed regulator. - * - * No 1.2V vddd-supply regulator is used. - */ - vdddo-supply = <&vreg_lvs1a_1p8>; - vdda-supply = <&cam3_avdd_2v8>; - - status = "disabled"; - - port { - ov7251_ep: endpoint { - data-lanes = <0 1>; -/* remote-endpoint = <&csiphy3_ep>; */ - }; - }; - }; -}; - /* PINCTRL - additions to nodes defined in sdm845.dtsi */ &qup_spi0_default { config { From patchwork Wed Nov 16 16:28:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 625978 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 497D9C4332F for ; Wed, 16 Nov 2022 16:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233576AbiKPQgR (ORCPT ); Wed, 16 Nov 2022 11:36:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234790AbiKPQfw (ORCPT ); Wed, 16 Nov 2022 11:35:52 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5AC85B860 for ; Wed, 16 Nov 2022 08:28:16 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id y16so30763117wrt.12 for ; Wed, 16 Nov 2022 08:28:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1WF300EU75fh/D+zJwC6uFdTZaSLOdy68f/rlMixUCU=; b=yn5Y+1YV/H9FBLh1VwUXO2aa2ngHoRoQwaIOQ+FLuC7zGe+OcAQRoBV78bLl9+Yptf r4JhKB/fCzYzCZIMJtNcfUVt+aNhbCVVvxAEv/s8UU00/24BaotnZY6gSHwIYT1GiOEy i6FnuyNSaeL6/Qg37Hr8ObRRD1tN1llUR6RCf8NIksHurz81hJ5/8OIniSCTdDPxIePH X/NIEBUUqlA7aGBi/89Wa/N49TWAwFp/LBkK7vjks5rc9qHX9MrdITDFWMCVCXZhnCTO jQepiXD5BR1oNNkb/sVuax03gwkS0ZYJJs70hcmiicduLvrBY2e3wdGb786cG4jZogFD /Wmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1WF300EU75fh/D+zJwC6uFdTZaSLOdy68f/rlMixUCU=; b=XXSeqBrQlrbeU+sTUB2piBfubA77DnwWD3/EMk5fgJFtILzz3aHDBSxfVPP53EZZFC cKh4UhDXDpTm6FpQnIUdLrZQJ095GQj7vmH/HNDtnmDy3ZWC5OyeLuNRbY+m3rZdD7KP bZXtAkKTS26DPdCYG4JOafj2WABdOcBePcXXp6JYIESsSf93v90ivVQHLl2n7GdsLTd/ uSavfbU8UFhCNuFU9DAy+tQ8EXarbyWX+WCARIt4BvvNQaUQ79budsxTMeHvS2IkbtZa wM63f27XezrwaJLldWjQpKJyHYQqSzzyktSmfSI2211QYuQ1+qMnSHkxNDA9IqBzc4Hg 2jqA== X-Gm-Message-State: ANoB5pnQbsZN5Msv8Xzw4WRA7XgEI1JGqknpu2ptALB5ZXZLdopHFvOa x0H9qxGJ7CxPAcGAZFru7AMl8Q== X-Google-Smtp-Source: AA0mqf7pcKuoWVfuNUeyeB4WnVzSRlF0Ldd5rkStoP3LPtgjBWiCZPcrfiVuB3dwFUC4MWAlGpScuA== X-Received: by 2002:a5d:4107:0:b0:22e:3e28:f8db with SMTP id l7-20020a5d4107000000b0022e3e28f8dbmr14606449wrp.380.1668616095404; Wed, 16 Nov 2022 08:28:15 -0800 (PST) Received: from localhost.localdomain (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm15459168wro.69.2022.11.16.08.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:28:14 -0800 (PST) From: Bryan O'Donoghue To: robert.foss@linaro.org, todor.too@gmail.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@somainline.org, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, dmitry.baryshkov@linaro.org, vladimir.zapolskiy@linaro.org Cc: sakari.ailus@iki.fi, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, quic_mmitkov@quicinc.com, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Bryan O'Donoghue Subject: [PATCH v6 7/7] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add vision mezzanine Date: Wed, 16 Nov 2022 16:28:01 +0000 Message-Id: <20221116162801.546737-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116162801.546737-1-bryan.odonoghue@linaro.org> References: <20221116162801.546737-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The Vision Mezzanine for the RB5 ships with an imx577 and ov9282 populated. Other sensors and components may be added or stacked with additional mezzanines. Enable the IMX577 on the vision mezzanine. An example media-ctl pipeline for the imx577 is: media-ctl --reset media-ctl -v -d /dev/media0 -V '"imx577 '22-001a'":0[fmt:SRGGB10/4056x3040 field:none]' media-ctl -V '"msm_csiphy2":0[fmt:SRGGB10/4056x3040]' media-ctl -V '"msm_csid0":0[fmt:SRGGB10/4056x3040]' media-ctl -V '"msm_vfe0_rdi0":0[fmt:SRGGB10/4056x3040]' media-ctl -l '"msm_csiphy2":1->"msm_csid0":0[1]' media-ctl -l '"msm_csid0":1->"msm_vfe0_rdi0":0[1]' yavta -B capture-mplane -c -I -n 5 -f SRGGB10P -s 4056x3040 -F /dev/video0 Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../dts/qcom/qrb5165-rb5-vision-mezzanine.dts | 62 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sm8250.dtsi | 33 ++++++++++ 3 files changed, 96 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 4c81c1ee7f7c7..f5a76ec8a85e0 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -54,6 +54,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb +dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5-vision-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts new file mode 100644 index 0000000000000..ac3ccab2da35e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022, Linaro Ltd. + */ + +/dts-v1/; + +#include "qrb5165-rb5.dts" + +&camcc { + status = "okay"; +}; + +&camss { + status = "okay"; + vdda-phy-supply = <&vreg_l5a_0p88>; + vdda-pll-supply = <&vreg_l9a_1p2>; + + ports { + /* The port index denotes CSIPHY id i.e. csiphy2 */ + port@2 { + csiphy2_ep: endpoint { + clock-lanes = <7>; + data-lanes = <0 1 2 3>; + remote-endpoint = <&imx577_ep>; + }; + }; + }; +}; + +&cci1 { + status = "okay"; +}; + +&cci1_i2c0 { + camera@1a { + compatible = "sony,imx577"; + reg = <0x1a>; + + reset-gpios = <&tlmm 78 GPIO_ACTIVE_LOW>; + pinctrl-names = "default", "suspend"; + pinctrl-0 = <&cam2_default>; + pinctrl-1 = <&cam2_suspend>; + + clocks = <&camcc CAM_CC_MCLK2_CLK>; + assigned-clocks = <&camcc CAM_CC_MCLK2_CLK>; + assigned-clock-rates = <24000000>; + + dovdd-supply = <&vreg_l7f_1p8>; + avdd-supply = <&vdc_5v>; + dvdd-supply = <&vdc_5v>; + + port { + imx577_ep: endpoint { + clock-lanes = <1>; + link-frequencies = /bits/ 64 <600000000>; + data-lanes = <1 2 3 4>; + remote-endpoint = <&csiphy2_ep>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 806aa19ad93ce..d37694342b53f 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -3822,6 +3822,39 @@ tlmm: pinctrl@f100000 { gpio-ranges = <&tlmm 0 0 181>; wakeup-parent = <&pdc>; + cam2_default: cam2-default-state { + rst-pins { + pins = "gpio78"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + mclk-pins { + pins = "gpio96"; + function = "cam_mclk"; + drive-strength = <16>; + bias-disable; + }; + }; + + cam2_suspend: cam2-suspend-state { + rst-pins { + pins = "gpio78"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + output-low; + }; + + mclk-pins { + pins = "gpio96"; + function = "cam_mclk"; + drive-strength = <2>; + bias-disable; + }; + }; + cci0_default: cci0-default-state { cci0_i2c0_default: cci0-i2c0-default-pins { /* SDA, SCL */