From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- .../devicetree/bindings/extcon/extcon-arizona.txt | 15 +++++++++++++++ .../devicetree/bindings/extcon/extcon-palmas.txt | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 kernel/Documentation/devicetree/bindings/extcon/extcon-arizona.txt (limited to 'kernel/Documentation/devicetree/bindings/extcon') diff --git a/kernel/Documentation/devicetree/bindings/extcon/extcon-arizona.txt b/kernel/Documentation/devicetree/bindings/extcon/extcon-arizona.txt new file mode 100644 index 000000000..e1705fae6 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/extcon/extcon-arizona.txt @@ -0,0 +1,15 @@ +Cirrus Logic Arizona class audio SoCs + +These devices are audio SoCs with extensive digital capabilities and a range +of analogue I/O. + +This document lists Extcon specific bindings, see the primary binding document: + ../mfd/arizona.txt + +Optional properties: + + - wlf,hpdet-channel : Headphone detection channel. + ARIZONA_ACCDET_MODE_HPL or 1 - Headphone detect mode is set to HPDETL + ARIZONA_ACCDET_MODE_HPR or 2 - Headphone detect mode is set to HPDETR + If this node is not mentioned or if the value is unknown, then + headphone detection mode is set to HPDETL. diff --git a/kernel/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/kernel/Documentation/devicetree/bindings/extcon/extcon-palmas.txt index 45414bbcd..f61d5af44 100644 --- a/kernel/Documentation/devicetree/bindings/extcon/extcon-palmas.txt +++ b/kernel/Documentation/devicetree/bindings/extcon/extcon-palmas.txt @@ -10,8 +10,11 @@ Required Properties: Optional Properties: - ti,wakeup : To enable the wakeup comparator in probe - - ti,enable-id-detection: Perform ID detection. + - ti,enable-id-detection: Perform ID detection. If id-gpio is specified + it performs id-detection using GPIO else using OTG core. - ti,enable-vbus-detection: Perform VBUS detection. + - id-gpio: gpio for GPIO ID detection. See gpio binding. + - debounce-delay-ms: debounce delay for GPIO ID pin in milliseconds. palmas-usb { compatible = "ti,twl6035-usb", "ti,palmas-usb"; -- cgit 1.2.3-korg