From patchwork Wed Nov 17 11:37:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12624403 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 659BAC433FE for ; Wed, 17 Nov 2021 11:38:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4670C63238 for ; Wed, 17 Nov 2021 11:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236864AbhKQLlJ (ORCPT ); Wed, 17 Nov 2021 06:41:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236826AbhKQLlG (ORCPT ); Wed, 17 Nov 2021 06:41:06 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92AB1C0613B9 for ; Wed, 17 Nov 2021 03:38:07 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id d24so4136052wra.0 for ; Wed, 17 Nov 2021 03:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gMYLE7J7LVl7QS6DrFMU1QSMUJ4cnRJy0GXYbQPzrx8=; b=sC6/Dflfo+sTcmb5PcuONQOWYtvJnwsWByTjsyjbOyH6Hr9IJEf4OPRiZB3uEhmF1C 2jYXvjkPuRPmCCppAkJb/F+I5fumMTn38NA2rwubHndhY/7yHV+P2ohAcUD4+v9oCGc2 +M9m3JV4KSWxCehRuIii7KkCNl3MDqZeOWWwO40dDA+QP1XAGOBdvoS27qr0xP/5c21D VD07Z1EPkbCAyqvhaO3UGmTj1fN6Svxr163LVLoOyFziKp3cFQ/VVkauo7V3qDIO5VYY YMiMF/QW3FJipY4XOVd6k35e7MQv1ev4khQCLaLsVLyPD0OLs1DflT0q1xfXs5U1Smb7 dqKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gMYLE7J7LVl7QS6DrFMU1QSMUJ4cnRJy0GXYbQPzrx8=; b=5Y+z3DJpol2eEBYegZKbuelQNll4kxtfCxmXxjrN/BKVX5A9VuTLTD72z0Yi0pMvcU dRVGURwf1gZzKySyZHVlgaaqqZ8Nyhf8UJNOmehNY6j/wA/sz+wbh0kV+QBAhm194T6H 6Uy+AyahxO2Ic/dZn8Qh/rLe3C37tElVCwjBXeIVLQ7TDPjq2LHTN8IciqamBWT3vnjN Q34pmvvIhdI2qyhcBVNyZMwwS06OsF17l+LhUUg8qog2dFdAPDriwTXq6M1LHpfUsHcn wbZ5xKX3dBGxjbRdBg5pH07MtXFqMzbyr/uTTmP3X59A94OOqgAHWWnajMKwHXL9OcCG lxPA== X-Gm-Message-State: AOAM532jXF799v/E4DDtISfnbghpQUcZHAHUO4YhrU4X6gPNbvsfXCPc rLJZcaqxNoyBiirvfbkuB8xLKg== X-Google-Smtp-Source: ABdhPJzbF8rzRC661mOYBQglms16yF+w+dO0Rnr9XJIESaVIbyugu6ZTCerJ5Sm/Sz9dzncfw9zOrg== X-Received: by 2002:a5d:6c6a:: with SMTP id r10mr19878937wrz.211.1637149085955; Wed, 17 Nov 2021 03:38:05 -0800 (PST) Received: from xps7590.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id t8sm6560453wmq.32.2021.11.17.03.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 03:38:05 -0800 (PST) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org, robh+dt@kernel.org, angelogioacchino.delregno@somainline.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Andrey Konovalov Subject: [PATCH v2 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Date: Wed, 17 Nov 2021 12:37:57 +0100 Message-Id: <20211117113800.260741-2-robert.foss@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211117113800.260741-1-robert.foss@linaro.org> References: <20211117113800.260741-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org QCOM ISPs do not support having a programmable CSI Clock Lane number. In order to accurately reflect this, the different CSIPHY HW versions need to have their own register layer for computing lane masks. Signed-off-by: Robert Foss --- .../qcom/camss/camss-csiphy-2ph-1-0.c | 19 +++++++++++++++-- .../qcom/camss/camss-csiphy-3ph-1-0.c | 17 ++++++++++++++- .../media/platform/qcom/camss/camss-csiphy.c | 21 +------------------ .../media/platform/qcom/camss/camss-csiphy.h | 7 +++++++ 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c index 30b454c369ab..cd4a8c369234 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c @@ -16,6 +16,7 @@ #define CAMSS_CSI_PHY_LNn_CFG2(n) (0x004 + 0x40 * (n)) #define CAMSS_CSI_PHY_LNn_CFG3(n) (0x008 + 0x40 * (n)) +#define CAMSS_CSI_PHY_LN_CLK 1 #define CAMSS_CSI_PHY_GLBL_RESET 0x140 #define CAMSS_CSI_PHY_GLBL_PWR_CFG 0x144 #define CAMSS_CSI_PHY_GLBL_IRQ_CMD 0x164 @@ -26,6 +27,19 @@ #define CAMSS_CSI_PHY_GLBL_T_INIT_CFG0 0x1ec #define CAMSS_CSI_PHY_T_WAKEUP_CFG0 0x1f4 +static u8 csiphy_get_lane_mask(struct csiphy_lanes_cfg *lane_cfg) +{ + u8 lane_mask; + int i; + + lane_mask = 1 << CAMSS_CSI_PHY_LN_CLK; + + for (i = 0; i < lane_cfg->num_data; i++) + lane_mask |= 1 << lane_cfg->data[i].pos; + + return lane_mask; +} + static void csiphy_hw_version_read(struct csiphy_device *csiphy, struct device *dev) { @@ -105,7 +119,7 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, for (i = 0; i <= c->num_data; i++) { if (i == c->num_data) - l = c->clk.pos; + l = CAMSS_CSI_PHY_LN_CLK; else l = c->data[i].pos; @@ -129,7 +143,7 @@ static void csiphy_lanes_disable(struct csiphy_device *csiphy, for (i = 0; i <= c->num_data; i++) { if (i == c->num_data) - l = c->clk.pos; + l = CAMSS_CSI_PHY_LN_CLK; else l = c->data[i].pos; @@ -167,6 +181,7 @@ static irqreturn_t csiphy_isr(int irq, void *dev) } const struct csiphy_hw_ops csiphy_ops_2ph_1_0 = { + .get_lane_mask = csiphy_get_lane_mask, .hw_version_read = csiphy_hw_version_read, .reset = csiphy_reset, .lanes_enable = csiphy_lanes_enable, diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c index e318c822ab04..cde6b3a10b9e 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c @@ -43,6 +43,7 @@ #define CSIPHY_3PH_LNn_CSI_LANE_CTRL15_SWI_SOT_SYMBOL 0xb8 #define CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(n) (0x800 + 0x4 * (n)) +#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7) #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B BIT(0) #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1) #define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(n) (0x8b0 + 0x4 * (n)) @@ -320,6 +321,19 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy, } } +static u8 csiphy_get_lane_mask(struct csiphy_lanes_cfg *lane_cfg) +{ + u8 lane_mask; + int i; + + lane_mask = CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE; + + for (i = 0; i < lane_cfg->num_data; i++) + lane_mask |= 1 << lane_cfg->data[i].pos; + + return lane_mask; +} + static void csiphy_lanes_enable(struct csiphy_device *csiphy, struct csiphy_config *cfg, s64 link_freq, u8 lane_mask) @@ -331,7 +345,7 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate); - val = BIT(c->clk.pos); + val = CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE; for (i = 0; i < c->num_data; i++) val |= BIT(c->data[i].pos * 2); @@ -397,6 +411,7 @@ static void csiphy_lanes_disable(struct csiphy_device *csiphy, } const struct csiphy_hw_ops csiphy_ops_3ph_1_0 = { + .get_lane_mask = csiphy_get_lane_mask, .hw_version_read = csiphy_hw_version_read, .reset = csiphy_reset, .lanes_enable = csiphy_lanes_enable, diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index 24eec16197e7..ac7e96e6b7cd 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -229,25 +229,6 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on) return 0; } -/* - * csiphy_get_lane_mask - Calculate CSI2 lane mask configuration parameter - * @lane_cfg - CSI2 lane configuration - * - * Return lane mask - */ -static u8 csiphy_get_lane_mask(struct csiphy_lanes_cfg *lane_cfg) -{ - u8 lane_mask; - int i; - - lane_mask = 1 << lane_cfg->clk.pos; - - for (i = 0; i < lane_cfg->num_data; i++) - lane_mask |= 1 << lane_cfg->data[i].pos; - - return lane_mask; -} - /* * csiphy_stream_on - Enable streaming on CSIPHY module * @csiphy: CSIPHY device @@ -261,7 +242,7 @@ static int csiphy_stream_on(struct csiphy_device *csiphy) { struct csiphy_config *cfg = &csiphy->cfg; s64 link_freq; - u8 lane_mask = csiphy_get_lane_mask(&cfg->csi2->lane_cfg); + u8 lane_mask = csiphy->ops->get_lane_mask(&cfg->csi2->lane_cfg); u8 bpp = csiphy_get_bpp(csiphy->formats, csiphy->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK].code); u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h index d71b8bc6ec00..1c14947f92d3 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -45,6 +45,13 @@ struct csiphy_config { struct csiphy_device; struct csiphy_hw_ops { + /* + * csiphy_get_lane_mask - Calculate CSI2 lane mask configuration parameter + * @lane_cfg - CSI2 lane configuration + * + * Return lane mask + */ + u8 (*get_lane_mask)(struct csiphy_lanes_cfg *lane_cfg); void (*hw_version_read)(struct csiphy_device *csiphy, struct device *dev); void (*reset)(struct csiphy_device *csiphy); From patchwork Wed Nov 17 11:37:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12624409 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BD9BC433F5 for ; Wed, 17 Nov 2021 11:38:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3686D63236 for ; Wed, 17 Nov 2021 11:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236896AbhKQLlS (ORCPT ); Wed, 17 Nov 2021 06:41:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236833AbhKQLlH (ORCPT ); Wed, 17 Nov 2021 06:41:07 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4E68C061570 for ; Wed, 17 Nov 2021 03:38:08 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id r9-20020a7bc089000000b00332f4abf43fso3618014wmh.0 for ; Wed, 17 Nov 2021 03:38:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IdJJhrRpftq1m7Kk3EVMrUIrSaR2a6rKnBgshEFLV04=; b=AorhigbMRmR7TtkdU9V6oaaA0Ye0DX6Dv8KPxUZA3c0wAOFPN2UaR4xV2dNES+WeVs 7iBwuPze3kROm13PhuPhIw5wmo9wCa+6pmbofqe7fSQDyljkrS+ZvZrs4OGCiGU9tq/x kQtYS8phMERh2D0Nx/IYhUmiKXdwPhb9ItycWe4jykVwfjuq1lXdlU6bs8EAYiHkN/5E hB1tcsIprWU/rGP6MBES4kIlsW2NyIgwlwOPVRdyUgLPeOab9uh5X6blrBCsQqZtqKkb 0ddQ/Onuu8QuInTdNFGeX0eCIMCvhrTKCTFb5CsdDGZTJYA0SQu5BiQYyJY6jhwpUay/ B31w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IdJJhrRpftq1m7Kk3EVMrUIrSaR2a6rKnBgshEFLV04=; b=KZYozxPRH7BVwpbP0UGfsKBqtJTfoTGXBkr1UCpyZ6cqM7IF6axgeFx/YCWev37f1f 2jRcF0PdIXICRiosZBgxtcF1NrhQQTwyQnMa2yyGf4+WT45GvYir8FPUqgeMVdEX276z LJ+5lsiltk8lYC68aqg3RLg4zZ07TvjkgBQZI5REjvGJJjT+9HrHfiGnVPOxB6ELXwk5 7W5jujOV9xpM6Kagd25A4f2ZvuDqtc4EuhShYa9dW62H4hLu/abg2+A96xGMmMa4iXjq +FYwkcWIwrenEREVTJ2K/newF6N9DjnLn5s2Ft5JCeedyRQJON40b+r4K2ZeLg4DPf3K Rdew== X-Gm-Message-State: AOAM532mlaTTWDboExNrBsUNyz1zsMZYz2zC5+atStv25Yd8Z0PHGyaU fxKuay53YBmXOi3k+HKkDxiwAA== X-Google-Smtp-Source: ABdhPJz4pRR8W9YbDyuyDeE6HM9OOblvz8hpS/Zw1g41mngXTRvYFkAcwvQxgfgX30bxz8XdfMDiFQ== X-Received: by 2002:a05:600c:4982:: with SMTP id h2mr17126291wmp.4.1637149087464; Wed, 17 Nov 2021 03:38:07 -0800 (PST) Received: from xps7590.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id t8sm6560453wmq.32.2021.11.17.03.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 03:38:06 -0800 (PST) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org, robh+dt@kernel.org, angelogioacchino.delregno@somainline.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Andrey Konovalov Subject: [PATCH v2 2/4] media: dt-bindings: media: camss: Remove clock-lane property Date: Wed, 17 Nov 2021 12:37:58 +0100 Message-Id: <20211117113800.260741-3-robert.foss@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211117113800.260741-1-robert.foss@linaro.org> References: <20211117113800.260741-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The clock-lanes property is not programmable by the hardware, and as such it should not be exposed in the dt-binding. Signed-off-by: Robert Foss --- .../bindings/media/qcom,msm8916-camss.yaml | 10 ---------- .../bindings/media/qcom,msm8996-camss.yaml | 20 ------------------- .../bindings/media/qcom,sdm660-camss.yaml | 20 ------------------- .../bindings/media/qcom,sdm845-camss.yaml | 17 ---------------- 4 files changed, 67 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml b/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml index 304908072d72..12ec3e1ea869 100644 --- a/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml @@ -83,10 +83,6 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 1 - data-lanes: description: An array of physical data lanes indexes. @@ -99,7 +95,6 @@ properties: maxItems: 4 required: - - clock-lanes - data-lanes port@1: @@ -114,16 +109,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 1 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes reg: diff --git a/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml b/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml index 38be41e932f0..6aeb3d6d02d5 100644 --- a/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml @@ -105,10 +105,6 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: description: An array of physical data lanes indexes. @@ -121,7 +117,6 @@ properties: maxItems: 4 required: - - clock-lanes - data-lanes port@1: @@ -136,16 +131,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@2: @@ -160,16 +150,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@3: @@ -184,16 +169,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes reg: diff --git a/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml index 841a1aafdd13..338ab28d5f3b 100644 --- a/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml @@ -111,16 +111,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@1: @@ -135,16 +130,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@2: @@ -159,16 +149,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@3: @@ -183,16 +168,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes reg: diff --git a/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml index 9ca5dfa7f226..9404d6b9db54 100644 --- a/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml @@ -105,15 +105,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - maxItems: 1 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@1: @@ -128,16 +124,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - items: - - const: 7 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@2: @@ -152,15 +143,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - maxItems: 1 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes port@3: @@ -175,15 +162,11 @@ properties: unevaluatedProperties: false properties: - clock-lanes: - maxItems: 1 - data-lanes: minItems: 1 maxItems: 4 required: - - clock-lanes - data-lanes reg: From patchwork Wed Nov 17 11:37:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12624407 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5383C433EF for ; Wed, 17 Nov 2021 11:38:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB2B361BF5 for ; Wed, 17 Nov 2021 11:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235120AbhKQLlR (ORCPT ); Wed, 17 Nov 2021 06:41:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236847AbhKQLlI (ORCPT ); Wed, 17 Nov 2021 06:41:08 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F770C061208 for ; Wed, 17 Nov 2021 03:38:10 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id az33-20020a05600c602100b00333472fef04so4500505wmb.5 for ; Wed, 17 Nov 2021 03:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3Yj1E+7leUXuCLv33wLKqEaM7WfS5ZHoS6sCkflnwxs=; b=SMhMAYe8bLUcp5dWmlcj6BilmsccoCNaDkawsWLk/jQaRX2RJ2p0J6tgoqCsJGhTox t4J1O2R48iP7kXNh7vDOHP5D7ez6/4cLFSl4BQJbC9fR2oqG1Ku//MV17lU2ljGqbuUj SB+o0Y6ScsbN52w0crjBHl59SpDo0kGVspINZZGL+VyiTeoeaOKzCD+rOIfx4UN4/q30 CWNoYqWGeaGZAFA/B6gzI/xpFwnTUcVJt0tjKs37cQaoX5YreqL5iPkezjeJ348nbdAl W2oU5e4zGFh0Z6EwiAFONoy1b2WmhIwbSKF5OVczNzV5GaTfJ0vu+vGSScaa/Qq0MnhO i7Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Yj1E+7leUXuCLv33wLKqEaM7WfS5ZHoS6sCkflnwxs=; b=3eDiNBYOwsA4JCpugVma3JP/G/hv3ivFU6cqvEtf4UChC/BuIg9HUu/8qmBM9nQho/ HYb8E62dvoJUL0YngzhjURz81r9q7M7HRz0UUp5h7I5DR0SvF1uHhFldDKimsgs+swnt yZ4Br0RHvlGgZcuxkvnr0s8SjW4ZQMQF8vIHq0LBOcb73qednTNBEbcga5rccg1fcefe EMgOL9jXcCLflRa9LunovFqJGXQj3wuVo+pmWsAN8dtWI8p6HO1+neDdxo8L/Oa2nbrb seby2IyuRJAwot/ZBU657CeNpomolhM1VqNDeldQow03EkJZEUDmWqD95cbAMRDohbOr 5/WA== X-Gm-Message-State: AOAM530yfzLuBAEwXMvCok5rHTgaPwmT2FmZwbCoUg4bld4CB94Wgynp Q32gSlJ3CW3X7vJFXzfhAc2NOQ== X-Google-Smtp-Source: ABdhPJyaLzUnAjPg9EjuinF1Qv7XY8txM/DgNF7EjNWsZbhWJZVHeG/n7+4frZw0kBAjF+Lnri77TA== X-Received: by 2002:a7b:c4c4:: with SMTP id g4mr16396171wmk.93.1637149088633; Wed, 17 Nov 2021 03:38:08 -0800 (PST) Received: from xps7590.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id t8sm6560453wmq.32.2021.11.17.03.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 03:38:08 -0800 (PST) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org, robh+dt@kernel.org, angelogioacchino.delregno@somainline.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Andrey Konovalov Subject: [PATCH v2 3/4] arm64: dts: qcom: msm8916: Remove clock-lanes property from &camss node Date: Wed, 17 Nov 2021 12:37:59 +0100 Message-Id: <20211117113800.260741-4-robert.foss@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211117113800.260741-1-robert.foss@linaro.org> References: <20211117113800.260741-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The clock-lanes property is no longer used as it is not programmable by the CSIPHY hardware block of Qcom ISPs and should be removed. Signed-off-by: Robert Foss --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index f8d8f3e3664e..faf86ce165a8 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -248,7 +248,6 @@ ports { port@0 { reg = <0>; csiphy0_ep: endpoint { - clock-lanes = <1>; data-lanes = <0 2>; remote-endpoint = <&ov5640_ep>; status = "okay"; @@ -284,7 +283,6 @@ camera_rear@3b { port { ov5640_ep: endpoint { - clock-lanes = <1>; data-lanes = <0 2>; remote-endpoint = <&csiphy0_ep>; }; From patchwork Wed Nov 17 11:38:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12624405 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47028C4167D for ; Wed, 17 Nov 2021 11:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D56D6324A for ; Wed, 17 Nov 2021 11:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236836AbhKQLlL (ORCPT ); Wed, 17 Nov 2021 06:41:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235120AbhKQLlK (ORCPT ); Wed, 17 Nov 2021 06:41:10 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64B63C061766 for ; Wed, 17 Nov 2021 03:38:11 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id c4so4043226wrd.9 for ; Wed, 17 Nov 2021 03:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XyOjQunOpo2TS4TFjfja+I3SgK50zUH2kPWfXvVevW0=; b=D96vSlf+lsm5RcOTrab0sbR7/7wjR2DMnG92fryYaAbJrWg96DULGxRftLJ7b4qab0 4ZjdqzbE5YkymZ7fLTWXe9L1NBP1Dc6gjFI/6l61zQzc6sR7AFPYNX7JIdFyjxza/Rnl yXsCur2C0w4p1M8DCs51hSQGe7Hg0B4ie5AMQXSd9W7JuAhv8vJwqrLSwK5ER07nMd2v CjL8Eoi13G0V1vO3oPk16mb7xuy12XW+lZb01d6D/9ceAs0b9oFh/DmQVOFz9Li/lQwe b00ROcvijENFmFfcmW7V2TmbIUCqbmyVjwBbzhtb16ZhVhQoK7K4Y59gCwpxlrCVEezV 9sDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XyOjQunOpo2TS4TFjfja+I3SgK50zUH2kPWfXvVevW0=; b=M2YOUnwczHsLAEriTwtkkVddMINqB5WOpvT8IYXCQKVydStoE+tVrqenIuYg2QWviB /tyGQErwA4AZismR21RxlibGaYgaEXkWTOHSTLS8w1b53/6R4Ohy2hJtVmIAI/F+qmne RIegYr51OrKsSmffIkHFtaHORyTp1vzmCoYJLsxOs3J4/x9OJVAa1DPzC5hDAbXIDRZ5 Q5Ifg9AHor0HmEaPoC4ixug6v+DXid7UzQSuPsK17heASp+AqYp3taDiI/DGIoywm1i3 ezUidl6YRO7R/IceI5l3wFUW7607OTbEptiT8ioQ6SVfwC2ruGbGnxfK08fyaOIbvFag PFAg== X-Gm-Message-State: AOAM5327Q+ISQV+Z0uTxVOq2Y++cyVup73UpMeZSsPSJXWjQvC/LL1nJ SPgTVEzzwe1NUwwXkdweuqig4A== X-Google-Smtp-Source: ABdhPJxyMbNrrS7ybS4Euxd0IGlcdzgUJ/5eUgoA6UGuz09w0vFXJPSB8JRJEaPT61mVbGW9QLDoVw== X-Received: by 2002:a5d:4cd1:: with SMTP id c17mr19272427wrt.31.1637149089870; Wed, 17 Nov 2021 03:38:09 -0800 (PST) Received: from xps7590.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id t8sm6560453wmq.32.2021.11.17.03.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 03:38:09 -0800 (PST) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org, robh+dt@kernel.org, angelogioacchino.delregno@somainline.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Andrey Konovalov Subject: [PATCH v2 4/4] arm64: dts: qcom: sdm845-db845c: Remove clock-lanes property from &camss node Date: Wed, 17 Nov 2021 12:38:00 +0100 Message-Id: <20211117113800.260741-5-robert.foss@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211117113800.260741-1-robert.foss@linaro.org> References: <20211117113800.260741-1-robert.foss@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The clock-lanes property is no longer used as it is not programmable by the CSIPHY hardware block of Qcom ISPs and should be removed. Signed-off-by: Robert Foss --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 2d5533dd4ec2..0ac084f2f926 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1119,7 +1119,6 @@ ports { port@0 { reg = <0>; csiphy0_ep: endpoint { - clock-lanes = <7>; data-lanes = <0 1 2 3>; remote-endpoint = <&ov8856_ep>; }; @@ -1160,7 +1159,6 @@ camera@10 { port { ov8856_ep: endpoint { - clock-lanes = <1>; link-frequencies = /bits/ 64 <360000000 180000000>; data-lanes = <1 2 3 4>; @@ -1205,7 +1203,6 @@ camera@60 { port { ov7251_ep: endpoint { - clock-lanes = <1>; data-lanes = <0 1>; // remote-endpoint = <&csiphy3_ep>; };