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

Commit 18973ceb authored by Lee Jones's avatar Lee Jones
Browse files

Merge branches 'ib-mfd-gpio-4.12', 'ib-mfd-iio-input-4.12',...

Merge branches 'ib-mfd-gpio-4.12', 'ib-mfd-iio-input-4.12', 'ib-mfd-input-4.12', 'ib-mfd-leds-4.12', 'ib-mfd-phy-4.12' and 'ib-mfd-pinctrl-samsung-4.12' into ibs-for-mfd-merged
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
Motorola CPCAP on key

This module is part of the CPCAP. For more details about the whole
chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.

This module provides a simple power button event via an Interrupt.

Required properties:
- compatible: should be one of the following
   - "motorola,cpcap-pwrbutton"
- interrupts: irq specifier for CPCAP's ON IRQ

Example:

&cpcap {
	cpcap_pwrbutton: pwrbutton {
		compatible = "motorola,cpcap-pwrbutton";
		interrupts = <23 IRQ_TYPE_NONE>;
	};
};
+13 −14
Original line number Diff line number Diff line
@@ -229,6 +229,19 @@ config EXYNOS_ADC
	  To compile this driver as a module, choose M here: the module will be
	  called exynos_adc.

config MXS_LRADC_ADC
	tristate "Freescale i.MX23/i.MX28 LRADC ADC"
	depends on MFD_MXS_LRADC
	select IIO_BUFFER
	select IIO_TRIGGERED_BUFFER
	help
	  Say yes here to build support for the ADC functions of the
	  i.MX23/i.MX28 LRADC. This includes general-purpose ADC readings,
	  battery voltage measurement, and die temperature measurement.

	  This driver can also be built as a module. If so, the module will be
	  called mxs-lradc-adc.

config FSL_MX25_ADC
	tristate "Freescale MX25 ADC driver"
	depends on MFD_MX25_TSADC
@@ -411,20 +424,6 @@ config MESON_SARADC
	  To compile this driver as a module, choose M here: the
	  module will be called meson_saradc.

config MXS_LRADC
        tristate "Freescale i.MX23/i.MX28 LRADC"
        depends on (ARCH_MXS || COMPILE_TEST) && HAS_IOMEM
        depends on INPUT
        select STMP_DEVICE
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
          Say yes here to build support for i.MX23/i.MX28 LRADC convertor
          built into these chips.

          To compile this driver as a module, choose M here: the
          module will be called mxs-lradc.

config NAU7802
	tristate "Nuvoton NAU7802 ADC driver"
	depends on I2C
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ obj-$(CONFIG_MCP3422) += mcp3422.o
obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o
obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o
obj-$(CONFIG_MESON_SARADC) += meson_saradc.o
obj-$(CONFIG_MXS_LRADC) += mxs-lradc.o
obj-$(CONFIG_MXS_LRADC_ADC) += mxs-lradc-adc.o
obj-$(CONFIG_NAU7802) += nau7802.o
obj-$(CONFIG_PALMAS_GPADC) += palmas_gpadc.o
obj-$(CONFIG_QCOM_SPMI_IADC) += qcom-spmi-iadc.o
+843 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading