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

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

Merge "ARM: dts: msm: Add pm8150b_pdphy peripheral for Kona"

parents 7f5d2f3e 3f94a2cd

arch/arm64/boot/dts/qcom/kona-pmic-overlay.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -32,3 +32,23 @@ 
		#size-cells = <0>;

	};

};



&pm8150b_charger {

	smb5_vconn: qcom,smb5-vconn {

		regulator-name = "smb5-vconn";

	};



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

	};

};



&pm8150b_pdphy {

	vdd-pdphy-supply = <&pm8150_l2>;

	vbus-supply = <&smb5_vbus>;

	vconn-supply = <&smb5_vconn>;

};



&usb0 {

	extcon = <&pm8150b_pdphy>;

};

arch/arm64/boot/dts/qcom/kona-rumi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
};



&usb0 {

	/delete-property/ extcon;

	dwc3@a600000 {

		usb-phy = <&usb_emu_phy>, <&usb_nop_phy>;

		maximum-speed = "high-speed";

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

+27 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

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

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



#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/interrupt-controller/irq.h>
@@ -231,6 +231,32 @@ 
			};

		};



		pm8150b_pdphy: qcom,usb-pdphy@1700 {

			compatible = "qcom,qpnp-pdphy";

			reg = <0x1700 0x100>;

			interrupts = <0x2 0x17 0x0 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x1 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x2 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x3 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x4 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x5 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x6 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x7 IRQ_TYPE_EDGE_RISING>;



			interrupt-names = "sig-tx",

					  "sig-rx",

					  "msg-tx",

					  "msg-rx",

					  "msg-tx-failed",

					  "msg-tx-discarded",

					  "msg-rx-discarded",

					  "fr-swap";



			qcom,default-sink-caps = <5000 3000>, /* 5V @ 3A */

						 <9000 3000>, /* 9V @ 3A */

						 <12000 2250>; /* 12V @ 2.25A */

		};



		pm8150b_fg: qpnp,fg {

			compatible = "qcom,fg-gen4";

			#address-cells = <1>;

arch/arm64/configs/vendor/kona-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -394,6 +394,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_TYPEC=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_TEST=y

arch/arm64/configs/vendor/kona_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -404,6 +404,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_TYPEC=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_TEST=y