Promotion of kernel.lnx.4.4-160711. (819b6079) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ compatible = "qcom,msmhamster-rumi"
		compatible = "qcom,msmhamster-cdp"
		compatible = "qcom,msmhamster-mtp"
		compatible = "qcom,msmfalcon-sim"
		compatible = "qcom,msmfalcon-rumi"
		compatible = "qcom,msm8952-rumi"
		compatible = "qcom,msm8952-sim"
		compatible = "qcom,msm8952-qrd"

Documentation/devicetree/bindings/leds/leds-qpnp-flash-v2.txt

+46 −13

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@ camera sensor when background light is dim to capture good
		picture. It can also be used for flashlight/torch application.
		It is part of PMIC on Qualcomm Technologies Inc. reference platforms.

		Main node:

		Required properties:
		- compatible : Should be "qcom,qpnp-flash-led-v2"
		- reg : Base address and size for flash LED modules
		@@ -14,10 +16,17 @@ Optional properties:
		- qcom,hdrm-auto-mode : Boolean type to select headroom auto mode enabled or not
		- qcom,isc-delay : Integer type to specify short circuit delay. Valid values are 32, 64,
		128, 192. Unit is us.
		- qcom,hw-strobe-option : Integer type to specify hardware strobe option. Based on the specified
		value, additional GPIO configuration may be required to provide strobing
		support. Supported values are:
		0: Flash strobe is used for LED1, LED2, LED3
		1: Flash strobe is used for LED1, LED2 and GPIO10 is used for LED3
		2: Flash strobe is used for LED1; GPIO9 is used for LED2; GPIO10 is used for LED3

		Child node: Contains settings for each individual LED. Each LED channel needs a flash node and
		torch node for itself, and an individual switch node to serve as an overall switch.

		Required properties inside child node. Child node contains settings for each individual LED.
		Each LED channel needs a flash node and torch node for itself, and an individual switch node to
		serve as an overall switch.
		Required Properties:
		- label : Type of led that will be used, either "flash", "torch", or "switch.
		- qcom,led-name : Name of the LED.
		- qcom,default-led-trigger : Trigger for the camera flash and torch. Accepted values are
		@@ -35,7 +44,7 @@ serve as an overall switch.
		type specifying flash duration. Values are from 10ms to 1280ms with
		10ms resolution. This is not required for switch node.

		Optional properties inside child node:
		Optional properties:
		- qcom,current-ma : operational current intensity for LED in mA. Accepted values are a
		positive integer in the range of 0 to qcom,max-current inclusive.
		- qcom,ires-ua : Integer type to specify current resolution. Accepted values should be
		@@ -44,15 +53,35 @@ Optional properties inside child node:
		with 25mV resolution. Default setting is 325mV
		- qcom,hdrm-vol-hi-lo-win-mv : Integer type to specify headroom voltage swing range. Values are
		from 0mV to 375mV with 25mV resolution. Default setting is 100mV.
		- pinctrl-names : This should be defined if a target uses pinctrl framework and there is GPIO
		requirement for flash LEDs. See "pinctrl" in
		Documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt. It should specify
		the names of the configs that pinctrl can install in driver.
		Following are the pinctrl configs that can be installed:
		"led_enable" : Enablement configuration of pins. This should specify active
		config defined in each pin or pin group.
		"led_disable" : Disablement configuration of pins. This should specify inactive
		config defined in each pin or pin groups.
		- pinctrl-names : Name of the pinctrl configuration that will be used when external GPIOs
		are used for enabling/disabling, HW strobing of flash LEDs. For more
		information on using pinctrl, please refer
		Documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt
		Following are the pinctrl configs that can be specified:
		"led_enable" : pinctrl config to enable led. This should specify the active
		configuration defined for each pin or pin group.
		"led_disable" : pinctrl config to disable led. This should specify the sleep
		configuration defined for each pin or pin group.
		"strobe_enable" : pinctrl config to enable hw-strobe. This should specify the
		active configuration defined for each pin or pin group.
		"strobe_disable" : pinctrl config to disable hw-strobe. This should specify the
		sleep configuration defined for each pin or pin group.
		- qcom,hw-strobe-gpio : phandle to specify GPIO for hardware strobing. This is used when there is no
		pinctrl support or PMIC GPIOs are used.
		- qcom,hw-strobe-sel : Boolean property to enable hardware strobe. If not defined, software strobe
		will be used.
		- qcom,hw-strobe-edge-trigger : Boolean property to select trigger type. If defined, hw-strobe is set to
		be edge triggered. Otherwise, it is level triggered.
		- qcom,hw-strobe-active-low : Boolean property to select strobe signal polarity. If defined, hw-strobe
		signal polarity is set to active-low, else it is active-high.
		- reg<n> : reg<n> (<n> represents number. e.g. 0,1,2,..) subnode is to add support for
		multiple power sources. This subnode should only be specified for switch nodes.
		Required property inside regulator node:
		- regulator-name : Name of the regulator which has to be used for this
		switch node.
		Optional property inside regulator node:
		- max-voltage-uv : This specifies max voltage of regulator. Some switch
		or boost regulator does not need this property.

		Example:
		qcom,leds@d300 {
		@@ -156,6 +185,10 @@ Example:
		qcom,led-name = "led:switch";
		qcom,default-led-trigger =
		"switch_trigger";
		reg0 {
		regulator-name = "pmicobalt_bob";
		max-voltage-uv = <3600000>;
		};
		};
		};

Documentation/devicetree/bindings/mfd/qcom-i2c-pmic.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -32,29 +32,29 @@ Platform independent properties:
		Definition: 7-bit I2C address of the device.

		- interrupt-parent
		Usage: required
		Usage: optional
		Value type: <phandle>
		Definition: phandle of the interrupt controller which services the
		summary interrupt.

		- interrupts
		Usage: required
		Usage: optional
		Value type: <prop-encoded-array>
		Definition: Summary interrupt specifier.

		- interrupt-controller
		Usage: required
		Usage: optional
		Value type: <empty>
		Definition: Boolean flag which indicates this device node is an
		interrupt controller.

		- #interrupt-cells
		Usage: required
		Usage: optional
		Value type: <u32>
		Definition: Number of cells to encode an interrupt source.

		- qcom,periph-map
		Usage: required
		Usage: optional
		Value type: <prop-encoded-array>
		Definition: A list of u32 arrays. This provides a mapping between the
		summary status register bits and peripheral addresses.

Documentation/devicetree/bindings/sound/qcom-usb-audio-qmi-dev.txt

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		QTI USB Audio QMI Device

		USB Audio QMI device is used to attach to remote processor IOMMU and
		map USB Audio driver specific memory to iova to share with remote
		processor.

		Required Properties:

		- compatible : "qcom,usb-audio-qmi-dev"

		- iommus : A list of phandle and IOMMU specifier pairs that describe the
		IOMMU master interfaces of the device.

		- qcom,usb-audio-stream-id : Stream id is prepended to iova before passing
		iova to remote processor. This allows remote processor to access iova.

		- qcom,usb-audio-intr-num : Interrupter number for external sub system
		destination.

		Example:
		usb_audio_qmi_dev {
		compatible = "qcom,usb-audio-qmi-dev";
		iommus = <&lpass_q6_smmu 12>;
		qcom,usb-audio-stream-id = <12>;
		qcom,usb-audio-intr-num = <1>;
		};

arch/arm/boot/dts/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,8 @@ dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \

		dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb

		dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb
		dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb \
		msmfalcon-rumi.dtb

		ifeq ($(CONFIG_ARM64),y)
		always := $(dtb-y)