Merge "ARM: dts: msm: add emac, phy, rgmii power supplys in sdxpoorwills" (6675ebf0) · Commits · e / devices / android_kernel_fairphone_FP3

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

+21 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, 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
		@@ -381,4 +381,24 @@
		enable-active-high;
		gpio = <&tlmm 92 GPIO_ACTIVE_HIGH>;
		};

		vreg_emac_phy: emac_phy_regulator {
		compatible = "regulator-fixed";
		regulator-name = "emac_phy";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		regulator-enable-ramp-delay = <100>;
		gpio = <&tlmm 96 GPIO_ACTIVE_HIGH>;
		enable-active-high;
		};

		vreg_rgmii_io_pads: rgmii_io_pads_regulator {
		compatible = "regulator-fixed";
		regulator-name = "rgmii_io_pads";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-enable-ramp-delay = <100>;
		gpio = <&tlmm 83 GPIO_ACTIVE_HIGH>;
		enable-active-high;
		};
		};

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

+41 −33

Original line number	Diff line number	Diff line
		@@ -723,6 +723,41 @@
		};
		};

		qmp_aop: qcom,qmp-aop@c300000 {
		compatible = "qcom,qmp-mbox";
		label = "aop";
		reg = <0xc300000 0x400>,
		<0x17811008 0x4>;
		reg-names = "msgram", "irq-reg-base";
		qcom,irq-mask = <0x2>;
		interrupts = <GIC_SPI 221 IRQ_TYPE_EDGE_RISING>;
		priority = <0>;
		mbox-desc-offset = <0x0>;
		#mbox-cells = <1>;
		};

		usb_detect: qcom,gpio-usbdetect {
		compatible = "qcom,gpio-usbdetect";
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0x0d 0x0 IRQ_TYPE_NONE>;
		interrupt-names = "vbus_det_irq";
		status = "disabled";
		};
		};

		#include "pmxpoorwills.dtsi"
		#include "sdxpoorwills-blsp.dtsi"
		#include "sdxpoorwills-regulator.dtsi"
		#include "sdxpoorwills-smp2p.dtsi"
		#include "sdxpoorwills-usb.dtsi"
		#include "sdxpoorwills-pcie.dtsi"
		#include "sdxpoorwills-bus.dtsi"
		#include "sdxpoorwills-thermal.dtsi"
		#include "sdxpoorwills-audio.dtsi"
		#include "sdxpoorwills-ion.dtsi"
		#include "msm-arm-smmu-sdxpoorwills.dtsi"

		&soc {
		emac_hw: qcom,emac@00020000 {
		compatible = "qcom,emac-dwc-eqos";
		reg = <0x20000 0x10000>,
		@@ -754,42 +789,15 @@
		<&clock_gcc GCC_ETH_SLAVE_AHB_CLK>;
		clock-names = "eth_axi_clk", "eth_ptp_clk",
		"eth_rgmii_clk", "eth_slave_ahb_clk";
		qcom,phy-intr-redirect = <&tlmm 84 GPIO_ACTIVE_LOW>;
		qcom,phy-reset = <&tlmm 85 GPIO_ACTIVE_LOW>;
		vreg_rgmii-supply = <&vreg_rgmii>;
		vreg_emac_phy-supply = <&vreg_emac_phy>;
		vreg_rgmii_io_pads-supply = <&vreg_rgmii_io_pads>;
		gdsc_emac-supply = <&gdsc_emac>;
		io-macro-info {
		io-macro-bypass-mode = <0>;
		io-interface = "rgmii";
		};
		};

		qmp_aop: qcom,qmp-aop@c300000 {
		compatible = "qcom,qmp-mbox";
		label = "aop";
		reg = <0xc300000 0x400>,
		<0x17811008 0x4>;
		reg-names = "msgram", "irq-reg-base";
		qcom,irq-mask = <0x2>;
		interrupts = <GIC_SPI 221 IRQ_TYPE_EDGE_RISING>;
		priority = <0>;
		mbox-desc-offset = <0x0>;
		#mbox-cells = <1>;
		};

		usb_detect: qcom,gpio-usbdetect {
		compatible = "qcom,gpio-usbdetect";
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0x0d 0x0 IRQ_TYPE_NONE>;
		interrupt-names = "vbus_det_irq";
		status = "disabled";
		};
		};

		#include "pmxpoorwills.dtsi"
		#include "sdxpoorwills-blsp.dtsi"
		#include "sdxpoorwills-regulator.dtsi"
		#include "sdxpoorwills-smp2p.dtsi"
		#include "sdxpoorwills-usb.dtsi"
		#include "sdxpoorwills-pcie.dtsi"
		#include "sdxpoorwills-bus.dtsi"
		#include "sdxpoorwills-thermal.dtsi"
		#include "sdxpoorwills-audio.dtsi"
		#include "sdxpoorwills-ion.dtsi"
		#include "msm-arm-smmu-sdxpoorwills.dtsi"