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

Commit 577d68a3 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: Configure WOL interrupt for EMAC on mdm9607"

parents c43cfa2b 79844633
Loading
Loading
Loading
Loading
+0 −30
Original line number Diff line number Diff line
@@ -727,36 +727,6 @@
				};
			};

			emac0_irq_active: emac0_irq_active {
				/* active state */
				mux {
					/* ETH IRQ */
					pins = "gpio30";
					function = "gpio";
				};

				config {
					pins = "gpio30";
					drive-strength = <16>; /* 16 MA */
					bias-pull-up;
				};
			};

			emac0_irq_sleep: emac0_irq_sleep {
				/* suspended state */
				mux {
					/* ETH IRQ */
					pins = "gpio30";
					function = "gpio";
				};

				config {
					pins = "gpio30";
					drive-strength = <2>; /* 2 MA */
					bias-pull-down;
				};
			};

			emac0_rst_active: emac0_rst_active {
				/* active state */
				mux {
+13 −4
Original line number Diff line number Diff line
@@ -1262,8 +1262,17 @@
			<0x7c56000 0x1000>,
			<0x7c5C000 0x4000>,
			<0x7c58000 0x400>;
		interrupts = <0 76 0>, <0 80 0>;
		interrupt-names = "emac_core0_irq", "emac_sgmii_irq";
		#address-cells = <0>;
		interrupt-parent = <&emac0>;
		#interrupt-cells = <1>;
		interrupts = <0 1 2>;
		interrupt-map-mask = <0xffffffff>;
		interrupt-map = <0 &intc 0 76 0
				1 &intc 0 80 0
				2 &tlmm_pinmux 30 0x8>;
		interrupt-names = "emac_core0_irq",
				"emac_sgmii_irq",
				"emac_wol_irq";
		emac_vreg1-supply = <&mdm9607_l1>;
		emac_vreg2-supply = <&mdm9607_l5>;
		emac_vreg3-supply = <&emac_lan_vreg>;
@@ -1277,8 +1286,8 @@
		clock-names = "axi_clk", "cfg_ahb_clk", "125m_clk",
			"25m_clk", "tx_clk", "rx_clk", "sys_clk";
		pinctrl-names = "emac_active", "emac_sleep";
		pinctrl-0 = <&emac0_active &emac0_irq_active &emac0_rst_active>;
		pinctrl-1 = <&emac0_sleep &emac0_irq_sleep &emac0_rst_sleep>;
		pinctrl-0 = <&emac0_active &emac0_rst_active>;
		pinctrl-1 = <&emac0_sleep &emac0_rst_sleep>;
		qcom,emac-tstamp-en;
		qcom,emac-ptp-frac-ns-adj = <125000000 1>;
		phy-mode = "sgmii";