Merge a51f6aab78 on remote branch

Change-Id: I244e6508b2ba38ded52d635c6d4d2be050b002ef
This commit is contained in:
Linux Build Service Account 2023-07-30 23:17:29 -07:00
commit 69e57dbd74
10 changed files with 57 additions and 35 deletions

View file

@ -6,7 +6,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp ATP";
compatible = "qcom,blairp-atp", "qcom,blairp", "qcom,atp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <33 0>;
};

View file

@ -6,7 +6,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp CDP";
compatible = "qcom,blairp-cdp", "qcom,blairp", "qcom,cdp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <1 0>;
};

View file

@ -6,7 +6,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp MTP NOPMI";
compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <8 0>;
qcom,pmic-id-size = <4>;
qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

View file

@ -7,7 +7,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp MTP";
compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <8 0>;
qcom,pmic-id-size = <4>;
qcom,pmic-id = <0x2D 0x0 0x2E 0x0>;

View file

@ -7,7 +7,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp MTP USBC audio";
compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <8 1>;
};

View file

@ -6,7 +6,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp QRD NOPMI";
compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <0x1000B 0>;
qcom,pmic-id-size = <4>;
qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

View file

@ -7,7 +7,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp QRD";
compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
qcom,board-id = <0x1000B 0>;
qcom,pmic-id-size = <4>;
qcom,pmic-id = <0x2D 0x0 0x2E 0x0>;

View file

@ -5,7 +5,7 @@
/ {
model = "Qualcomm Technologies, Inc. Blairp SoC";
compatible = "qcom,blairp";
qcom,msm-id = <565 0x10000>;
qcom,msm-id = <565 0x10000>, <628 0x10000>;
};
&soc {

View file

@ -48,6 +48,32 @@
qcom,mod-usecs-min = <30>;
qcom,mod-usecs-max = <60>;
};
ioss_r8168_eth0_rx: r8168_rx@eth0 {
qcom,dir-rx;
qcom,rx-filter-ip;
qcom,multi_rx_queues;
qcom,ring-size = <1024>;
qcom,buff-size = <2048>;
qcom,mod-count-min = <32>;
qcom,mod-count-max = <64>;
qcom,mod-usecs-min = <30>;
qcom,mod-usecs-max = <60>;
};
ioss_r8168_eth0_tx: r8168_tx@eth0 {
qcom,dir-tx;
qcom,ring-size = <1024>;
qcom,buff-size = <2048>;
qcom,mod-count-min = <32>;
qcom,mod-count-max = <64>;
qcom,mod-usecs-min = <30>;
qcom,mod-usecs-max = <60>;
};
};
&pcie0_rp {
@ -118,6 +144,24 @@
};
realtek,rtl8168@pcie0_rp {
reg = <0 0 0 0 0>;
compatible = "qcom,ioss-v2-device";
qcom,ioss = <&ioss>;
qcom,ioss_instance = <0>;
qcom,ioss_channels =
<&ioss_r8168_eth0_rx>,
<&ioss_r8168_eth0_tx>;
/* ipa shares this group with rtl */
qcom,iommu-group = <&ipa_eth_group1>;
pci-ids =
"10ec:8168",
"17cb:0308";
};
pcie0_generic_ep: pcie0_generic_ep {
reg = <0 0 0 0 0>;
qcom,iommu-group = <&pcie0_generic_ep_iommu_group>;

View file

@ -21,6 +21,11 @@
qcom,edp-backlight-en-gpio = <&pm8350c_gpios 7 0>;
qcom,edp-default-panel = <&edp_panel_1080p_video>;
qcom,panel-notifier-support;
qcom,edp-bl-min-level = <1>;
qcom,edp-bl-max-level = <4095>;
qcom,edp-brightness-max-level = <255>;
qcom,bl-pmic-pwm-period-usecs = <100>;
pwms = <&pm8350c_pwm_2 0 65535>;
};
&mdss_mdp {
@ -46,15 +51,6 @@
};
&pm8350c_gpios {
pmic_edp_bl_en: pmic-edp-bl-en-state {
pins = "gpio7";
function = "normal";
bias-disable;
qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
/* Force backlight to be disabled to match state at boot. */
output-low;
};
pmic_edp_bl_pwm: pmic-edp-bl-pwm-state {
pins = "gpio8";
function = "func1";
@ -69,24 +65,6 @@
status = "ok"
};
&soc {
edp_panel_bl_reg: edp_panel_bl_reg {
compatible = "qcom,stub-regulator";
regulator-name = "edp_panel_bl_reg";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
pm8350c_pwm_backlight: backlight {
compatible = "pwm-backlight";
power-supply = <&edp_panel_bl_reg>;
enable-gpios = <&pm8350c_gpios 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pmic_edp_bl_en>;
pwms = <&pm8350c_pwm_2 0 65535 0>;
};
};
&pcie0 {
status = "ok"
};