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

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

Merge "ARM: dts: msm: Enable sleep support for EMAC RXC clock"

parents c93d9386 684f6265

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+5 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -90,7 +90,8 @@ 
		"dev-emac-rgmii_rxd2_state", "dev-emac-rgmii_rxd3_state",

		"dev-emac-rgmii_rxc_state", "dev-emac-rgmii_rx_ctl_state",

		"dev-emac-phy_intr", "dev-emac-phy_reset_state",

		"dev-emac_pin_pps_0";

		"dev-emac_pin_pps_0", "dev-emac-rgmii_rxc_suspend_state",

		"dev-emac-rgmii_rxc_resume_state";



		pinctrl-0 = <&emac_mdc>;

		pinctrl-1 = <&emac_mdio>;
@@ -109,6 +110,8 @@ 
		pinctrl-14 = <&emac_phy_intr>;

		pinctrl-15 = <&emac_phy_reset_state>;

		pinctrl-16 = <&emac_pin_pps_0>;

		pinctrl-17 = <&emac_rgmii_rxc_suspend>;

		pinctrl-18 = <&emac_rgmii_rxc_resume>;



		io-macro-info {

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

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ 
		"dev-emac-rgmii_rxd2_state", "dev-emac-rgmii_rxd3_state",

		"dev-emac-rgmii_rxc_state", "dev-emac-rgmii_rx_ctl_state",

		"dev-emac-phy_intr", "dev-emac-phy_reset_state",

		"dev-emac_pin_pps_0";

		"dev-emac_pin_pps_0", "dev-emac-rgmii_rxc_suspend_state",

		"dev-emac-rgmii_rxc_resume_state";



		pinctrl-0 = <&emac_mdc>;

		pinctrl-1 = <&emac_mdio>;
@@ -109,6 +110,8 @@ 
		pinctrl-14 = <&emac_phy_intr>;

		pinctrl-15 = <&emac_phy_reset_state>;

		pinctrl-16 = <&emac_pin_pps_0>;

		pinctrl-17 = <&emac_rgmii_rxc_suspend>;

		pinctrl-18 = <&emac_rgmii_rxc_resume>;



		io-macro-info {

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

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

+23 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,29 @@ 
					drive-strength = <2>;

				};

			};

			emac_rgmii_rxc_suspend: emac_rgmii_rxc_suspend {

				mux {

					pins = "gpio102";

					function = "rgmii_rxc";

				};



				config {

					pins = "gpio102";

					input-disable;

				};

			};

			emac_rgmii_rxc_resume: emac_rgmii_rxc_resume {

				mux {

					pins = "gpio102";

					function = "rgmii_rxc";

				};



				config {

					pins = "gpio102";

					input-enable;

					bias-disable;/* NO pull */

				};

			};

			emac_rgmii_rx_ctl: emac_rgmii_rx_ctl {

				mux {

					pins = "gpio112";