Merge tag 'ib-mfd-gpio-pwm-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd (4c82005f) · Commits · git / linux-net

Documentation/devicetree/bindings/mfd/adi,adp5585.yaml

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/mfd/adi,adp5585.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Analog Devices ADP5585 Keypad Decoder and I/O Expansion

		maintainers:
		- Laurent Pinchart <laurent.pinchart@ideasonboard.com>

		description:
		The ADP5585 is a 10/11 input/output port expander with a built in keypad
		matrix decoder, programmable logic, reset generator, and PWM generator.

		properties:
		compatible:
		items:
		- enum:
		- adi,adp5585-00 # Default
		- adi,adp5585-01 # 11 GPIOs
		- adi,adp5585-02 # No pull-up resistors by default on special pins
		- adi,adp5585-03 # Alternate I2C address
		- adi,adp5585-04 # Pull-down resistors on all pins by default
		- const: adi,adp5585

		reg:
		maxItems: 1

		interrupts:
		maxItems: 1

		vdd-supply: true

		gpio-controller: true

		'#gpio-cells':
		const: 2

		gpio-reserved-ranges: true

		"#pwm-cells":
		const: 3

		required:
		- compatible
		- reg
		- gpio-controller
		- "#gpio-cells"
		- "#pwm-cells"

		allOf:
		- if:
		properties:
		compatible:
		contains:
		const: adi,adp5585-01
		then:
		properties:
		gpio-reserved-ranges: false
		else:
		properties:
		gpio-reserved-ranges:
		maxItems: 1
		items:
		items:
		- const: 5
		- const: 1

		additionalProperties: false

		examples:
		- \|
		i2c {
		#address-cells = <1>;
		#size-cells = <0>;

		io-expander@34 {
		compatible = "adi,adp5585-00", "adi,adp5585";
		reg = <0x34>;

		vdd-supply = <&reg_3v3>;

		gpio-controller;
		#gpio-cells = <2>;
		gpio-reserved-ranges = <5 1>;

		#pwm-cells = <3>;
		};
		};

		...

+0 −4

Original line number	Diff line number	Diff line
		@@ -38,10 +38,6 @@ properties:
		- ad,adm9240
		# AD5110 - Nonvolatile Digital Potentiometer
		- adi,ad5110
		# Analog Devices ADP5585 Keypad Decoder and I/O Expansion
		- adi,adp5585
		# Analog Devices ADP5585 Keypad Decoder and I/O Expansion with support for Row5
		- adi,adp5585-02
		# Analog Devices ADP5589 Keypad Decoder and I/O Expansion
		- adi,adp5589
		# Analog Devices LT7182S Dual Channel 6A, 20V PolyPhase Step-Down Silent Switcher

+11 −0

Original line number	Diff line number	Diff line
		@@ -537,6 +537,17 @@ F: drivers/leds/leds-adp5520.c
		F: drivers/mfd/adp5520.c
		F: drivers/video/backlight/adp5520_bl.c

		ADP5585 GPIO EXPANDER, PWM AND KEYPAD CONTROLLER DRIVER
		M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		L: linux-gpio@vger.kernel.org
		L: linux-pwm@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings//adi,adp5585.yaml
		F: drivers/gpio/gpio-adp5585.c
		F: drivers/mfd/adp5585.c
		F: drivers/pwm/pwm-adp5585.c
		F: include/linux/mfd/adp5585.h

		ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
		M: Michael Hennerich <michael.hennerich@analog.com>
		S: Supported

+7 −0

Original line number	Diff line number	Diff line
		@@ -1233,6 +1233,13 @@ config GPIO_ADP5520
		This option enables support for on-chip GPIO found
		on Analog Devices ADP5520 PMICs.

		config GPIO_ADP5585
		tristate "GPIO Support for ADP5585"
		depends on MFD_ADP5585
		help
		This option enables support for the GPIO function found in the Analog
		Devices ADP5585.

		config GPIO_ALTERA_A10SR
		tristate "Altera Arria10 System Resource GPIO"
		depends on MFD_ALTERA_A10SR

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o
		obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o
		obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
		obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
		obj-$(CONFIG_GPIO_ADP5585) += gpio-adp5585.o
		obj-$(CONFIG_GPIO_AGGREGATOR) += gpio-aggregator.o
		obj-$(CONFIG_GPIO_ALTERA_A10SR) += gpio-altera-a10sr.o
		obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o