Skip to content

Commit c103fad

Browse files
committed
arm64: dts: qcom: msm8939: Add camss and cci
Add the camera subsystem and CCI used to interface with cameras on the Snapdragon 615. Signed-off-by: Vincent Knecht <[email protected]>
1 parent 0c5f300 commit c103fad

File tree

2 files changed

+150
-0
lines changed

2 files changed

+150
-0
lines changed

arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
#include "msm8939.dtsi"
1212
#include "pm8916.dtsi"
1313

14+
&camss {
15+
vdda-supply = <&pm8916_l2>;
16+
};
17+
1418
&mdss_dsi0 {
1519
vdda-supply = <&pm8916_l2>;
1620
vddio-supply = <&pm8916_l6>;

arch/arm64/boot/dts/qcom/msm8939.dtsi

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,145 @@
14311431
};
14321432
};
14331433

1434+
camss: isp@1b08000 {
1435+
compatible = "qcom,msm8939-camss";
1436+
reg = <0x01b08000 0x100>,
1437+
<0x01b08400 0x100>,
1438+
<0x01b08800 0x100>,
1439+
<0x01b0ac00 0x200>,
1440+
<0x01b00030 0x4>,
1441+
<0x01b0b000 0x200>,
1442+
<0x01b00038 0x4>,
1443+
<0x01b00020 0x10>,
1444+
<0x01b0a000 0x500>,
1445+
<0x01b10000 0x1000>,
1446+
<0x01b40000 0x200>;
1447+
reg-names = "csid0",
1448+
"csid1",
1449+
"csid2",
1450+
"csiphy0",
1451+
"csiphy0_clk_mux",
1452+
"csiphy1",
1453+
"csiphy1_clk_mux",
1454+
"csi_clk_mux",
1455+
"ispif",
1456+
"vfe0",
1457+
"vfe0_vbif";
1458+
1459+
clocks = <&gcc GCC_CAMSS_AHB_CLK>,
1460+
<&gcc GCC_CAMSS_CSI0_CLK>,
1461+
<&gcc GCC_CAMSS_CSI0_AHB_CLK>,
1462+
<&gcc GCC_CAMSS_CSI0PHY_CLK>,
1463+
<&gcc GCC_CAMSS_CSI0PIX_CLK>,
1464+
<&gcc GCC_CAMSS_CSI0RDI_CLK>,
1465+
<&gcc GCC_CAMSS_CSI1_CLK>,
1466+
<&gcc GCC_CAMSS_CSI1_AHB_CLK>,
1467+
<&gcc GCC_CAMSS_CSI1PHY_CLK>,
1468+
<&gcc GCC_CAMSS_CSI1PIX_CLK>,
1469+
<&gcc GCC_CAMSS_CSI1RDI_CLK>,
1470+
<&gcc GCC_CAMSS_CSI2_CLK>,
1471+
<&gcc GCC_CAMSS_CSI2_AHB_CLK>,
1472+
<&gcc GCC_CAMSS_CSI2PHY_CLK>,
1473+
<&gcc GCC_CAMSS_CSI2PIX_CLK>,
1474+
<&gcc GCC_CAMSS_CSI2RDI_CLK>,
1475+
<&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,
1476+
<&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,
1477+
<&gcc GCC_CAMSS_CSI_VFE0_CLK>,
1478+
<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
1479+
<&gcc GCC_CAMSS_TOP_AHB_CLK>,
1480+
<&gcc GCC_CAMSS_VFE0_CLK>,
1481+
<&gcc GCC_CAMSS_VFE_AHB_CLK>,
1482+
<&gcc GCC_CAMSS_VFE_AXI_CLK>;
1483+
clock-names = "ahb",
1484+
"csi0",
1485+
"csi0_ahb",
1486+
"csi0_phy",
1487+
"csi0_pix",
1488+
"csi0_rdi",
1489+
"csi1",
1490+
"csi1_ahb",
1491+
"csi1_phy",
1492+
"csi1_pix",
1493+
"csi1_rdi",
1494+
"csi2",
1495+
"csi2_ahb",
1496+
"csi2_phy",
1497+
"csi2_pix",
1498+
"csi2_rdi",
1499+
"csiphy0_timer",
1500+
"csiphy1_timer",
1501+
"csi_vfe0",
1502+
"ispif_ahb",
1503+
"top_ahb",
1504+
"vfe0",
1505+
"vfe_ahb",
1506+
"vfe_axi";
1507+
1508+
interrupts = <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>,
1509+
<GIC_SPI 52 IRQ_TYPE_EDGE_RISING>,
1510+
<GIC_SPI 153 IRQ_TYPE_EDGE_RISING>,
1511+
<GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
1512+
<GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
1513+
<GIC_SPI 55 IRQ_TYPE_EDGE_RISING>,
1514+
<GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
1515+
interrupt-names = "csid0",
1516+
"csid1",
1517+
"csid2",
1518+
"csiphy0",
1519+
"csiphy1",
1520+
"ispif",
1521+
"vfe0";
1522+
1523+
iommus = <&apps_iommu 3>;
1524+
1525+
power-domains = <&gcc VFE_GDSC>;
1526+
1527+
status = "disabled";
1528+
1529+
ports {
1530+
#address-cells = <1>;
1531+
#size-cells = <0>;
1532+
1533+
port@0 {
1534+
reg = <0>;
1535+
};
1536+
1537+
port@1 {
1538+
reg = <1>;
1539+
};
1540+
};
1541+
};
1542+
1543+
cci: cci@1b0c000 {
1544+
compatible = "qcom,msm8916-cci", "qcom,msm8226-cci";
1545+
reg = <0x01b0c000 0x1000>;
1546+
interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
1547+
clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
1548+
<&gcc GCC_CAMSS_CCI_AHB_CLK>,
1549+
<&gcc GCC_CAMSS_CCI_CLK>,
1550+
<&gcc GCC_CAMSS_AHB_CLK>;
1551+
clock-names = "camss_top_ahb",
1552+
"cci_ahb",
1553+
"cci",
1554+
"camss_ahb";
1555+
assigned-clocks = <&gcc GCC_CAMSS_CCI_AHB_CLK>,
1556+
<&gcc GCC_CAMSS_CCI_CLK>;
1557+
assigned-clock-rates = <80000000>,
1558+
<19200000>;
1559+
pinctrl-0 = <&cci0_default>;
1560+
pinctrl-names = "default";
1561+
#address-cells = <1>;
1562+
#size-cells = <0>;
1563+
status = "disabled";
1564+
1565+
cci_i2c0: i2c-bus@0 {
1566+
reg = <0>;
1567+
clock-frequency = <400000>;
1568+
#address-cells = <1>;
1569+
#size-cells = <0>;
1570+
};
1571+
};
1572+
14341573
gpu: gpu@1c00000 {
14351574
compatible = "qcom,adreno-405.0", "qcom,adreno";
14361575
reg = <0x01c00000 0x10000>;
@@ -1495,6 +1634,13 @@
14951634
#iommu-cells = <1>;
14961635
qcom,iommu-secure-id = <17>;
14971636

1637+
/* vfe */
1638+
iommu-ctx@3000 {
1639+
compatible = "qcom,msm-iommu-v1-sec";
1640+
reg = <0x3000 0x1000>;
1641+
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
1642+
};
1643+
14981644
/* mdp_0: */
14991645
iommu-ctx@4000 {
15001646
compatible = "qcom,msm-iommu-v1-ns";

0 commit comments

Comments
 (0)