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

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

Merge "defconfig: enable PMIC Type-C driver"

parents 24eecc88 66336464

Documentation/devicetree/bindings/power/qpnp-smbcharger.txt

+7 −0
Original line number Diff line number Diff line
@@ -284,6 +284,13 @@ Optional Properties: 
						battery.

- qcom,vchg_sns-vadc		Phandle of the VADC node.

- qcom,vchg-adc-channel-id	The ADC channel to which the VCHG is routed.

- qcom,external-typec		A boolean property to be used when an external

				USB TypeC module is used with charger.

- qcom,typec-psy-name		The psy name to use for external typec. If

				'qcom,external-typec' is present then this is

				a required property.

- qcom,otg-pinctrl:		A boolean property to be used when OTG enable

				control is configured in pin control mode.



Example:

	qcom,qpnp-smbcharger {

Documentation/devicetree/bindings/power/qpnp-typec.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
QPNP USB Type-C module



QPNP USB Type-C module supports USB type-c ports and detection of

USB Type-C chargers that can supply upto 3A Vbus current for charging.



The QPNP USB Type-C interfaces via the SPMI bus.



Required properties :

- compatible : Must be "qcom,qpnp-typec"

- reg:			The SPMI address for this peripheral

- interrupts:		Specifies the interrupt associated with the peripheral.

- interrupt-names:	Specifies the interrupt names for the peripheral. Every

			available interrupt needs to have an associated name

			with it to indentify its purpose.



			- vrd-change:		Triggers on change in current

						capability of charger.

			- ufp-detach:		Triggers on cable detach in

						UFP mode.

			- ufp-detect:		Triggers on charger insertion.

			- dfp-detach:		Triggers on cable detach in

						DFP mode.

			- dfp-detect:		Triggers on OTG cable insertion.

			- vbus-err:		Triggers if VBUS is not

						detected within 275 msec after

						CC detection in UFP mode.

			- vconn-oc:		Triggers on VCONN overcurrent

						in DFP mode with active cable.



Optional properties:

- pinctrl-names : This should be defined if a target uses pinctrl framework

  for SSMUX control pin. See "pinctrl" in

  Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt.

  It should specify the names of the configs that pinctrl can install in driver.

  Following are the pinctrl config that can be installed:

      "typec_ssmux_config" : Default configuration of pins.

- <supply-name>-supply: handle to the regulator device tree node.

        "supply-name" is "ss-mux" regulator to drive super-speed MUX chip.



Example:

	qcom,qpnp-typec@bf00 {

		compatible = "qcom,qpnp-typec";

		reg = <0xbf00 0x100>;

		interrupts =	<0x0 0xbf 0x0>,

				<0x0 0xbf 0x1>,

				<0x0 0xbf 0x2>,

				<0x0 0xbf 0x3>,

				<0x0 0xbf 0x4>,

				<0x0 0xbf 0x6>,

				<0x0 0xbf 0x7>;



		interrupt-names =	"vrd-change",

					"ufp-detach",

					"ufp-detect",

					"dfp-detach",

					"dfp-detect",

					"vbus-err",

					"vconn-oc";

	};

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ CONFIG_SMB1351_USB_CHARGER=y 
CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_FG=y

CONFIG_BATTERY_BCL=y

CONFIG_QPNP_TYPEC=y

CONFIG_MSM_BCL_CTL=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_POWER_RESET_MSM=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ CONFIG_SMB1351_USB_CHARGER=y 
CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_FG=y

CONFIG_BATTERY_BCL=y

CONFIG_QPNP_TYPEC=y

CONFIG_MSM_BCL_CTL=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_POWER_RESET_MSM=y

drivers/power/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -554,6 +554,19 @@ config QPNP_LINEAR_CHARGER 
	  detection and charging. The driver also offers relevant information

	  to userspace via the power supply framework.



config QPNP_TYPEC

	tristate "QPNP Type-C driver"

	depends on SPMI || MSM_SPMI

	depends on OF_SPMI

	depends on MSM_QPNP_INT

	help

	  Say Y here to enable QPNP Type-C driver.

	  The QPNP Type-C module supports the USB type-C protocol. It supports type-C

	  cable detection and other type-C parameters such as current-capability and

	  CC-orientation. The module does not support USB power-delivery. The driver

	  adds support to report these type-C parameters via the power-supply

	  framework.



config MSM_BCL_CTL

	bool "BCL Framework driver"

	help