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

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

Merge "media: rc: MSM GENI-IR controller driver"

parents 698de9b2 48da75bf
Loading
Loading
Loading
Loading
+43 −0
Original line number Diff line number Diff line
MSM Generic Serial Interface Infrared (GENI-IR) Controller

Required properties:
- compatible : Should be "qcom,msm-geni-ir"
- reg : Offset and length of the register region for the device
- reg-names : Register region name referenced in 'reg' above
	The only required register resource entry is:
	"base"       : GENI-IR controller register block
- interrupts : Interrupt numbers used by this controller
- interrupt-names : Interrupt resource names referenced in 'interrupts' above
	Required interrupt resource entries are:
	"geni-ir-core-irq"   : GENI-IR core interrupt
	"geni-ir-wakeup-irq" : GENI-IR wakeup interrupt
- qcom,geni-ir-gpio-tx  : GPIO pin number of the GENI-IR transmit line
- qcom,geni-ir-gpio-rx  : GPIO pin number of the GENI-IR receive line

Aliases :
Aliases may be optionally used for GENI-IR devices on a target.
The alias will have the following format:
	'geni_ir{n}' where n is the instance number.

GENI-IR device is the child device of the SPSS device.

Example:
	aliases {
		geni_ir1 = &geni_ir_1;
	};

	qcom,msm-spss@fc5c3000 {

		...

		geni_ir_1: qcom,msm-geni-ir@fc5c1000 {
			compatible = "qcom,msm-geni-ir";
			reg-names = "base";
			reg = <0xfc5c1000 0x1000>;
			interrupts = <0 284 0>, <0 285 0>;
			interrupt-names = "geni-ir-core-irq",
					  "geni-ir-wakeup-irq";
			qcom,geni-ir-gpio-tx = <&msmgpio 8 0>;
			qcom,geni-ir-gpio-rx = <&msmgpio 9 0>;
		};
	};
+19 −0
Original line number Diff line number Diff line
@@ -342,4 +342,23 @@ config IR_GPIO_CIR
	   To compile this driver as a module, choose M here: the module will
	   be called gpio-ir-recv.

config IR_MSM_GENI
	tristate "MSM GENI IR Controller"
	depends on RC_CORE
	default n
	---help---
	   Say Y here to enable support for integrated infrared module
	   for MSM family processors.

	   To compile this driver as a module, choose M here: the
	   module will be called msm-geni-ir.

config IR_MSM_GENI_TX
	bool "MSM GENI IR Controller trasmitter"
	depends on IR_MSM_GENI
	default n
	---help---
	   Say Y here to enable support for integrated infrared transmitter
	   for MSM family processors.

endif #RC_DEVICES
+1 −0
Original line number Diff line number Diff line
@@ -32,3 +32,4 @@ obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
obj-$(CONFIG_IR_IGUANA) += iguanair.o
obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
obj-$(CONFIG_IR_MSM_GENI) += msm-geni-ir.o
+1126 −0

File added.

Preview size limit exceeded, changes collapsed.