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

Commit 05baf147 authored Apr 09, 2018 by Greg Hackmann

Merge tag 'v4.9.93' into android-4.9



This is the 4.9.93 stable release

Change-Id: I4293d83f45982c6fd479bddbf9b0f811248ddc30
Signed-off-by: Greg Hackmann <ghackmann@google.com>

parents 4fb542f2 d32da5bd

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,15 @@ Optional properties:
		- ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.
		Selection primary or secondary function associated to GPADC_START
		and SYSEN2 pin/pad for DVFS2 interface
		- ti,palmas-override-powerhold: This is applicable for PMICs for which
		GPIO7 is configured in POWERHOLD mode which has higher priority
		over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
		bit is turned off. This property enables driver to over ride the
		POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
		scenarios. So for GPIO7 if ti,palmas-override-powerhold is set
		then the GPIO_7 field should never be muxed to anything else.
		It should be set to POWERHOLD by default and only in case of
		power off scenarios the driver will over ride the mux value.

		This binding uses the following generic properties as defined in
		pinctrl-bindings.txt:

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 92
		SUBLEVEL = 93
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/boot/dts/am335x-pepper.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@
		&audio_codec {
		status = "okay";

		reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
		gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
		AVDD-supply = <&ldo3_reg>;
		IOVDD-supply = <&ldo3_reg>;
		DRVDD-supply = <&ldo3_reg>;

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,7 @@
		interrupt-controller;

		ti,system-power-controller;
		ti,palmas-override-powerhold;

		tps659038_pmic {
		compatible = "ti,tps659038-pmic";

arch/arm/boot/dts/am57xx-idk-common.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		#interrupt-cells = <2>;
		interrupt-controller;
		ti,system-power-controller;
		ti,palmas-override-powerhold;

		tps659038_pmic {
		compatible = "ti,tps659038-pmic";