* [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS
@ 2021-11-18 12:48 Robert Foss
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Robert Foss @ 2021-11-18 12:48 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, Bryan O'Donoghue, Andrey Konovalov,
Stephan Gerhold
Changes since v2:
- Stephan: Rebased on v5.16-rc1
- Stephan: Fixed 3/4 commit message title
Changes since v1:
- Rob: Instead of documenting and fixing the use of the clock-lanes
property, remove it, since it is is not programmable and
therefore shouldn't be exposed in the DT.
Robert Foss (4):
media: camss: csiphy: Move to hardcode CSI Clock Lane number
media: dt-bindings: media: camss: Remove clock-lane property
arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss
node
arm64: dts: qcom: sdm845-db845c: Remove clock-lanes property from
&camss node
.../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 ---------------
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 --
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 3 ---
.../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 +++++++
10 files changed, 41 insertions(+), 95 deletions(-)
--
2.32.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number
2021-11-18 12:48 [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS Robert Foss
@ 2021-11-18 12:48 ` Robert Foss
2021-11-19 4:01 ` Bjorn Andersson
2021-12-06 15:04 ` Bjorn Andersson
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
` (2 subsequent siblings)
3 siblings, 2 replies; 13+ messages in thread
From: Robert Foss @ 2021-11-18 12:48 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, Bryan O'Donoghue, Andrey Konovalov,
Stephan Gerhold
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 <robert.foss@linaro.org>
---
.../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);
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property
2021-11-18 12:48 [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS Robert Foss
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
@ 2021-11-18 12:48 ` Robert Foss
2021-11-19 4:05 ` Bjorn Andersson
` (2 more replies)
2021-11-18 12:48 ` [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node Robert Foss
2021-11-18 12:48 ` [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: " Robert Foss
3 siblings, 3 replies; 13+ messages in thread
From: Robert Foss @ 2021-11-18 12:48 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, Bryan O'Donoghue, Andrey Konovalov,
Stephan Gerhold
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 <robert.foss@linaro.org>
---
.../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:
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node
2021-11-18 12:48 [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS Robert Foss
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
@ 2021-11-18 12:48 ` Robert Foss
2021-12-06 15:06 ` Bjorn Andersson
2021-11-18 12:48 ` [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: " Robert Foss
3 siblings, 1 reply; 13+ messages in thread
From: Robert Foss @ 2021-11-18 12:48 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, Bryan O'Donoghue, Andrey Konovalov,
Stephan Gerhold
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 <robert.foss@linaro.org>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index a5320d6d30e7..b7a578aafcbb 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -253,7 +253,6 @@ ports {
port@0 {
reg = <0>;
csiphy0_ep: endpoint {
- clock-lanes = <1>;
data-lanes = <0 2>;
remote-endpoint = <&ov5640_ep>;
status = "okay";
@@ -289,7 +288,6 @@ camera_rear@3b {
port {
ov5640_ep: endpoint {
- clock-lanes = <1>;
data-lanes = <0 2>;
remote-endpoint = <&csiphy0_ep>;
};
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: Remove clock-lanes property from &camss node
2021-11-18 12:48 [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS Robert Foss
` (2 preceding siblings ...)
2021-11-18 12:48 ` [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node Robert Foss
@ 2021-11-18 12:48 ` Robert Foss
2021-12-06 15:07 ` Bjorn Andersson
3 siblings, 1 reply; 13+ messages in thread
From: Robert Foss @ 2021-11-18 12:48 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, Bryan O'Donoghue, Andrey Konovalov,
Stephan Gerhold
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 <robert.foss@linaro.org>
---
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 13f80a0b6faa..2cf4b932aee2 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1125,7 +1125,6 @@ ports {
port@0 {
reg = <0>;
csiphy0_ep: endpoint {
- clock-lanes = <7>;
data-lanes = <0 1 2 3>;
remote-endpoint = <&ov8856_ep>;
};
@@ -1166,7 +1165,6 @@ camera@10 {
port {
ov8856_ep: endpoint {
- clock-lanes = <1>;
link-frequencies = /bits/ 64
<360000000 180000000>;
data-lanes = <1 2 3 4>;
@@ -1211,7 +1209,6 @@ camera@60 {
port {
ov7251_ep: endpoint {
- clock-lanes = <1>;
data-lanes = <0 1>;
// remote-endpoint = <&csiphy3_ep>;
};
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
@ 2021-11-19 4:01 ` Bjorn Andersson
2021-12-06 15:04 ` Bjorn Andersson
1 sibling, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2021-11-19 4:01 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 06:48 CST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> .../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);
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
@ 2021-11-19 4:05 ` Bjorn Andersson
2021-11-29 0:21 ` Rob Herring
2021-12-06 15:05 ` Bjorn Andersson
2 siblings, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2021-11-19 4:05 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 06:48 CST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> .../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:
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
2021-11-19 4:05 ` Bjorn Andersson
@ 2021-11-29 0:21 ` Rob Herring
2021-12-06 15:05 ` Bjorn Andersson
2 siblings, 0 replies; 13+ messages in thread
From: Rob Herring @ 2021-11-29 0:21 UTC (permalink / raw)
To: Robert Foss
Cc: devicetree, todor.too, linux-media, mchehab, bjorn.andersson,
Stephan Gerhold, agross, robh+dt, linux-arm-msm,
Bryan O'Donoghue, angelogioacchino.delregno,
Andrey Konovalov, linux-kernel
On Thu, 18 Nov 2021 13:48:17 +0100, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
> ---
> .../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(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
2021-11-19 4:01 ` Bjorn Andersson
@ 2021-12-06 15:04 ` Bjorn Andersson
1 sibling, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2021-12-06 15:04 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 04:48 PST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> .../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);
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
2021-11-19 4:05 ` Bjorn Andersson
2021-11-29 0:21 ` Rob Herring
@ 2021-12-06 15:05 ` Bjorn Andersson
2 siblings, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2021-12-06 15:05 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 04:48 PST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> .../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:
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node
2021-11-18 12:48 ` [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node Robert Foss
@ 2021-12-06 15:06 ` Bjorn Andersson
2021-12-06 15:13 ` Robert Foss
0 siblings, 1 reply; 13+ messages in thread
From: Bjorn Andersson @ 2021-12-06 15:06 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 04:48 PST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Although I'd be happy to take the two dts patches through the Qualcomm
tree, once the driver changes has landed.
Regards,
Bjorn
> ---
> arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> index a5320d6d30e7..b7a578aafcbb 100644
> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> @@ -253,7 +253,6 @@ ports {
> port@0 {
> reg = <0>;
> csiphy0_ep: endpoint {
> - clock-lanes = <1>;
> data-lanes = <0 2>;
> remote-endpoint = <&ov5640_ep>;
> status = "okay";
> @@ -289,7 +288,6 @@ camera_rear@3b {
>
> port {
> ov5640_ep: endpoint {
> - clock-lanes = <1>;
> data-lanes = <0 2>;
> remote-endpoint = <&csiphy0_ep>;
> };
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: Remove clock-lanes property from &camss node
2021-11-18 12:48 ` [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: " Robert Foss
@ 2021-12-06 15:07 ` Bjorn Andersson
0 siblings, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2021-12-06 15:07 UTC (permalink / raw)
To: Robert Foss
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Thu 18 Nov 04:48 PST 2021, Robert Foss wrote:
> 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 <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> 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 13f80a0b6faa..2cf4b932aee2 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -1125,7 +1125,6 @@ ports {
> port@0 {
> reg = <0>;
> csiphy0_ep: endpoint {
> - clock-lanes = <7>;
> data-lanes = <0 1 2 3>;
> remote-endpoint = <&ov8856_ep>;
> };
> @@ -1166,7 +1165,6 @@ camera@10 {
>
> port {
> ov8856_ep: endpoint {
> - clock-lanes = <1>;
> link-frequencies = /bits/ 64
> <360000000 180000000>;
> data-lanes = <1 2 3 4>;
> @@ -1211,7 +1209,6 @@ camera@60 {
>
> port {
> ov7251_ep: endpoint {
> - clock-lanes = <1>;
> data-lanes = <0 1>;
> // remote-endpoint = <&csiphy3_ep>;
> };
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node
2021-12-06 15:06 ` Bjorn Andersson
@ 2021-12-06 15:13 ` Robert Foss
0 siblings, 0 replies; 13+ messages in thread
From: Robert Foss @ 2021-12-06 15:13 UTC (permalink / raw)
To: Bjorn Andersson
Cc: agross, todor.too, mchehab, robh+dt, angelogioacchino.delregno,
linux-arm-msm, linux-media, devicetree, linux-kernel,
Bryan O'Donoghue, Andrey Konovalov, Stephan Gerhold
On Mon, 6 Dec 2021 at 16:05, Bjorn Andersson <bjorn.andersson@linaro.org> wrote:
>
> On Thu 18 Nov 04:48 PST 2021, Robert Foss wrote:
>
> > 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 <robert.foss@linaro.org>
>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> Although I'd be happy to take the two dts patches through the Qualcomm
> tree, once the driver changes has landed.
Thanks Bjorn. I'll split the series and submit two fully reviewed v4 series.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-12-06 15:30 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 12:48 [PATCH v3 0/4] Remove clock-lanes DT property from CAMSS Robert Foss
2021-11-18 12:48 ` [PATCH v3 1/4] media: camss: csiphy: Move to hardcode CSI Clock Lane number Robert Foss
2021-11-19 4:01 ` Bjorn Andersson
2021-12-06 15:04 ` Bjorn Andersson
2021-11-18 12:48 ` [PATCH v3 2/4] media: dt-bindings: media: camss: Remove clock-lane property Robert Foss
2021-11-19 4:05 ` Bjorn Andersson
2021-11-29 0:21 ` Rob Herring
2021-12-06 15:05 ` Bjorn Andersson
2021-11-18 12:48 ` [PATCH v3 3/4] arm64: dts: qcom: apq8016-sbc: Remove clock-lanes property from &camss node Robert Foss
2021-12-06 15:06 ` Bjorn Andersson
2021-12-06 15:13 ` Robert Foss
2021-11-18 12:48 ` [PATCH v3 4/4] arm64: dts: qcom: sdm845-db845c: " Robert Foss
2021-12-06 15:07 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).