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

Commit 12d72bbd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add clocks and bus scaling nodes to emac for sdxpoorwills"

parents 8fd1b248 0d9206cb

Documentation/devicetree/bindings/net/qcom,emac-dwc-eqos.txt

+18 −0
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ emac_hw node: 
- interrupts: Interrupt number used by this controller

- io-macro-info: Internal io-macro-info



Optional:

- qcom,msm-bus,name: String representing the client-name

- qcom,msm-bus,num-cases: Total number of usecases

- qcom,msm-bus,num-paths: Total number of master-slave pairs

- qcom,msm-bus,vectors-KBps: Arrays of unsigned integers representing:

                             master-id, slave-id, arbitrated bandwidth

                             in KBps, instantaneous bandwidth in KBps

qcom,bus-vector-names: specifies string IDs for the corresponding bus vectors

                       in the same order as qcom,msm-bus,vectors-KBps property.



Internal io-macro-info:

- io-macro-bypass-mode: <0 or 1> internal or external delay configuration

- io-interface: <rgmii/mii/rmii> PHY interface used
@@ -35,6 +45,14 @@ soc { 
				"tx-ch4-intr", "rx-ch0-intr",

				"rx-ch1-intr", "rx-ch2-intr",

				"rx-ch3-intr";

			qcom,msm-bus,name = "emac";

			qcom,msm-bus,num-cases = <3>;

			qcom,msm-bus,num-paths = <2>;

			qcom,msm-bus,vectors-KBps =

				<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";

			io-macro-info {

				io-macro-bypass-mode = <0>;

				io-interface = "rgmii";

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -698,6 +698,20 @@ 
			"tx-ch3-intr", "tx-ch4-intr",

			"rx-ch0-intr", "rx-ch1-intr",

			"rx-ch2-intr", "rx-ch3-intr";

		qcom,msm-bus,name = "emac";

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

			<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";

		clocks = <&clock_gcc GCC_ETH_AXI_CLK>,

			<&clock_gcc GCC_ETH_PTP_CLK>,

			<&clock_gcc GCC_ETH_RGMII_CLK>,

			<&clock_gcc GCC_ETH_SLAVE_AHB_CLK>;

		clock-names = "eth_axi_clk", "eth_ptp_clk",

			"eth_rgmii_clk", "eth_slave_ahb_clk";

		io-macro-info {

			io-macro-bypass-mode = <0>;

			io-interface = "rgmii";