Merge "Merge remote-tracking branch '4.9/tmp-e6b0c64f' into 4.9" (468cf986) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -8,8 +8,9 @@ This driver provides a simple power button event via an Interrupt.
		Required properties:
		- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"

		Required properties for TPS65218:
		Required properties:
		- interrupts: should be one of the following
		- <2>: For controllers compatible with tps65217
		- <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218

		Examples:
		@@ -17,6 +18,7 @@ Examples:
		&tps {
		tps65217-pwrbutton {
		compatible = "ti,tps65217-pwrbutton";
		interrupts = <2>;
		};
		};

+6 −1

Original line number	Diff line number	Diff line
		@@ -2,11 +2,16 @@ TPS65217 Charger

		Required Properties:
		-compatible: "ti,tps65217-charger"
		-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change.
		Should be <0> for the USB charger and <1> for the AC adapter.
		-interrupt-names: Should be "USB" and "AC"

		This node is a subnode of the tps65217 PMIC.

		Example:

		tps65217-charger {
		compatible = "ti,tps65090-charger";
		compatible = "ti,tps65217-charger";
		interrupts = <0>, <1>;
		interrupt-names = "USB", "AC";
		};

+1 −1

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@

		#include <linux/smp.h>
		#include <linux/irq.h>
		#include <linux/irqchip/chained_irq.h>
		#include <linux/spinlock.h>
		#include <asm/irqflags-arcv2.h>
		#include <asm/mcip.h>
		@@ -221,10 +222,13 @@ static irq_hw_number_t idu_first_hwirq;
		static void idu_cascade_isr(struct irq_desc *desc)
		{
		struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);
		struct irq_chip *core_chip = irq_desc_get_chip(desc);
		irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));
		irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;

		chained_irq_enter(core_chip, desc);
		generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));
		chained_irq_exit(core_chip, desc);
		}

		static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hwirq)

+1 −1