Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7646c46 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update emac core version to 2.1.2"

parents 9eb3e267 a5adc584

arch/arm64/boot/dts/qcom/sa8155-v2.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
	qcom,msm-id = <362 0x20000>;

};



&emac_hw {

	emac-core-version = <4>;

};



&ufsphy_mem {

	vdda-phy-supply = <&pm8150_1_l5>;

};

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

+9 −6
Original line number Diff line number Diff line
@@ -661,10 +661,10 @@ 
		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

			<98 512 0 0>, <1 781 0 0>, /* No vote */

			<98 512 1250 0>, <1 781 0 40000>, /* 10Mbps vote */

			<98 512 12500 0>, <1 781 0 40000>, /* 100Mbps vote */

			<98 512 125000 0>, <1 781 0 40000>; /* 1000Mbps vote */

		qcom,bus-vector-names = "10", "100", "1000";

			<98 512 2500 0>, <1 781 0 40000>, /* 10Mbps vote */

			<98 512 25000 0>, <1 781 0 40000>, /* 100Mbps vote */

			<98 512 250000 0>, <1 781 0 40000>; /* 1000Mbps vote */

		qcom,bus-vector-names = "0", "10", "100", "1000";

		clocks = <&clock_gcc GCC_EMAC_AXI_CLK>,

			<&clock_gcc GCC_EMAC_PTP_CLK>,

			<&clock_gcc GCC_EMAC_RGMII_CLK>,
@@ -687,7 +687,9 @@ 
			"dev-emac-rgmii_rxd2_state",

			"dev-emac-rgmii_rxd3_state",

			"dev-emac-rgmii_rxc_state",

			"dev-emac-rgmii_rx_ctl_state";

			"dev-emac-rgmii_rx_ctl_state",

			"dev-emac-phy_intr",

			"dev-emac-phy_reset_state";



		pinctrl-0 = <&emac_mdc>;

		pinctrl-1 = <&emac_mdio>;
@@ -705,6 +707,8 @@ 
		pinctrl-11 = <&emac_rgmii_rxd3>;

		pinctrl-12 = <&emac_rgmii_rxc>;

		pinctrl-13 = <&emac_rgmii_rx_ctl>;

		pinctrl-14 = <&emac_phy_intr>;

		pinctrl-15 = <&emac_phy_reset_state>;



		io-macro-info {

			io-macro-bypass-mode = <0>;
@@ -712,7 +716,6 @@ 
		};

		emac_emb_smmu: emac_emb_smmu {

			compatible = "qcom,emac-smmu-embedded";

			qcom,smmu-s1-bypass;

			iommus = <&apps_smmu 0x3C0 0x0>;

			qcom,iova-mapping = <0x80000000 0x40000000>;

		};

arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -4281,6 +4281,40 @@ 
					drive-strength = <2>;

				};

			};

			emac_phy_intr: emac_phy_intr {

				mux {

					pins = "gpio124";

					function = "emac_phy";

				};

				config {

					pins = "gpio124";

					bias-disable;  /* NO pull */

					drive-strength = <8>;

				};

			};

			emac_phy_reset_state: emac_phy_reset_state {

				mux {

					pins = "gpio79";

					function = "gpio";

				};

				config {

					pins = "gpio79";

					bias-pull-up;

					drive-strength = <16>;

				};

			};

			emac_pin_pps_0: emac_pin_pps_0 {

				mux {

					pins = "gpio81";

					function = "emac_pps";

				};



				config {

					pins = "gpio81";

					drive-strength = <8>;  /* 8 mA */

					bias-disable;  /* NO PULL*/

				};

			};

		};



		bt_en_active: bt_en_active {