Skip to content
This repository has been archived by the owner on Nov 14, 2021. It is now read-only.

Commit

Permalink
dts: Import dtsi changes from 'LA.UM.9.12.r1-10300-SMxx50.0'
Browse files Browse the repository at this point in the history 
Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
  • Loading branch information
@0ctobot
0ctobot committed Mar 6, 2021
1 parent 6e87f1f commit 546ab18
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 30 deletions.
95 changes: 71 additions & 24 deletions arch/arm64/boot/dts/vendor/qcom/camera/kona-camera.dtsi
View file
Expand Up @@ -612,11 +612,10 @@
"csiphy0", "csiphy1", "csiphy2", "csiphy3",
"csiphy4", "csiphy5", "cci0", "cci1",
"csid0", "csid1", "csid2", "csid3",
"csid4", "csid5", "csid6", "ife0",
"ife1", "ife2", "ife3", "custom0",
"ipe0", "cam-cdm-intf0", "cpas-cdm0",
"bps0", "icp0", "jpeg-dma0", "jpeg-enc0",
"fd0";
"csid4", "csid5", "csid6", "ife0", "ife1",
"ife2", "ife3", "ife4", "ife5", "ife6",
"custom0", "ipe0", "cam-cdm-intf0", "cpas-cdm0",
"bps0", "icp0", "jpeg-dma0", "jpeg-enc0", "fd0";

camera-bus-nodes {
level3-nodes {
Expand Down Expand Up @@ -888,8 +887,40 @@
parent-node = <&level1_rt0_wr1>;
};

ife0_rdi_all_rd: ife0-rdi-all-rd {
ife4_rdi_all_wr: ife4-rdi-all-wr {
cell-index = <22>;
node-name = "ife4-rdi-all-wr";
client-name = "ife4";
traffic-data =
<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;
traffic-transaction-type =
<CAM_CPAS_TRANSACTION_WRITE>;
constituent-paths =
<CAM_CPAS_PATH_DATA_IFE_RDI0
CAM_CPAS_PATH_DATA_IFE_RDI1
CAM_CPAS_PATH_DATA_IFE_RDI2
CAM_CPAS_PATH_DATA_IFE_RDI3>;
parent-node = <&level1_rt0_wr1>;
};

ife5_rdi_all_wr: ife5-rdi-all-wr {
cell-index = <23>;
node-name = "ife5-rdi-all-wr";
client-name = "ife5";
traffic-data =
<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;
traffic-transaction-type =
<CAM_CPAS_TRANSACTION_WRITE>;
constituent-paths =
<CAM_CPAS_PATH_DATA_IFE_RDI0
CAM_CPAS_PATH_DATA_IFE_RDI1
CAM_CPAS_PATH_DATA_IFE_RDI2
CAM_CPAS_PATH_DATA_IFE_RDI3>;
parent-node = <&level1_rt0_wr1>;
};

ife0_rdi_all_rd: ife0-rdi-all-rd {
cell-index = <24>;
node-name = "ife0-rdi-all-rd";
client-name = "ife0";
traffic-data =
Expand All @@ -905,7 +936,7 @@
};

ife1_rdi_all_rd: ife1-rdi-all-rd {
cell-index = <23>;
cell-index = <25>;
node-name = "ife1-rdi-all-rd";
client-name = "ife1";
traffic-data =
Expand All @@ -921,7 +952,7 @@
};

custom0_all_rd: custom0-all-rd {
cell-index = <24>;
cell-index = <26>;
node-name = "custom0-all-rd";
client-name = "custom0";
traffic-data =
Expand All @@ -932,7 +963,7 @@
};

ife0_rdi_pixel_raw_wr: ife0-rdi-pixel-raw-wr {
cell-index = <25>;
cell-index = <27>;
node-name = "ife0-rdi-pixel-raw-wr";
client-name = "ife0";
traffic-data =
Expand All @@ -948,7 +979,7 @@
};

ife1_rdi_pixel_raw_wr: ife1-rdi-pixel-raw-wr {
cell-index = <26>;
cell-index = <28>;
node-name = "ife1-rdi-pixel-raw-wr";
client-name = "ife1";
traffic-data =
Expand All @@ -963,8 +994,24 @@
parent-node = <&level1_rt0_wr2>;
};

ife6_rdi_all_wr: ife6-rdi-all-wr {
cell-index = <29>;
node-name = "ife6-rdi-all-wr";
client-name = "ife6";
traffic-data =
<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;
traffic-transaction-type =
<CAM_CPAS_TRANSACTION_WRITE>;
constituent-paths =
<CAM_CPAS_PATH_DATA_IFE_RDI0
CAM_CPAS_PATH_DATA_IFE_RDI1
CAM_CPAS_PATH_DATA_IFE_RDI2
CAM_CPAS_PATH_DATA_IFE_RDI3>;
parent-node = <&level1_rt0_wr2>;
};

custom0_all_wr: custom0-all-wr {
cell-index = <27>;
cell-index = <30>;
node-name = "custom0-all-wr";
client-name = "custom0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -974,7 +1021,7 @@
};

ipe0_all_wr: ipe0-all-wr {
cell-index = <28>;
cell-index = <31>;
node-name = "ipe0-all-wr";
client-name = "ipe0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -988,7 +1035,7 @@
};

bps0_all_wr: bps0-all-wr {
cell-index = <29>;
cell-index = <32>;
node-name = "bps0-all-wr";
client-name = "bps0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -998,7 +1045,7 @@
};

ipe0_ref_rd: ipe0-ref-rd {
cell-index = <30>;
cell-index = <33>;
node-name = "ipe0-ref-rd";
client-name = "ipe0";
traffic-data =
Expand All @@ -1009,7 +1056,7 @@
};

bps0_all_rd: bps0-all-rd {
cell-index = <31>;
cell-index = <34>;
node-name = "bps0-all-rd";
client-name = "bps0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1019,7 +1066,7 @@
};

ipe0_in_rd: ipe0-in-rd {
cell-index = <32>;
cell-index = <35>;
node-name = "ipe0-in-rd";
client-name = "ipe0";
traffic-data =
Expand All @@ -1030,7 +1077,7 @@
};

jpeg_enc0_all_wr: jpeg-enc0-all-wr {
cell-index = <33>;
cell-index = <36>;
node-name = "jpeg-enc0-all-wr";
client-name = "jpeg-enc0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1040,7 +1087,7 @@
};

jpeg_dma0_all_wr: jpeg-dma0-all-wr {
cell-index = <34>;
cell-index = <37>;
node-name = "jpeg-dma0-all-wr";
client-name = "jpeg-dma0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1050,7 +1097,7 @@
};

jpeg_enc0_all_rd: jpeg-enc0-all-rd {
cell-index = <35>;
cell-index = <38>;
node-name = "jpeg-enc0-all-rd";
client-name = "jpeg-enc0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1060,7 +1107,7 @@
};

jpeg_dma0_all_rd: jpeg-dma0-all-rd {
cell-index = <36>;
cell-index = <39>;
node-name = "jpeg-dma0-all-rd";
client-name = "jpeg-dma0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1070,7 +1117,7 @@
};

fd0_all_wr: fd0-all-wr {
cell-index = <37>;
cell-index = <40>;
node-name = "fd0-all-wr";
client-name = "fd0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1080,7 +1127,7 @@
};

fd0_all_rd: fd0-all-rd {
cell-index = <38>;
cell-index = <41>;
node-name = "fd0-all-rd";
client-name = "fd0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1090,7 +1137,7 @@
};

cpas_cdm0_all_rd: cpas-cdm0-all-rd {
cell-index = <39>;
cell-index = <42>;
node-name = "cpas-cdm0-all-rd";
client-name = "cpas-cdm0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand All @@ -1100,7 +1147,7 @@
};

icp0_all_rd: icp0-all-rd {
cell-index = <40>;
cell-index = <43>;
node-name = "icp0-all-rd";
client-name = "icp0";
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
Expand Down
6 changes: 4 additions & 2 deletions arch/arm64/boot/dts/vendor/qcom/kona-gpu.dtsi
View file
Expand Up @@ -325,10 +325,12 @@
<&clock_gpucc GPU_CC_CXO_CLK>,
<&clock_gcc GCC_DDRSS_GPU_AXI_CLK>,
<&clock_gcc GCC_GPU_MEMNOC_GFX_CLK>,
<&clock_gpucc GPU_CC_AHB_CLK>;
<&clock_gpucc GPU_CC_AHB_CLK>,
<&clock_aop QDSS_CLK>;

clock-names = "gmu_clk", "cxo_clk", "axi_clk",
"memnoc_clk", "gpu_cc_ahb";
"memnoc_clk", "gpu_cc_ahb",
"apb_pclk";

/* AOP mailbox for sending ACD enable and disable messages */
mboxes = <&qmp_aop 0>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/vendor/qcom/kona-mtp.dtsi
View file
Expand Up @@ -154,6 +154,7 @@
pinctrl-names = "default";
pinctrl-0 = <&bt_en_sleep>;
qca,bt-reset-gpio = <&tlmm 21 0>; /* BT_EN */
qca,wl-reset-gpio = <&tlmm 20 0>; /* WL_EN */
qca,bt-sw-ctrl-gpio = <&tlmm 124 0>; /* SW_CTRL */
qca,bt-vdd-aon-supply = <&pm8150_s6>;
qca,bt-vdd-dig-supply = <&pm8009_s2>;
Expand Down
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/vendor/qcom/kona-pcie.dtsi
View file
Expand Up @@ -92,7 +92,6 @@
iommu-map = <0x0 &apps_smmu 0x1c00 0x1>,
<0x100 &apps_smmu 0x1c01 0x1>;

qcom,target-link-speed = <0x2>; /* limit to gen2 */
qcom,boot-option = <0x1>;
qcom,drv-supported;
qcom,drv-l1ss-timeout-us = <10000>; /* 10ms */
Expand Down
22 changes: 22 additions & 0 deletions arch/arm64/boot/dts/vendor/qcom/kona-pmic-overlay.dtsi
View file
Expand Up @@ -44,6 +44,28 @@
};
};

imu_clkin {
imu_clkin_default: imu_clkin_default {
pins = "gpio3";
function = "func1";
output-low;
power-source = <0>;
bias-disable;
qcom,dtest-buffer = <1>;
qcom,drive-strength = <1>;
};

imu_clkin_sleep: imu_clkin_sleep {
pins = "gpio3";
function = "func1";
input-enable;
bias-pull-down;
power-source = <0>;
qcom,dtest-buffer = <1>;
qcom,drive-strength = <1>;
};
};

key_vol_up {
key_vol_up_default: key_vol_up_default {
pins = "gpio6";
Expand Down
34 changes: 34 additions & 0 deletions arch/arm64/boot/dts/vendor/qcom/kona-sde.dtsi
View file
Expand Up @@ -306,6 +306,40 @@
<1 590 0 150000>,
<1 590 0 300000>;
};

qcom,sde-limits {
qcom,sde-linewidth-limits {
qcom,sde-limit-name = "sspp_linewidth_usecases";
qcom,sde-limit-cases = "vig", "dma", "scale", "inline_rot";
qcom,sde-limit-ids= <0x1 0x2 0x4 0x8>;
qcom,sde-limit-values = <0x1 4096>,
<0x5 2560>,
<0x2 4096>,
<0x9 1088>;
};

qcom,sde-bw-limits {
qcom,sde-limit-name = "sde_bwlimit_usecases";
qcom,sde-limit-cases = "per_vig_pipe",
"per_dma_pipe",
"total_max_bw",
"camera_concurrency",
"cwb_concurrency";
qcom,sde-limit-ids = <0x1 0x2 0x4 0x8 0x10>;
qcom,sde-limit-values = <0x1 5300000>,
<0x11 5300000>,
<0x9 4400000>,
<0x19 4400000>,
<0x2 5300000>,
<0x12 5300000>,
<0xa 4400000>,
<0x1a 4400000>,
<0x4 16600000>,
<0x14 16600000>,
<0xc 13700000>,
<0x1c 13700000>;
};
};
};

sde_dp: qcom,dp_display@ae90000 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/vendor/qcom/kona-usb.dtsi
View file
Expand Up @@ -15,10 +15,10 @@
#size-cells = <1>;
ranges;

interrupts-extended = <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
interrupts-extended = <&pdc 14 IRQ_TYPE_EDGE_RISING>,
<&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
<&pdc 17 IRQ_TYPE_LEVEL_HIGH>,
<&pdc 15 IRQ_TYPE_EDGE_BOTH>;
<&pdc 15 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "dp_hs_phy_irq", "pwr_event_irq",
"ss_phy_irq", "dm_hs_phy_irq";
qcom,use-pdc-interrupts;
Expand Down

0 comments on commit 546ab18

Please sign in to comment.