Merge branch 'ib-scmi-pinctrl-gpio' of... (541c5b08) · Commits · git / linux-net

Documentation/devicetree/bindings/gpio/pin-control-gpio.yaml

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/gpio/pin-control-gpio.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Pin control based generic GPIO controller

		description:
		The pin control-based GPIO will facilitate a pin controller's ability
		to drive electric lines high/low and other generic properties of a
		pin controller to perform general-purpose one-bit binary I/O.

		maintainers:
		- Dan Carpenter <dan.carpenter@linaro.org>

		properties:
		compatible:
		const: scmi-pinctrl-gpio

		gpio-controller: true

		"#gpio-cells":
		const: 2

		gpio-line-names: true

		gpio-ranges: true

		ngpios: true

		patternProperties:
		"^.+-hog(-[0-9]+)?$":
		type: object

		required:
		- gpio-hog

		required:
		- compatible
		- gpio-controller
		- "#gpio-cells"
		- gpio-ranges
		- ngpios

		additionalProperties: false

		examples:
		- \|
		gpio {
		compatible = "scmi-pinctrl-gpio";
		gpio-controller;
		#gpio-cells = <2>;
		ngpios = <4>;
		gpio-line-names = "gpio_5_17", "gpio_5_20", "gpio_5_22", "gpio_2_1";
		gpio-ranges = <&scmi_pinctrl 0 30 4>;
		pinctrl-names = "default";
		pinctrl-0 = <&keys_pins>;
		};

drivers/firmware/arm_scmi/pinctrl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,8 @@ static int scmi_pinctrl_request_free(const struct scmi_protocol_handle *ph,
		tx->flags = cpu_to_le32(type);

		ret = ph->xops->do_xfer(ph, t);
		if (ret == -EOPNOTSUPP)
		ret = 0;
		ph->xops->xfer_put(ph, t);

		return ret;

drivers/gpio/Kconfig

+13 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,19 @@ config GPIO_BRCMSTB
		help
		Say yes here to enable GPIO support for Broadcom STB (BCM7XXX) SoCs.

		config GPIO_BY_PINCTRL
		tristate "GPIO support based on a pure pin control backend"
		depends on GPIOLIB
		help
		Support for generic GPIO handling based on top of pin control.
		Traditionally, firmware creates a GPIO interface or a pin
		controller interface and we have a driver to support it. But
		in SCMI, the pin control interface is generic and we can
		create a simple GPIO device based on the pin control interface
		without doing anything custom.

		This driver used to do GPIO over the ARM SCMI protocol.

		config GPIO_CADENCE
		tristate "Cadence GPIO support"
		depends on OF

drivers/gpio/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o
		obj-$(CONFIG_GPIO_BLZP1600) += gpio-blzp1600.o
		obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
		obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
		obj-$(CONFIG_GPIO_BY_PINCTRL) += gpio-by-pinctrl.o
		obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o
		obj-$(CONFIG_GPIO_CGBC) += gpio-cgbc.o
		obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o

drivers/gpio/gpio-by-pinctrl.c

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		//
		// Copyright (C) 2026 Linaro Inc.
		// Author: AKASHI takahiro <takahiro.akashi@linaro.org>

		#include <linux/errno.h>
		#include <linux/gpio/driver.h>
		#include <linux/mod_devicetable.h>
		#include <linux/module.h>
		#include <linux/pinctrl/consumer.h>
		#include <linux/platform_device.h>
		#include <linux/types.h>

		#include "gpiolib.h"

		static int pin_control_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
		{
		unsigned long config;
		int ret;

		config = PIN_CONFIG_OUTPUT_ENABLE;
		ret = pinctrl_gpio_get_config(gc, offset, &config);
		if (ret)
		return ret;
		if (config)
		return GPIO_LINE_DIRECTION_OUT;

		return GPIO_LINE_DIRECTION_IN;
		}

		static int pin_control_gpio_direction_output(struct gpio_chip *chip,
		unsigned int offset, int val)
		{
		return pinctrl_gpio_direction_output(chip, offset);
		}

		static int pin_control_gpio_get(struct gpio_chip *chip, unsigned int offset)
		{
		unsigned long config;
		int ret;

		config = PIN_CONFIG_LEVEL;
		ret = pinctrl_gpio_get_config(chip, offset, &config);
		if (ret)
		return ret;

		return !!config;
		}

		static int pin_control_gpio_set(struct gpio_chip *chip, unsigned int offset,
		int val)
		{
		unsigned long config;

		config = pinconf_to_config_packed(PIN_CONFIG_LEVEL, val);
		return pinctrl_gpio_set_config(chip, offset, config);
		}

		static int pin_control_gpio_probe(struct platform_device *pdev)
		{
		struct device *dev = &pdev->dev;
		struct gpio_chip *chip;

		chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
		if (!chip)
		return -ENOMEM;

		chip->label = dev_name(dev);
		chip->parent = dev;
		chip->base = -1;

		chip->request = gpiochip_generic_request;
		chip->free = gpiochip_generic_free;
		chip->get_direction = pin_control_gpio_get_direction;
		chip->direction_input = pinctrl_gpio_direction_input;
		chip->direction_output = pin_control_gpio_direction_output;
		chip->get = pin_control_gpio_get;
		chip->set = pin_control_gpio_set;
		chip->set_config = gpiochip_generic_config;

		return devm_gpiochip_add_data(dev, chip, NULL);
		}

		static const struct of_device_id pin_control_gpio_match[] = {
		{ .compatible = "scmi-pinctrl-gpio" },
		{ /* sentinel */ }
		};
		MODULE_DEVICE_TABLE(of, pin_control_gpio_match);

		static struct platform_driver pin_control_gpio_driver = {
		.probe = pin_control_gpio_probe,
		.driver = {
		.name = "pin-control-gpio",
		.of_match_table = pin_control_gpio_match,
		},
		};
		module_platform_driver(pin_control_gpio_driver);

		MODULE_AUTHOR("AKASHI Takahiro <takahiro.akashi@linaro.org>");
		MODULE_DESCRIPTION("Pinctrl based GPIO driver");
		MODULE_LICENSE("GPL");