diff --git a/qcom/blairp-atp-overlay.dts b/qcom/blairp-atp-overlay.dts index bb7b8787bdd3..90570c8657c0 100644 --- a/qcom/blairp-atp-overlay.dts +++ b/qcom/blairp-atp-overlay.dts @@ -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>; }; diff --git a/qcom/blairp-cdp-overlay.dts b/qcom/blairp-cdp-overlay.dts index 02704e07a2a9..2f59f31a2303 100644 --- a/qcom/blairp-cdp-overlay.dts +++ b/qcom/blairp-cdp-overlay.dts @@ -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>; }; diff --git a/qcom/blairp-mtp-nopmi-overlay.dts b/qcom/blairp-mtp-nopmi-overlay.dts index 58003066810b..fd856d7c217f 100644 --- a/qcom/blairp-mtp-nopmi-overlay.dts +++ b/qcom/blairp-mtp-nopmi-overlay.dts @@ -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>; diff --git a/qcom/blairp-mtp-overlay.dts b/qcom/blairp-mtp-overlay.dts index 37651c24ece1..d7c310ee25f3 100644 --- a/qcom/blairp-mtp-overlay.dts +++ b/qcom/blairp-mtp-overlay.dts @@ -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>; diff --git a/qcom/blairp-mtp-usbc-overlay.dts b/qcom/blairp-mtp-usbc-overlay.dts index 8df452b841c0..638dfd632e0e 100644 --- a/qcom/blairp-mtp-usbc-overlay.dts +++ b/qcom/blairp-mtp-usbc-overlay.dts @@ -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>; }; diff --git a/qcom/blairp-qrd-nopmi-overlay.dts b/qcom/blairp-qrd-nopmi-overlay.dts index d3a8ca2f0c0b..41f0bc59156e 100644 --- a/qcom/blairp-qrd-nopmi-overlay.dts +++ b/qcom/blairp-qrd-nopmi-overlay.dts @@ -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>; diff --git a/qcom/blairp-qrd-overlay.dts b/qcom/blairp-qrd-overlay.dts index 40c9baef8462..4f886bb0fbe0 100644 --- a/qcom/blairp-qrd-overlay.dts +++ b/qcom/blairp-qrd-overlay.dts @@ -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>; diff --git a/qcom/blairp.dtsi b/qcom/blairp.dtsi index 192f3b55e620..f50f83d2301a 100644 --- a/qcom/blairp.dtsi +++ b/qcom/blairp.dtsi @@ -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 { diff --git a/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi b/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi index c2d9043b1248..2ac93a65cdfa 100644 --- a/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi +++ b/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi @@ -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>; diff --git a/qcom/yupik-iot-hsp.dtsi b/qcom/yupik-iot-hsp.dtsi index 9a78f463913e..87506bc98fb7 100644 --- a/qcom/yupik-iot-hsp.dtsi +++ b/qcom/yupik-iot-hsp.dtsi @@ -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 = ; - /* 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"; };