Skip to content

Commit 9cf1345

Browse files
sgaud-quicsgaud-quic
authored
Merge pull request #315 from wenmliu/qcom-6.18.y
Add Camera Support for Hamoa EVK
2 parents d993cae + edfe235 commit 9cf1345

21 files changed

Lines changed: 2164 additions & 75 deletions

‎Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml‎

Lines changed: 81 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ properties:
104104
- const: sf_icp_mnoc
105105

106106
iommus:
107+
minItems: 5
107108
maxItems: 8
108109

109110
power-domains:
@@ -126,38 +127,109 @@ properties:
126127
description:
127128
Phandle to 1.8V regulator supply to a PHY.
128129

130+
phys:
131+
maxItems: 4
132+
133+
phy-names:
134+
items:
135+
- const: csiphy0
136+
- const: csiphy1
137+
- const: csiphy2
138+
- const: csiphy4
139+
129140
ports:
130141
$ref: /schemas/graph.yaml#/properties/ports
131142

132143
description:
133-
CSI input ports.
144+
CSI input ports. Supports either standard single sensor mode or
145+
Qualcomm's combo mode with one sensor in 2x1 + 1x1 data-lane, clock-lane mode.
134146

135147
patternProperties:
136148
"^port@[0-3]$":
137149
$ref: /schemas/graph.yaml#/$defs/port-base
138150
unevaluatedProperties: false
139151

140152
description:
141-
Input port for receiving CSI data from a CSIPHY.
153+
Input port for receiving CSI data.
142154

143155
properties:
144-
endpoint:
156+
endpoint@0:
145157
$ref: video-interfaces.yaml#
146158
unevaluatedProperties: false
147159

160+
description:
161+
Endpoint for receiving a single sensor input (or first leg of combo).
162+
148163
properties:
149164
data-lanes:
150165
minItems: 1
151-
maxItems: 4
166+
maxItems: 4 # Base max allows 4 (for D-PHY)
167+
168+
clock-lanes:
169+
maxItems: 1
152170

153171
bus-type:
154172
enum:
155173
- 1 # MEDIA_BUS_TYPE_CSI2_CPHY
156174
- 4 # MEDIA_BUS_TYPE_CSI2_DPHY
157175

176+
endpoint@1:
177+
$ref: video-interfaces.yaml#
178+
unevaluatedProperties: false
179+
180+
description:
181+
Endpoint for receiving the second leg of a combo sensor input.
182+
183+
properties:
184+
data-lanes:
185+
maxItems: 1
186+
187+
clock-lanes:
188+
maxItems: 1
189+
190+
bus-type:
191+
const: 4 # Combo is D-PHY specific
192+
158193
required:
159194
- data-lanes
160195

196+
allOf:
197+
# Case 1: Combo Mode (endpoint@1 is present)
198+
# If endpoint@1 exists, we restrict endpoint@0 to 2 lanes (D-PHY split)
199+
- if:
200+
required:
201+
- endpoint@1
202+
then:
203+
properties:
204+
endpoint@0:
205+
properties:
206+
data-lanes:
207+
minItems: 2
208+
maxItems: 2
209+
bus-type:
210+
const: 4
211+
endpoint@1:
212+
properties:
213+
data-lanes:
214+
minItems: 1
215+
maxItems: 1
216+
bus-type:
217+
const: 4
218+
219+
# Case 2: Single Mode (endpoint@1 is missing)
220+
# We explicitly allow up to 4 lanes here to cover the D-PHY use case.
221+
- if:
222+
not:
223+
required:
224+
- endpoint@1
225+
then:
226+
properties:
227+
endpoint@0:
228+
properties:
229+
data-lanes:
230+
minItems: 1
231+
maxItems: 4
232+
161233
required:
162234
- compatible
163235
- reg
@@ -171,8 +243,6 @@ required:
171243
- iommus
172244
- power-domains
173245
- power-domain-names
174-
- vdd-csiphy-0p8-supply
175-
- vdd-csiphy-1p2-supply
176246
- ports
177247

178248
additionalProperties: false
@@ -333,11 +403,8 @@ examples:
333403
334404
iommus = <&apps_smmu 0x800 0x60>,
335405
<&apps_smmu 0x860 0x60>,
336-
<&apps_smmu 0x1800 0x60>,
337406
<&apps_smmu 0x1860 0x60>,
338407
<&apps_smmu 0x18e0 0x00>,
339-
<&apps_smmu 0x1980 0x20>,
340-
<&apps_smmu 0x1900 0x00>,
341408
<&apps_smmu 0x19a0 0x20>;
342409
343410
power-domains = <&camcc CAM_CC_IFE_0_GDSC>,
@@ -351,6 +418,11 @@ examples:
351418
vdd-csiphy-0p8-supply = <&csiphy_0p8_supply>;
352419
vdd-csiphy-1p2-supply = <&csiphy_1p2_supply>;
353420
421+
phys = <&csiphy0>, <&csiphy1>,
422+
<&csiphy2>, <&csiphy4>;
423+
phy-names = "csiphy0", "csiphy1",
424+
"csiphy2", "csiphy4";
425+
354426
ports {
355427
#address-cells = <1>;
356428
#size-cells = <0>;

‎Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/qcom,x1e80100-csi2-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm CSI2 PHY
8+
9+
maintainers:
10+
- Bryan O'Donoghue <bod@kernel.org>
11+
12+
description:
13+
Qualcomm MIPI CSI2 C-PHY/D-PHY combination PHY. Connects MIPI CSI2 sensors
14+
to Qualcomm's Camera CSI Decoder. The PHY supports both C-PHY and D-PHY
15+
modes.
16+
17+
properties:
18+
compatible:
19+
const: qcom,x1e80100-csi2-phy
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#phy-cells":
25+
const: 1
26+
27+
clocks:
28+
maxItems: 4
29+
30+
clock-names:
31+
items:
32+
- const: csiphy
33+
- const: csiphy_timer
34+
- const: camnoc_axi
35+
- const: cpas_ahb
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
operating-points-v2:
41+
maxItems: 1
42+
43+
power-domains:
44+
maxItems: 1
45+
46+
vdda-0p8-supply:
47+
description: Phandle to a 0.8V regulator supply to a PHY.
48+
49+
vdda-1p2-supply:
50+
description: Phandle to 1.2V regulator supply to a PHY.
51+
52+
required:
53+
- compatible
54+
- reg
55+
- "#phy-cells"
56+
- clocks
57+
- clock-names
58+
- interrupts
59+
- operating-points-v2
60+
- power-domains
61+
- vdda-0p8-supply
62+
- vdda-1p2-supply
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
#include <dt-bindings/clock/qcom,x1e80100-camcc.h>
70+
#include <dt-bindings/clock/qcom,x1e80100-gcc.h>
71+
#include <dt-bindings/phy/phy.h>
72+
73+
csiphy@ace4000 {
74+
compatible = "qcom,x1e80100-csi2-phy";
75+
reg = <0x0ace4000 0x2000>;
76+
#phy-cells = <1>;
77+
78+
clocks = <&camcc CAM_CC_CSIPHY0_CLK>,
79+
<&camcc CAM_CC_CSI0PHYTIMER_CLK>,
80+
<&camcc CAM_CC_CAMNOC_AXI_RT_CLK>,
81+
<&camcc CAM_CC_CPAS_AHB_CLK>;
82+
clock-names = "csiphy",
83+
"csiphy_timer",
84+
"camnoc_axi",
85+
"cpas_ahb";
86+
87+
operating-points-v2 = <&csiphy_opp_table>;
88+
89+
interrupts = <GIC_SPI 477 IRQ_TYPE_EDGE_RISING>;
90+
91+
power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
92+
93+
vdda-0p8-supply = <&vreg_l2c_0p8>;
94+
vdda-1p2-supply = <&vreg_l1c_1p2>;
95+
};
96+
97+
csiphy_opp_table: opp-table-csiphy {
98+
compatible = "operating-points-v2";
99+
100+
opp-300000000 {
101+
opp-hz = /bits/ 64 <300000000>;
102+
required-opps = <&rpmhpd_opp_low_svs_d1>;
103+
};
104+
105+
opp-400000000 {
106+
opp-hz = /bits/ 64 <400000000>;
107+
required-opps = <&rpmhpd_opp_low_svs>;
108+
};
109+
110+
opp-480000000 {
111+
opp-hz = /bits/ 64 <480000000>;
112+
required-opps = <&rpmhpd_opp_low_svs>;
113+
};
114+
};

‎MAINTAINERS‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21243,6 +21243,17 @@ S: Maintained
2124321243
F: Documentation/devicetree/bindings/media/qcom,*-iris.yaml
2124421244
F: drivers/media/platform/qcom/iris/
2124521245

21246+
QUALCOMM MIPI CSI2 PHY DRIVER
21247+
M: Bryan O'Donoghue <bod@kernel.org>
21248+
L: linux-phy@lists.infradead.org
21249+
L: linux-media@vger.kernel.org
21250+
L: linux-arm-msm@vger.kernel.org
21251+
S: Supported
21252+
F: Documentation/devicetree/bindings/phy/qcom,*-csi2-phy.yaml
21253+
F: drivers/phy/qualcomm/phy-qcom-mipi-csi2*.c
21254+
F: drivers/phy/qualcomm/phy-qcom-mipi-csi2*.h
21255+
F: include/dt-bindings/phy/phy-qcom-mipi-csi2*
21256+
2124621257
QUALCOMM NAND CONTROLLER DRIVER
2124721258
M: Manivannan Sadhasivam <mani@kernel.org>
2124821259
L: linux-mtd@lists.infradead.org

‎arch/arm64/boot/dts/qcom/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
1515
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
1616
dtb-$(CONFIG_ARCH_QCOM) += glymur-crd.dtb
1717
dtb-$(CONFIG_ARCH_QCOM) += hamoa-iot-evk.dtb
18+
dtb-$(CONFIG_ARCH_QCOM) += hamoa-iot-evk-camera-imx577.dtbo
19+
20+
hamoa-iot-evk-camera-imx577-dtbs := hamoa-iot-evk.dtb hamoa-iot-evk-camera-imx577.dtbo
21+
22+
dtb-$(CONFIG_ARCH_QCOM) += hamoa-iot-evk-camera-imx577.dtb
1823
dtb-$(CONFIG_ARCH_QCOM) += ipq5018-rdp432-c2.dtb
1924
dtb-$(CONFIG_ARCH_QCOM) += ipq5018-tplink-archer-ax55-v1.dtb
2025
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp441.dtb

‎arch/arm64/boot/dts/qcom/hamoa-iot-evk-camera-imx577.dtso‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
*/
5+
6+
/dts-v1/;
7+
/plugin/;
8+
9+
#include <dt-bindings/clock/qcom,x1e80100-camcc.h>
10+
#include <dt-bindings/gpio/gpio.h>
11+
#include <dt-bindings/phy/phy.h>
12+
13+
&{/} {
14+
vreg_cam1_1p8: regulator-cam1 {
15+
compatible = "regulator-fixed";
16+
regulator-name = "vreg_cam1";
17+
startup-delay-us = <1000>;
18+
enable-active-high;
19+
gpio = <&tlmm 19 GPIO_ACTIVE_HIGH>;
20+
};
21+
};
22+
23+
&camss {
24+
status = "okay";
25+
26+
ports {
27+
#address-cells = <1>;
28+
#size-cells = <0>;
29+
30+
port@1 {
31+
#address-cells = <1>;
32+
#size-cells = <0>;
33+
34+
csiphy1_ep: endpoint@0 {
35+
clock-lanes = <7>;
36+
data-lanes = <0 1 2 3>;
37+
remote-endpoint = <&imx577_ep>;
38+
};
39+
};
40+
};
41+
};
42+
43+
&cci0 {
44+
status = "okay";
45+
};
46+
47+
&cci0_i2c1 {
48+
#address-cells = <1>;
49+
#size-cells = <0>;
50+
51+
camera@1a {
52+
compatible = "sony,imx577";
53+
reg = <0x1a>;
54+
55+
reset-gpios = <&tlmm 110 GPIO_ACTIVE_LOW>;
56+
pinctrl-0 = <&cam1_default>;
57+
pinctrl-names = "default";
58+
59+
clocks = <&camcc CAM_CC_MCLK1_CLK>;
60+
assigned-clocks = <&camcc CAM_CC_MCLK1_CLK>;
61+
assigned-clock-rates = <24000000>;
62+
63+
dvdd-supply = <&vreg_cam1_1p8>;
64+
dovdd-supply = <&vreg_l4m_1p8>;
65+
66+
port {
67+
imx577_ep: endpoint {
68+
link-frequencies = /bits/ 64 <600000000>;
69+
data-lanes = <0 1 2 3>;
70+
remote-endpoint = <&csiphy1_ep>;
71+
};
72+
};
73+
};
74+
};
75+
76+
&csiphy1 {
77+
vdda-0p8-supply = <&vreg_l2c_0p8>;
78+
vdda-1p2-supply = <&vreg_l1c_1p2>;
79+
80+
status = "okay";
81+
};

0 commit comments

Comments
 (0)