summaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch')
-rw-r--r--target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch1324
1 files changed, 0 insertions, 1324 deletions
diff --git a/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
deleted file mode 100644
index 429c3e2fd2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
+++ /dev/null
@@ -1,1324 +0,0 @@
-From af7e60a33f0b5ce84bffb69ba084ba1edd180195 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 9 Jun 2021 15:48:28 +0100
-Subject: [PATCH] pinctrl: bcm2712 pinctrl/pinconf driver
-
-pinctrl: bcm2712: Reject invalid pulls
-
-Reject attempts to set pulls on aon-sgpios, and fix pull shift
-values.
-
-pinctrl: bcm2712: Add 7712 support, fix 2712 count
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl-bcm2712: add EMMC pins so pulls can be set
-
-These pins have pad controls but not mux controls. They look enough like
-GPIOs to squeeze in at the end of the list though.
-
-pinctrl: bcm2712: correct BCM2712C0 AON_GPIO pad pull control offset
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-pinctrl: bcm2712: on C0 the regular GPIO pad control register moves too
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-pinctrl: bcm2712: Implement (partially) pinconf_get
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Convert to generic pinconf
-
-Remove the legacy brcm,* pin configuration support and replace it with
-a proper generic pinconf interface, using named functions instead of
-alt function numbers. This is nicer for users, less error-prone, and
-immune to some of the C0->D0 changes.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Remove vestigial pull parameter
-
-Now the legacy brcm, pinconf parameters are no longer supported, this
-custom pin config parameter is not needed.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Guard against bad func numbers
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: A better attempt at D0 support
-
-The BCM2712D0 sparse pinctrl maps play havoc with the old GPIO_REGS
-macro, so make the bit positions explicit. And delete the unwanted
-GPIO and pinmux declarations on D0.
-
-Note that a Pi 5 with D0 requires a separate DTS file with "bcm2712d0"
-compatible strings.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Delete base register constants
-
-BCM2712D0 deletes many GPIOs and their associated mux and pad bits,
-so much so that the offsets to the start of the pad control registers
-changes. Remove the constant offsets from the *GPIO_REGS macros,
-compensating by adjusting the per-GPIO values.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/bcm/Kconfig | 9 +
- drivers/pinctrl/bcm/Makefile | 1 +
- drivers/pinctrl/bcm/pinctrl-bcm2712.c | 1216 +++++++++++++++++++++++++
- 3 files changed, 1226 insertions(+)
- create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm2712.c
-
---- a/drivers/pinctrl/bcm/Kconfig
-+++ b/drivers/pinctrl/bcm/Kconfig
-@@ -3,6 +3,15 @@
- # Broadcom pinctrl drivers
- #
-
-+config PINCTRL_BCM2712
-+ bool "Broadcom BCM2712 PINCONF driver"
-+ depends on OF && (ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST)
-+ select PINMUX
-+ select PINCONF
-+ select GENERIC_PINCONF
-+ help
-+ Say Y here to enable the Broadcom BCM2835 GPIO driver.
-+
- config PINCTRL_BCM281XX
- bool "Broadcom BCM281xx pinctrl driver"
- depends on OF && (ARCH_BCM_MOBILE || COMPILE_TEST)
---- a/drivers/pinctrl/bcm/Makefile
-+++ b/drivers/pinctrl/bcm/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- # Broadcom pinctrl support
-
-+obj-$(CONFIG_PINCTRL_BCM2712) += pinctrl-bcm2712.o
- obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o
- obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o
- obj-$(CONFIG_PINCTRL_BCM4908) += pinctrl-bcm4908.o
---- /dev/null
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2712.c
-@@ -0,0 +1,1216 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Driver for Broadcom BCM2712 GPIO units (pinctrl only)
-+ *
-+ * Copyright (C) 2021-3 Raspberry Pi Ltd.
-+ * Copyright (C) 2012 Chris Boot, Simon Arlott, Stephen Warren
-+ *
-+ * Based heavily on the BCM2835 GPIO & pinctrl driver, which was inspired by:
-+ * pinctrl-nomadik.c, please see original file for copyright information
-+ * pinctrl-tegra.c, please see original file for copyright information
-+ */
-+
-+#include <linux/bitmap.h>
-+#include <linux/bug.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/of_address.h>
-+#include <linux/of.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/platform_device.h>
-+#include <linux/seq_file.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/types.h>
-+
-+#define MODULE_NAME "pinctrl-bcm2712"
-+
-+/* Register offsets */
-+
-+#define BCM2712_PULL_NONE 0
-+#define BCM2712_PULL_DOWN 1
-+#define BCM2712_PULL_UP 2
-+#define BCM2712_PULL_MASK 0x3
-+
-+#define BCM2712_FSEL_COUNT 9
-+#define BCM2712_FSEL_MASK 0xf
-+
-+#define FUNC(f) \
-+ [func_##f] = #f
-+#define PIN(i, f1, f2, f3, f4, f5, f6, f7, f8) \
-+ [i] = { \
-+ .funcs = { \
-+ func_##f1, \
-+ func_##f2, \
-+ func_##f3, \
-+ func_##f4, \
-+ func_##f5, \
-+ func_##f6, \
-+ func_##f7, \
-+ func_##f8, \
-+ }, \
-+ }
-+
-+#define REG_BIT_INVALID 0xffff
-+
-+#define BIT_TO_REG(b) (((b) >> 5) << 2)
-+#define BIT_TO_SHIFT(b) ((b) & 0x1f)
-+
-+#define GPIO_REGS(n, mr, mb, pr, pb) \
-+ [n] = { ((mr)*4)*8 + (mb)*4, ((pr)*4)*8 + (pb)*2 }
-+
-+#define EMMC_REGS(n, r, b) \
-+ [n] = { 0, ((r)*4)*8 + (b)*2 }
-+
-+#define AGPIO_REGS(n, mr, mb, pr, pb) \
-+ [n] = { ((mr)*4)*8 + (mb)*4, ((pr)*4)*8 + (pb)*2 }
-+
-+#define SGPIO_REGS(n, mr, mb) \
-+ [n+32] = { ((mr)*4)*8 + (mb)*4, REG_BIT_INVALID }
-+
-+#define GPIO_PIN(a) PINCTRL_PIN(a, "gpio" #a)
-+#define AGPIO_PIN(a) PINCTRL_PIN(a, "aon_gpio" #a)
-+#define SGPIO_PIN(a) PINCTRL_PIN(a+32, "aon_sgpio" #a)
-+
-+struct pin_regs {
-+ u16 mux_bit;
-+ u16 pad_bit;
-+};
-+
-+struct bcm2712_pinctrl {
-+ struct device *dev;
-+ void __iomem *base;
-+ struct pinctrl_dev *pctl_dev;
-+ struct pinctrl_desc pctl_desc;
-+ const struct pin_regs *pin_regs;
-+ const struct bcm2712_pin_funcs *pin_funcs;
-+ const char *const *gpio_groups;
-+ struct pinctrl_gpio_range gpio_range;
-+ spinlock_t lock;
-+};
-+
-+struct bcm_plat_data {
-+ const struct pinctrl_desc *pctl_desc;
-+ const struct pinctrl_gpio_range *gpio_range;
-+ const struct pin_regs *pin_regs;
-+ const struct bcm2712_pin_funcs *pin_funcs;
-+};
-+
-+struct bcm2712_pin_funcs {
-+ u8 funcs[BCM2712_FSEL_COUNT - 1];
-+};
-+
-+enum bcm2712_funcs {
-+ func_gpio,
-+ func_alt1,
-+ func_alt2,
-+ func_alt3,
-+ func_alt4,
-+ func_alt5,
-+ func_alt6,
-+ func_alt7,
-+ func_alt8,
-+ func_aon_cpu_standbyb,
-+ func_aon_fp_4sec_resetb,
-+ func_aon_gpclk,
-+ func_aon_pwm,
-+ func_arm_jtag,
-+ func_aud_fs_clk0,
-+ func_avs_pmu_bsc,
-+ func_bsc_m0,
-+ func_bsc_m1,
-+ func_bsc_m2,
-+ func_bsc_m3,
-+ func_clk_observe,
-+ func_ctl_hdmi_5v,
-+ func_enet0,
-+ func_enet0_mii,
-+ func_enet0_rgmii,
-+ func_ext_sc_clk,
-+ func_fl0,
-+ func_fl1,
-+ func_gpclk0,
-+ func_gpclk1,
-+ func_gpclk2,
-+ func_hdmi_tx0_auto_i2c,
-+ func_hdmi_tx0_bsc,
-+ func_hdmi_tx1_auto_i2c,
-+ func_hdmi_tx1_bsc,
-+ func_i2s_in,
-+ func_i2s_out,
-+ func_ir_in,
-+ func_mtsif,
-+ func_mtsif_alt,
-+ func_mtsif_alt1,
-+ func_pdm,
-+ func_pkt,
-+ func_pm_led_out,
-+ func_sc0,
-+ func_sd0,
-+ func_sd2,
-+ func_sd_card_a,
-+ func_sd_card_b,
-+ func_sd_card_c,
-+ func_sd_card_d,
-+ func_sd_card_e,
-+ func_sd_card_f,
-+ func_sd_card_g,
-+ func_spdif_out,
-+ func_spi_m,
-+ func_spi_s,
-+ func_sr_edm_sense,
-+ func_te0,
-+ func_te1,
-+ func_tsio,
-+ func_uart0,
-+ func_uart1,
-+ func_uart2,
-+ func_usb_pwr,
-+ func_usb_vbus,
-+ func_uui,
-+ func_vc_i2c0,
-+ func_vc_i2c3,
-+ func_vc_i2c4,
-+ func_vc_i2c5,
-+ func_vc_i2csl,
-+ func_vc_pcm,
-+ func_vc_pwm0,
-+ func_vc_pwm1,
-+ func_vc_spi0,
-+ func_vc_spi3,
-+ func_vc_spi4,
-+ func_vc_spi5,
-+ func_vc_uart0,
-+ func_vc_uart2,
-+ func_vc_uart3,
-+ func_vc_uart4,
-+ func__,
-+ func_count = func__
-+};
-+
-+static const struct pin_regs bcm2712_c0_gpio_pin_regs[] = {
-+ GPIO_REGS(0, 0, 0, 7, 7),
-+ GPIO_REGS(1, 0, 1, 7, 8),
-+ GPIO_REGS(2, 0, 2, 7, 9),
-+ GPIO_REGS(3, 0, 3, 7, 10),
-+ GPIO_REGS(4, 0, 4, 7, 11),
-+ GPIO_REGS(5, 0, 5, 7, 12),
-+ GPIO_REGS(6, 0, 6, 7, 13),
-+ GPIO_REGS(7, 0, 7, 7, 14),
-+ GPIO_REGS(8, 1, 0, 8, 0),
-+ GPIO_REGS(9, 1, 1, 8, 1),
-+ GPIO_REGS(10, 1, 2, 8, 2),
-+ GPIO_REGS(11, 1, 3, 8, 3),
-+ GPIO_REGS(12, 1, 4, 8, 4),
-+ GPIO_REGS(13, 1, 5, 8, 5),
-+ GPIO_REGS(14, 1, 6, 8, 6),
-+ GPIO_REGS(15, 1, 7, 8, 7),
-+ GPIO_REGS(16, 2, 0, 8, 8),
-+ GPIO_REGS(17, 2, 1, 8, 9),
-+ GPIO_REGS(18, 2, 2, 8, 10),
-+ GPIO_REGS(19, 2, 3, 8, 11),
-+ GPIO_REGS(20, 2, 4, 8, 12),
-+ GPIO_REGS(21, 2, 5, 8, 13),
-+ GPIO_REGS(22, 2, 6, 8, 14),
-+ GPIO_REGS(23, 2, 7, 9, 0),
-+ GPIO_REGS(24, 3, 0, 9, 1),
-+ GPIO_REGS(25, 3, 1, 9, 2),
-+ GPIO_REGS(26, 3, 2, 9, 3),
-+ GPIO_REGS(27, 3, 3, 9, 4),
-+ GPIO_REGS(28, 3, 4, 9, 5),
-+ GPIO_REGS(29, 3, 5, 9, 6),
-+ GPIO_REGS(30, 3, 6, 9, 7),
-+ GPIO_REGS(31, 3, 7, 9, 8),
-+ GPIO_REGS(32, 4, 0, 9, 9),
-+ GPIO_REGS(33, 4, 1, 9, 10),
-+ GPIO_REGS(34, 4, 2, 9, 11),
-+ GPIO_REGS(35, 4, 3, 9, 12),
-+ GPIO_REGS(36, 4, 4, 9, 13),
-+ GPIO_REGS(37, 4, 5, 9, 14),
-+ GPIO_REGS(38, 4, 6, 10, 0),
-+ GPIO_REGS(39, 4, 7, 10, 1),
-+ GPIO_REGS(40, 5, 0, 10, 2),
-+ GPIO_REGS(41, 5, 1, 10, 3),
-+ GPIO_REGS(42, 5, 2, 10, 4),
-+ GPIO_REGS(43, 5, 3, 10, 5),
-+ GPIO_REGS(44, 5, 4, 10, 6),
-+ GPIO_REGS(45, 5, 5, 10, 7),
-+ GPIO_REGS(46, 5, 6, 10, 8),
-+ GPIO_REGS(47, 5, 7, 10, 9),
-+ GPIO_REGS(48, 6, 0, 10, 10),
-+ GPIO_REGS(49, 6, 1, 10, 11),
-+ GPIO_REGS(50, 6, 2, 10, 12),
-+ GPIO_REGS(51, 6, 3, 10, 13),
-+ GPIO_REGS(52, 6, 4, 10, 14),
-+ GPIO_REGS(53, 6, 5, 11, 0),
-+ EMMC_REGS(54, 11, 1), /* EMMC_CMD */
-+ EMMC_REGS(55, 11, 2), /* EMMC_DS */
-+ EMMC_REGS(56, 11, 3), /* EMMC_CLK */
-+ EMMC_REGS(57, 11, 4), /* EMMC_DAT0 */
-+ EMMC_REGS(58, 11, 5), /* EMMC_DAT1 */
-+ EMMC_REGS(59, 11, 6), /* EMMC_DAT2 */
-+ EMMC_REGS(60, 11, 7), /* EMMC_DAT3 */
-+ EMMC_REGS(61, 11, 8), /* EMMC_DAT4 */
-+ EMMC_REGS(62, 11, 9), /* EMMC_DAT5 */
-+ EMMC_REGS(63, 11, 10), /* EMMC_DAT6 */
-+ EMMC_REGS(64, 11, 11), /* EMMC_DAT7 */
-+};
-+
-+static struct pin_regs bcm2712_c0_aon_gpio_pin_regs[] = {
-+ AGPIO_REGS(0, 3, 0, 6, 10),
-+ AGPIO_REGS(1, 3, 1, 6, 11),
-+ AGPIO_REGS(2, 3, 2, 6, 12),
-+ AGPIO_REGS(3, 3, 3, 6, 13),
-+ AGPIO_REGS(4, 3, 4, 6, 14),
-+ AGPIO_REGS(5, 3, 5, 7, 0),
-+ AGPIO_REGS(6, 3, 6, 7, 1),
-+ AGPIO_REGS(7, 3, 7, 7, 2),
-+ AGPIO_REGS(8, 4, 0, 7, 3),
-+ AGPIO_REGS(9, 4, 1, 7, 4),
-+ AGPIO_REGS(10, 4, 2, 7, 5),
-+ AGPIO_REGS(11, 4, 3, 7, 6),
-+ AGPIO_REGS(12, 4, 4, 7, 7),
-+ AGPIO_REGS(13, 4, 5, 7, 8),
-+ AGPIO_REGS(14, 4, 6, 7, 9),
-+ AGPIO_REGS(15, 4, 7, 7, 10),
-+ AGPIO_REGS(16, 5, 0, 7, 11),
-+ SGPIO_REGS(0, 0, 0),
-+ SGPIO_REGS(1, 0, 1),
-+ SGPIO_REGS(2, 0, 2),
-+ SGPIO_REGS(3, 0, 3),
-+ SGPIO_REGS(4, 1, 0),
-+ SGPIO_REGS(5, 2, 0),
-+};
-+
-+static const struct pinctrl_pin_desc bcm2712_c0_gpio_pins[] = {
-+ GPIO_PIN(0),
-+ GPIO_PIN(1),
-+ GPIO_PIN(2),
-+ GPIO_PIN(3),
-+ GPIO_PIN(4),
-+ GPIO_PIN(5),
-+ GPIO_PIN(6),
-+ GPIO_PIN(7),
-+ GPIO_PIN(8),
-+ GPIO_PIN(9),
-+ GPIO_PIN(10),
-+ GPIO_PIN(11),
-+ GPIO_PIN(12),
-+ GPIO_PIN(13),
-+ GPIO_PIN(14),
-+ GPIO_PIN(15),
-+ GPIO_PIN(16),
-+ GPIO_PIN(17),
-+ GPIO_PIN(18),
-+ GPIO_PIN(19),
-+ GPIO_PIN(20),
-+ GPIO_PIN(21),
-+ GPIO_PIN(22),
-+ GPIO_PIN(23),
-+ GPIO_PIN(24),
-+ GPIO_PIN(25),
-+ GPIO_PIN(26),
-+ GPIO_PIN(27),
-+ GPIO_PIN(28),
-+ GPIO_PIN(29),
-+ GPIO_PIN(30),
-+ GPIO_PIN(31),
-+ GPIO_PIN(32),
-+ GPIO_PIN(33),
-+ GPIO_PIN(34),
-+ GPIO_PIN(35),
-+ GPIO_PIN(36),
-+ GPIO_PIN(37),
-+ GPIO_PIN(38),
-+ GPIO_PIN(39),
-+ GPIO_PIN(40),
-+ GPIO_PIN(41),
-+ GPIO_PIN(42),
-+ GPIO_PIN(43),
-+ GPIO_PIN(44),
-+ GPIO_PIN(45),
-+ GPIO_PIN(46),
-+ GPIO_PIN(47),
-+ GPIO_PIN(48),
-+ GPIO_PIN(49),
-+ GPIO_PIN(50),
-+ GPIO_PIN(51),
-+ GPIO_PIN(52),
-+ GPIO_PIN(53),
-+ PINCTRL_PIN(54, "emmc_cmd"),
-+ PINCTRL_PIN(55, "emmc_ds"),
-+ PINCTRL_PIN(56, "emmc_clk"),
-+ PINCTRL_PIN(57, "emmc_dat0"),
-+ PINCTRL_PIN(58, "emmc_dat1"),
-+ PINCTRL_PIN(59, "emmc_dat2"),
-+ PINCTRL_PIN(60, "emmc_dat3"),
-+ PINCTRL_PIN(61, "emmc_dat4"),
-+ PINCTRL_PIN(62, "emmc_dat5"),
-+ PINCTRL_PIN(63, "emmc_dat6"),
-+ PINCTRL_PIN(64, "emmc_dat7"),
-+};
-+
-+static struct pinctrl_pin_desc bcm2712_c0_aon_gpio_pins[] = {
-+ AGPIO_PIN(0),
-+ AGPIO_PIN(1),
-+ AGPIO_PIN(2),
-+ AGPIO_PIN(3),
-+ AGPIO_PIN(4),
-+ AGPIO_PIN(5),
-+ AGPIO_PIN(6),
-+ AGPIO_PIN(7),
-+ AGPIO_PIN(8),
-+ AGPIO_PIN(9),
-+ AGPIO_PIN(10),
-+ AGPIO_PIN(11),
-+ AGPIO_PIN(12),
-+ AGPIO_PIN(13),
-+ AGPIO_PIN(14),
-+ AGPIO_PIN(15),
-+ AGPIO_PIN(16),
-+ SGPIO_PIN(0),
-+ SGPIO_PIN(1),
-+ SGPIO_PIN(2),
-+ SGPIO_PIN(3),
-+ SGPIO_PIN(4),
-+ SGPIO_PIN(5),
-+};
-+
-+static const struct pin_regs bcm2712_d0_gpio_pin_regs[] = {
-+ GPIO_REGS(1, 0, 0, 4, 5),
-+ GPIO_REGS(2, 0, 1, 4, 6),
-+ GPIO_REGS(3, 0, 2, 4, 7),
-+ GPIO_REGS(4, 0, 3, 4, 8),
-+ GPIO_REGS(10, 0, 4, 4, 9),
-+ GPIO_REGS(11, 0, 5, 4, 10),
-+ GPIO_REGS(12, 0, 6, 4, 11),
-+ GPIO_REGS(13, 0, 7, 4, 12),
-+ GPIO_REGS(14, 1, 0, 4, 13),
-+ GPIO_REGS(15, 1, 1, 4, 14),
-+ GPIO_REGS(18, 1, 2, 5, 0),
-+ GPIO_REGS(19, 1, 3, 5, 1),
-+ GPIO_REGS(20, 1, 4, 5, 2),
-+ GPIO_REGS(21, 1, 5, 5, 3),
-+ GPIO_REGS(22, 1, 6, 5, 4),
-+ GPIO_REGS(23, 1, 7, 5, 5),
-+ GPIO_REGS(24, 2, 0, 5, 6),
-+ GPIO_REGS(25, 2, 1, 5, 7),
-+ GPIO_REGS(26, 2, 2, 5, 8),
-+ GPIO_REGS(27, 2, 3, 5, 9),
-+ GPIO_REGS(28, 2, 4, 5, 10),
-+ GPIO_REGS(29, 2, 5, 5, 11),
-+ GPIO_REGS(30, 2, 6, 5, 12),
-+ GPIO_REGS(31, 2, 7, 5, 13),
-+ GPIO_REGS(32, 3, 0, 5, 14),
-+ GPIO_REGS(33, 3, 1, 6, 0),
-+ GPIO_REGS(34, 3, 2, 6, 1),
-+ GPIO_REGS(35, 3, 3, 6, 2),
-+};
-+
-+static struct pin_regs bcm2712_d0_aon_gpio_pin_regs[] = {
-+ AGPIO_REGS(0, 3, 0, 5, 9),
-+ AGPIO_REGS(1, 3, 1, 5, 10),
-+ AGPIO_REGS(2, 3, 2, 5, 11),
-+ AGPIO_REGS(3, 3, 3, 5, 12),
-+ AGPIO_REGS(4, 3, 4, 5, 13),
-+ AGPIO_REGS(5, 3, 5, 5, 14),
-+ AGPIO_REGS(6, 3, 6, 6, 0),
-+ AGPIO_REGS(8, 3, 7, 6, 1),
-+ AGPIO_REGS(9, 4, 0, 6, 2),
-+ AGPIO_REGS(12, 4, 1, 6, 3),
-+ AGPIO_REGS(13, 4, 2, 6, 4),
-+ AGPIO_REGS(14, 4, 3, 6, 5),
-+ SGPIO_REGS(0, 0, 0),
-+ SGPIO_REGS(1, 0, 1),
-+ SGPIO_REGS(2, 0, 2),
-+ SGPIO_REGS(3, 0, 3),
-+ SGPIO_REGS(4, 1, 0),
-+ SGPIO_REGS(5, 2, 0),
-+};
-+
-+static const struct pinctrl_pin_desc bcm2712_d0_gpio_pins[] = {
-+ GPIO_PIN(1),
-+ GPIO_PIN(2),
-+ GPIO_PIN(3),
-+ GPIO_PIN(4),
-+ GPIO_PIN(10),
-+ GPIO_PIN(11),
-+ GPIO_PIN(12),
-+ GPIO_PIN(13),
-+ GPIO_PIN(14),
-+ GPIO_PIN(15),
-+ GPIO_PIN(18),
-+ GPIO_PIN(19),
-+ GPIO_PIN(20),
-+ GPIO_PIN(21),
-+ GPIO_PIN(22),
-+ GPIO_PIN(23),
-+ GPIO_PIN(24),
-+ GPIO_PIN(25),
-+ GPIO_PIN(26),
-+ GPIO_PIN(27),
-+ GPIO_PIN(28),
-+ GPIO_PIN(29),
-+ GPIO_PIN(30),
-+ GPIO_PIN(31),
-+ GPIO_PIN(32),
-+ GPIO_PIN(33),
-+ GPIO_PIN(34),
-+ GPIO_PIN(35),
-+};
-+
-+static struct pinctrl_pin_desc bcm2712_d0_aon_gpio_pins[] = {
-+ AGPIO_PIN(0),
-+ AGPIO_PIN(1),
-+ AGPIO_PIN(2),
-+ AGPIO_PIN(3),
-+ AGPIO_PIN(4),
-+ AGPIO_PIN(5),
-+ AGPIO_PIN(6),
-+ AGPIO_PIN(8),
-+ AGPIO_PIN(9),
-+ AGPIO_PIN(12),
-+ AGPIO_PIN(13),
-+ AGPIO_PIN(14),
-+ SGPIO_PIN(0),
-+ SGPIO_PIN(1),
-+ SGPIO_PIN(2),
-+ SGPIO_PIN(3),
-+ SGPIO_PIN(4),
-+ SGPIO_PIN(5),
-+};
-+
-+static const char * const bcm2712_func_names[] = {
-+ FUNC(gpio),
-+ FUNC(alt1),
-+ FUNC(alt2),
-+ FUNC(alt3),
-+ FUNC(alt4),
-+ FUNC(alt5),
-+ FUNC(alt6),
-+ FUNC(alt7),
-+ FUNC(alt8),
-+ FUNC(aon_cpu_standbyb),
-+ FUNC(aon_fp_4sec_resetb),
-+ FUNC(aon_gpclk),
-+ FUNC(aon_pwm),
-+ FUNC(arm_jtag),
-+ FUNC(aud_fs_clk0),
-+ FUNC(avs_pmu_bsc),
-+ FUNC(bsc_m0),
-+ FUNC(bsc_m1),
-+ FUNC(bsc_m2),
-+ FUNC(bsc_m3),
-+ FUNC(clk_observe),
-+ FUNC(ctl_hdmi_5v),
-+ FUNC(enet0),
-+ FUNC(enet0_mii),
-+ FUNC(enet0_rgmii),
-+ FUNC(ext_sc_clk),
-+ FUNC(fl0),
-+ FUNC(fl1),
-+ FUNC(gpclk0),
-+ FUNC(gpclk1),
-+ FUNC(gpclk2),
-+ FUNC(hdmi_tx0_auto_i2c),
-+ FUNC(hdmi_tx0_bsc),
-+ FUNC(hdmi_tx1_auto_i2c),
-+ FUNC(hdmi_tx1_bsc),
-+ FUNC(i2s_in),
-+ FUNC(i2s_out),
-+ FUNC(ir_in),
-+ FUNC(mtsif),
-+ FUNC(mtsif_alt),
-+ FUNC(mtsif_alt1),
-+ FUNC(pdm),
-+ FUNC(pkt),
-+ FUNC(pm_led_out),
-+ FUNC(sc0),
-+ FUNC(sd0),
-+ FUNC(sd2),
-+ FUNC(sd_card_a),
-+ FUNC(sd_card_b),
-+ FUNC(sd_card_c),
-+ FUNC(sd_card_d),
-+ FUNC(sd_card_e),
-+ FUNC(sd_card_f),
-+ FUNC(sd_card_g),
-+ FUNC(spdif_out),
-+ FUNC(spi_m),
-+ FUNC(spi_s),
-+ FUNC(sr_edm_sense),
-+ FUNC(te0),
-+ FUNC(te1),
-+ FUNC(tsio),
-+ FUNC(uart0),
-+ FUNC(uart1),
-+ FUNC(uart2),
-+ FUNC(usb_pwr),
-+ FUNC(usb_vbus),
-+ FUNC(uui),
-+ FUNC(vc_i2c0),
-+ FUNC(vc_i2c3),
-+ FUNC(vc_i2c4),
-+ FUNC(vc_i2c5),
-+ FUNC(vc_i2csl),
-+ FUNC(vc_pcm),
-+ FUNC(vc_pwm0),
-+ FUNC(vc_pwm1),
-+ FUNC(vc_spi0),
-+ FUNC(vc_spi3),
-+ FUNC(vc_spi4),
-+ FUNC(vc_spi5),
-+ FUNC(vc_uart0),
-+ FUNC(vc_uart2),
-+ FUNC(vc_uart3),
-+ FUNC(vc_uart4),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_aon_gpio_pin_funcs[] = {
-+ PIN(0, ir_in, vc_spi0, vc_uart3, vc_i2c3, te0, vc_i2c0, _, _),
-+ PIN(1, vc_pwm0, vc_spi0, vc_uart3, vc_i2c3, te1, aon_pwm, vc_i2c0, vc_pwm1),
-+ PIN(2, vc_pwm0, vc_spi0, vc_uart3, ctl_hdmi_5v, fl0, aon_pwm, ir_in, vc_pwm1),
-+ PIN(3, ir_in, vc_spi0, vc_uart3, aon_fp_4sec_resetb, fl1, sd_card_g, aon_gpclk, _),
-+ PIN(4, gpclk0, vc_spi0, vc_i2csl, aon_gpclk, pm_led_out, aon_pwm, sd_card_g, vc_pwm0),
-+ PIN(5, gpclk1, ir_in, vc_i2csl, clk_observe, aon_pwm, sd_card_g, vc_pwm0, _),
-+ PIN(6, uart1, vc_uart4, gpclk2, ctl_hdmi_5v, vc_uart0, vc_spi3, _, _),
-+ PIN(7, uart1, vc_uart4, gpclk0, aon_pwm, vc_uart0, vc_spi3, _, _),
-+ PIN(8, uart1, vc_uart4, vc_i2csl, ctl_hdmi_5v, vc_uart0, vc_spi3, _, _),
-+ PIN(9, uart1, vc_uart4, vc_i2csl, aon_pwm, vc_uart0, vc_spi3, _, _),
-+ PIN(10, tsio, ctl_hdmi_5v, sc0, spdif_out, vc_spi5, usb_pwr, aon_gpclk, sd_card_f),
-+ PIN(11, tsio, uart0, sc0, aud_fs_clk0, vc_spi5, usb_vbus, vc_uart2, sd_card_f),
-+ PIN(12, tsio, uart0, vc_uart0, tsio, vc_spi5, usb_pwr, vc_uart2, sd_card_f),
-+ PIN(13, bsc_m1, uart0, vc_uart0, uui, vc_spi5, arm_jtag, vc_uart2, vc_i2c3),
-+ PIN(14, bsc_m1, uart0, vc_uart0, uui, vc_spi5, arm_jtag, vc_uart2, vc_i2c3),
-+ PIN(15, ir_in, aon_fp_4sec_resetb, vc_uart0, pm_led_out, ctl_hdmi_5v, aon_pwm, aon_gpclk, _),
-+ PIN(16, aon_cpu_standbyb, gpclk0, pm_led_out, ctl_hdmi_5v, vc_pwm0, usb_pwr, aud_fs_clk0, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_aon_sgpio_pin_funcs[] = {
-+ PIN(0, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+ PIN(1, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+ PIN(2, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c4, ctl_hdmi_5v, _, _, _),
-+ PIN(3, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c4, _, _, _, _),
-+ PIN(4, avs_pmu_bsc, bsc_m2, vc_i2c5, ctl_hdmi_5v, _, _, _, _),
-+ PIN(5, avs_pmu_bsc, bsc_m2, vc_i2c5, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_gpio_pin_funcs[] = {
-+ PIN(0, bsc_m3, vc_i2c0, gpclk0, enet0, vc_pwm1, vc_spi0, ir_in, _),
-+ PIN(1, bsc_m3, vc_i2c0, gpclk1, enet0, vc_pwm1, sr_edm_sense, vc_spi0, vc_uart3),
-+ PIN(2, pdm, i2s_in, gpclk2, vc_spi4, pkt, vc_spi0, vc_uart3, _),
-+ PIN(3, pdm, i2s_in, vc_spi4, pkt, vc_spi0, vc_uart3, _, _),
-+ PIN(4, pdm, i2s_in, arm_jtag, vc_spi4, pkt, vc_spi0, vc_uart3, _),
-+ PIN(5, pdm, vc_i2c3, arm_jtag, sd_card_e, vc_spi4, pkt, vc_pcm, vc_i2c5),
-+ PIN(6, pdm, vc_i2c3, arm_jtag, sd_card_e, vc_spi4, pkt, vc_pcm, vc_i2c5),
-+ PIN(7, i2s_out, spdif_out, arm_jtag, sd_card_e, vc_i2c3, enet0_rgmii, vc_pcm, vc_spi4),
-+ PIN(8, i2s_out, aud_fs_clk0, arm_jtag, sd_card_e, vc_i2c3, enet0_mii, vc_pcm, vc_spi4),
-+ PIN(9, i2s_out, aud_fs_clk0, arm_jtag, sd_card_e, enet0_mii, sd_card_c, vc_spi4, _),
-+ PIN(10, bsc_m3, mtsif_alt1, i2s_in, i2s_out, vc_spi5, enet0_mii, sd_card_c, vc_spi4),
-+ PIN(11, bsc_m3, mtsif_alt1, i2s_in, i2s_out, vc_spi5, enet0_mii, sd_card_c, vc_spi4),
-+ PIN(12, spi_s, mtsif_alt1, i2s_in, i2s_out, vc_spi5, vc_i2csl, sd0, sd_card_d),
-+ PIN(13, spi_s, mtsif_alt1, i2s_out, usb_vbus, vc_spi5, vc_i2csl, sd0, sd_card_d),
-+ PIN(14, spi_s, vc_i2csl, enet0_rgmii, arm_jtag, vc_spi5, vc_pwm0, vc_i2c4, sd_card_d),
-+ PIN(15, spi_s, vc_i2csl, vc_spi3, arm_jtag, vc_pwm0, vc_i2c4, gpclk0, _),
-+ PIN(16, sd_card_b, i2s_out, vc_spi3, i2s_in, sd0, enet0_rgmii, gpclk1, _),
-+ PIN(17, sd_card_b, i2s_out, vc_spi3, i2s_in, ext_sc_clk, sd0, enet0_rgmii, gpclk2),
-+ PIN(18, sd_card_b, i2s_out, vc_spi3, i2s_in, sd0, enet0_rgmii, vc_pwm1, _),
-+ PIN(19, sd_card_b, usb_pwr, vc_spi3, pkt, spdif_out, sd0, ir_in, vc_pwm1),
-+ PIN(20, sd_card_b, uui, vc_uart0, arm_jtag, uart2, usb_pwr, vc_pcm, vc_uart4),
-+ PIN(21, usb_pwr, uui, vc_uart0, arm_jtag, uart2, sd_card_b, vc_pcm, vc_uart4),
-+ PIN(22, usb_pwr, enet0, vc_uart0, mtsif, uart2, usb_vbus, vc_pcm, vc_i2c5),
-+ PIN(23, usb_vbus, enet0, vc_uart0, mtsif, uart2, i2s_out, vc_pcm, vc_i2c5),
-+ PIN(24, mtsif, pkt, uart0, enet0_rgmii, enet0_rgmii, vc_i2c4, vc_uart3, _),
-+ PIN(25, mtsif, pkt, sc0, uart0, enet0_rgmii, enet0_rgmii, vc_i2c4, vc_uart3),
-+ PIN(26, mtsif, pkt, sc0, uart0, enet0_rgmii, vc_uart4, vc_spi5, _),
-+ PIN(27, mtsif, pkt, sc0, uart0, enet0_rgmii, vc_uart4, vc_spi5, _),
-+ PIN(28, mtsif, pkt, sc0, enet0_rgmii, vc_uart4, vc_spi5, _, _),
-+ PIN(29, mtsif, pkt, sc0, enet0_rgmii, vc_uart4, vc_spi5, _, _),
-+ PIN(30, mtsif, pkt, sc0, sd2, enet0_rgmii, gpclk0, vc_pwm0, _),
-+ PIN(31, mtsif, pkt, sc0, sd2, enet0_rgmii, vc_spi3, vc_pwm0, _),
-+ PIN(32, mtsif, pkt, sc0, sd2, enet0_rgmii, vc_spi3, vc_uart3, _),
-+ PIN(33, mtsif, pkt, sd2, enet0_rgmii, vc_spi3, vc_uart3, _, _),
-+ PIN(34, mtsif, pkt, ext_sc_clk, sd2, enet0_rgmii, vc_spi3, vc_i2c5, _),
-+ PIN(35, mtsif, pkt, sd2, enet0_rgmii, vc_spi3, vc_i2c5, _, _),
-+ PIN(36, sd0, mtsif, sc0, i2s_in, vc_uart3, vc_uart2, _, _),
-+ PIN(37, sd0, mtsif, sc0, vc_spi0, i2s_in, vc_uart3, vc_uart2, _),
-+ PIN(38, sd0, mtsif_alt, sc0, vc_spi0, i2s_in, vc_uart3, vc_uart2, _),
-+ PIN(39, sd0, mtsif_alt, sc0, vc_spi0, vc_uart3, vc_uart2, _, _),
-+ PIN(40, sd0, mtsif_alt, sc0, vc_spi0, bsc_m3, _, _, _),
-+ PIN(41, sd0, mtsif_alt, sc0, vc_spi0, bsc_m3, _, _, _),
-+ PIN(42, vc_spi0, mtsif_alt, vc_i2c0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+ PIN(43, vc_spi0, mtsif_alt, vc_i2c0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+ PIN(44, vc_spi0, mtsif_alt, enet0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+ PIN(45, vc_spi0, mtsif_alt, enet0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+ PIN(46, vc_spi0, mtsif_alt, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m, _),
-+ PIN(47, enet0, mtsif_alt, i2s_out, mtsif_alt1, arm_jtag, _, _, _),
-+ PIN(48, sc0, usb_pwr, spdif_out, mtsif, _, _, _, _),
-+ PIN(49, sc0, usb_pwr, aud_fs_clk0, mtsif, _, _, _, _),
-+ PIN(50, sc0, usb_vbus, sc0, _, _, _, _, _),
-+ PIN(51, sc0, enet0, sc0, sr_edm_sense, _, _, _, _),
-+ PIN(52, sc0, enet0, vc_pwm1, _, _, _, _, _),
-+ PIN(53, sc0, enet0_rgmii, ext_sc_clk, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_aon_gpio_pin_funcs[] = {
-+ PIN(0, ir_in, vc_spi0, vc_uart0, vc_i2c3, uart0, vc_i2c0, _, _),
-+ PIN(1, vc_pwm0, vc_spi0, vc_uart0, vc_i2c3, uart0, aon_pwm, vc_i2c0, vc_pwm1),
-+ PIN(2, vc_pwm0, vc_spi0, vc_uart0, ctl_hdmi_5v, uart0, aon_pwm, ir_in, vc_pwm1),
-+ PIN(3, ir_in, vc_spi0, vc_uart0, uart0, sd_card_g, aon_gpclk, _, _),
-+ PIN(4, gpclk0, vc_spi0, pm_led_out, aon_pwm, sd_card_g, vc_pwm0, _, _),
-+ PIN(5, gpclk1, ir_in, aon_pwm, sd_card_g, vc_pwm0, _, _, _),
-+ PIN(6, uart1, vc_uart2, ctl_hdmi_5v, gpclk2, vc_spi3, _, _, _),
-+ PIN(7, _, _, _, _, _, _, _, _),
-+ PIN(8, uart1, vc_uart2, ctl_hdmi_5v, vc_spi0, vc_spi3, _, _, _),
-+ PIN(9, uart1, vc_uart2, vc_uart0, aon_pwm, vc_spi0, vc_uart2, vc_spi3, _),
-+ PIN(10, _, _, _, _, _, _, _, _),
-+ PIN(11, _, _, _, _, _, _, _, _),
-+ PIN(12, uart1, vc_uart2, vc_uart0, vc_spi0, usb_pwr, vc_uart2, vc_spi3, _),
-+ PIN(13, bsc_m1, vc_uart0, uui, vc_spi0, arm_jtag, vc_uart2, vc_i2c3, _),
-+ PIN(14, bsc_m1, aon_gpclk, vc_uart0, uui, vc_spi0, arm_jtag, vc_uart2, vc_i2c3),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_aon_sgpio_pin_funcs[] = {
-+ PIN(0, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+ PIN(1, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+ PIN(2, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c0, ctl_hdmi_5v, _, _, _),
-+ PIN(3, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c0, _, _, _, _),
-+ PIN(4, avs_pmu_bsc, bsc_m2, vc_i2c3, ctl_hdmi_5v, _, _, _, _),
-+ PIN(5, avs_pmu_bsc, bsc_m2, vc_i2c3, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_gpio_pin_funcs[] = {
-+ PIN(1, vc_i2c0, usb_pwr, gpclk0, sd_card_e, vc_spi3, sr_edm_sense, vc_spi0, vc_uart0),
-+ PIN(2, vc_i2c0, usb_pwr, gpclk1, sd_card_e, vc_spi3, clk_observe, vc_spi0, vc_uart0),
-+ PIN(3, vc_i2c3, usb_vbus, gpclk2, sd_card_e, vc_spi3, vc_spi0, vc_uart0, _),
-+ PIN(4, vc_i2c3, vc_pwm1, vc_spi3, sd_card_e, vc_spi3, vc_spi0, vc_uart0, _),
-+ PIN(10, bsc_m3, vc_pwm1, vc_spi3, sd_card_e, vc_spi3, gpclk0, _, _),
-+ PIN(11, bsc_m3, vc_spi3, clk_observe, sd_card_c, gpclk1, _, _, _),
-+ PIN(12, spi_s, vc_spi3, sd_card_c, sd_card_d, _, _, _, _),
-+ PIN(13, spi_s, vc_spi3, sd_card_c, sd_card_d, _, _, _, _),
-+ PIN(14, spi_s, uui, arm_jtag, vc_pwm0, vc_i2c0, sd_card_d, _, _),
-+ PIN(15, spi_s, uui, arm_jtag, vc_pwm0, vc_i2c0, gpclk0, _, _),
-+ PIN(18, sd_card_f, vc_pwm1, _, _, _, _, _, _),
-+ PIN(19, sd_card_f, usb_pwr, vc_pwm1, _, _, _, _, _),
-+ PIN(20, vc_i2c3, uui, vc_uart0, arm_jtag, vc_uart2, _, _, _),
-+ PIN(21, vc_i2c3, uui, vc_uart0, arm_jtag, vc_uart2, _, _, _),
-+ PIN(22, sd_card_f, vc_uart0, vc_i2c3, _, _, _, _, _),
-+ PIN(23, vc_uart0, vc_i2c3, _, _, _, _, _, _),
-+ PIN(24, sd_card_b, vc_spi0, arm_jtag, uart0, usb_pwr, vc_uart2, vc_uart0, _),
-+ PIN(25, sd_card_b, vc_spi0, arm_jtag, uart0, usb_pwr, vc_uart2, vc_uart0, _),
-+ PIN(26, sd_card_b, vc_spi0, arm_jtag, uart0, usb_vbus, vc_uart2, vc_spi0, _),
-+ PIN(27, sd_card_b, vc_spi0, arm_jtag, uart0, vc_uart2, vc_spi0, _, _),
-+ PIN(28, sd_card_b, vc_spi0, arm_jtag, vc_i2c0, vc_spi0, _, _, _),
-+ PIN(29, arm_jtag, vc_i2c0, vc_spi0, _, _, _, _, _),
-+ PIN(30, sd2, gpclk0, vc_pwm0, _, _, _, _, _),
-+ PIN(31, sd2, vc_spi3, vc_pwm0, _, _, _, _, _),
-+ PIN(32, sd2, vc_spi3, vc_uart3, _, _, _, _, _),
-+ PIN(33, sd2, vc_spi3, vc_uart3, _, _, _, _, _),
-+ PIN(34, sd2, vc_spi3, vc_i2c5, _, _, _, _, _),
-+ PIN(35, sd2, vc_spi3, vc_i2c5, _, _, _, _, _),
-+};
-+
-+static inline u32 bcm2712_reg_rd(struct bcm2712_pinctrl *pc, unsigned reg)
-+{
-+ return readl(pc->base + reg);
-+}
-+
-+static inline void bcm2712_reg_wr(struct bcm2712_pinctrl *pc, unsigned reg,
-+ u32 val)
-+{
-+ writel(val, pc->base + reg);
-+}
-+
-+static enum bcm2712_funcs bcm2712_pinctrl_fsel_get(
-+ struct bcm2712_pinctrl *pc, unsigned pin)
-+{
-+ u32 bit = pc->pin_regs[pin].mux_bit;
-+ enum bcm2712_funcs func;
-+ int fsel;
-+ u32 val;
-+
-+ if (!bit)
-+ return func_gpio;
-+
-+ val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+ fsel = (val >> BIT_TO_SHIFT(bit)) & BCM2712_FSEL_MASK;
-+ func = pc->pin_funcs[pin].funcs[fsel];
-+ if (func >= func_count)
-+ func = (enum bcm2712_funcs)fsel;
-+
-+ dev_dbg(pc->dev, "get %04x: %08x (%u => %s)\n",
-+ BIT_TO_REG(bit), val, pin,
-+ bcm2712_func_names[func]);
-+
-+ return func;
-+}
-+
-+static void bcm2712_pinctrl_fsel_set(
-+ struct bcm2712_pinctrl *pc, unsigned pin,
-+ enum bcm2712_funcs func)
-+{
-+ u32 bit = pc->pin_regs[pin].mux_bit, val;
-+ const u8 *pin_funcs;
-+ unsigned long flags;
-+ int fsel;
-+ int cur;
-+ int i;
-+
-+ if (!bit || func >= func_count)
-+ return;
-+
-+ fsel = BCM2712_FSEL_COUNT;
-+
-+ if (func >= BCM2712_FSEL_COUNT) {
-+ /* Convert to an fsel number */
-+ pin_funcs = pc->pin_funcs[pin].funcs;
-+ for (i = 1; i < BCM2712_FSEL_COUNT; i++) {
-+ if (pin_funcs[i - 1] == func) {
-+ fsel = i;
-+ break;
-+ }
-+ }
-+ } else {
-+ fsel = (enum bcm2712_funcs)func;
-+ }
-+ if (fsel >= BCM2712_FSEL_COUNT)
-+ return;
-+
-+ spin_lock_irqsave(&pc->lock, flags);
-+
-+ val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+ cur = (val >> BIT_TO_SHIFT(bit)) & BCM2712_FSEL_MASK;
-+
-+ dev_dbg(pc->dev, "read %04x: %08x (%u => %s)\n",
-+ BIT_TO_REG(bit), val, pin,
-+ bcm2712_func_names[cur]);
-+
-+ if (cur != fsel) {
-+ val &= ~(BCM2712_FSEL_MASK << BIT_TO_SHIFT(bit));
-+ val |= fsel << BIT_TO_SHIFT(bit);
-+
-+ dev_dbg(pc->dev, "write %04x: %08x (%u <= %s)\n",
-+ BIT_TO_REG(bit), val, pin,
-+ bcm2712_func_names[fsel]);
-+ bcm2712_reg_wr(pc, BIT_TO_REG(bit), val);
-+ }
-+
-+ spin_unlock_irqrestore(&pc->lock, flags);
-+}
-+
-+static int bcm2712_pctl_get_groups_count(struct pinctrl_dev *pctldev)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ return pc->pctl_desc.npins;
-+}
-+
-+static const char *bcm2712_pctl_get_group_name(struct pinctrl_dev *pctldev,
-+ unsigned selector)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ return pc->gpio_groups[selector];
-+}
-+
-+static int bcm2712_pctl_get_group_pins(struct pinctrl_dev *pctldev,
-+ unsigned selector,
-+ const unsigned **pins,
-+ unsigned *num_pins)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ *pins = &pc->pctl_desc.pins[selector].number;
-+ *num_pins = 1;
-+
-+ return 0;
-+}
-+
-+static void bcm2712_pctl_pin_dbg_show(struct pinctrl_dev *pctldev,
-+ struct seq_file *s,
-+ unsigned offset)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+ enum bcm2712_funcs fsel = bcm2712_pinctrl_fsel_get(pc, offset);
-+ const char *fname = bcm2712_func_names[fsel];
-+
-+ seq_printf(s, "function %s", fname);
-+}
-+
-+static void bcm2712_pctl_dt_free_map(struct pinctrl_dev *pctldev,
-+ struct pinctrl_map *maps, unsigned num_maps)
-+{
-+ int i;
-+
-+ for (i = 0; i < num_maps; i++)
-+ if (maps[i].type == PIN_MAP_TYPE_CONFIGS_PIN)
-+ kfree(maps[i].data.configs.configs);
-+
-+ kfree(maps);
-+}
-+
-+static const struct pinctrl_ops bcm2712_pctl_ops = {
-+ .get_groups_count = bcm2712_pctl_get_groups_count,
-+ .get_group_name = bcm2712_pctl_get_group_name,
-+ .get_group_pins = bcm2712_pctl_get_group_pins,
-+ .pin_dbg_show = bcm2712_pctl_pin_dbg_show,
-+ .dt_node_to_map = pinconf_generic_dt_node_to_map_all,
-+ .dt_free_map = bcm2712_pctl_dt_free_map,
-+};
-+
-+static int bcm2712_pmx_free(struct pinctrl_dev *pctldev,
-+ unsigned offset)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ /* disable by setting to GPIO */
-+ bcm2712_pinctrl_fsel_set(pc, offset, func_gpio);
-+ return 0;
-+}
-+
-+static int bcm2712_pmx_get_functions_count(struct pinctrl_dev *pctldev)
-+{
-+ return func_count;
-+}
-+
-+static const char *bcm2712_pmx_get_function_name(struct pinctrl_dev *pctldev,
-+ unsigned selector)
-+{
-+ return (selector < func_count) ? bcm2712_func_names[selector] : NULL;
-+}
-+
-+static int bcm2712_pmx_get_function_groups(struct pinctrl_dev *pctldev,
-+ unsigned selector,
-+ const char * const **groups,
-+ unsigned * const num_groups)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+ /* every pin can do every function */
-+ *groups = pc->gpio_groups;
-+ *num_groups = pc->pctl_desc.npins;
-+
-+ return 0;
-+}
-+
-+static int bcm2712_pmx_set(struct pinctrl_dev *pctldev,
-+ unsigned func_selector,
-+ unsigned group_selector)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ bcm2712_pinctrl_fsel_set(pc, group_selector, func_selector);
-+
-+ return 0;
-+}
-+static int bcm2712_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,
-+ struct pinctrl_gpio_range *range,
-+ unsigned pin)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ bcm2712_pinctrl_fsel_set(pc, pin, func_gpio);
-+
-+ return 0;
-+}
-+
-+static void bcm2712_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
-+ struct pinctrl_gpio_range *range,
-+ unsigned offset)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+ /* disable by setting to GPIO */
-+ bcm2712_pinctrl_fsel_set(pc, offset, func_gpio);
-+}
-+
-+static const struct pinmux_ops bcm2712_pmx_ops = {
-+ .free = bcm2712_pmx_free,
-+ .get_functions_count = bcm2712_pmx_get_functions_count,
-+ .get_function_name = bcm2712_pmx_get_function_name,
-+ .get_function_groups = bcm2712_pmx_get_function_groups,
-+ .set_mux = bcm2712_pmx_set,
-+ .gpio_request_enable = bcm2712_pmx_gpio_request_enable,
-+ .gpio_disable_free = bcm2712_pmx_gpio_disable_free,
-+};
-+
-+static unsigned int bcm2712_pull_config_get(struct bcm2712_pinctrl *pc,
-+ unsigned int pin)
-+{
-+ u32 bit = pc->pin_regs[pin].pad_bit, val;
-+
-+ if (unlikely(bit == REG_BIT_INVALID))
-+ return BCM2712_PULL_NONE;
-+
-+ val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+ return (val >> BIT_TO_SHIFT(bit)) & BCM2712_PULL_MASK;
-+}
-+
-+static void bcm2712_pull_config_set(struct bcm2712_pinctrl *pc,
-+ unsigned int pin, unsigned int arg)
-+{
-+ u32 bit = pc->pin_regs[pin].pad_bit, val;
-+ unsigned long flags;
-+
-+ if (unlikely(bit == REG_BIT_INVALID)) {
-+ dev_warn(pc->dev, "can't set pulls for %s\n", pc->gpio_groups[pin]);
-+ return;
-+ }
-+
-+ spin_lock_irqsave(&pc->lock, flags);
-+
-+ val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+ val &= ~(BCM2712_PULL_MASK << BIT_TO_SHIFT(bit));
-+ val |= (arg << BIT_TO_SHIFT(bit));
-+ bcm2712_reg_wr(pc, BIT_TO_REG(bit), val);
-+
-+ spin_unlock_irqrestore(&pc->lock, flags);
-+}
-+
-+static int bcm2712_pinconf_get(struct pinctrl_dev *pctldev,
-+ unsigned pin, unsigned long *config)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+ enum pin_config_param param = pinconf_to_config_param(*config);
-+ u32 arg;
-+
-+ switch (param) {
-+ case PIN_CONFIG_BIAS_DISABLE:
-+ arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_NONE);
-+ break;
-+ case PIN_CONFIG_BIAS_PULL_DOWN:
-+ arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_DOWN);
-+ break;
-+ case PIN_CONFIG_BIAS_PULL_UP:
-+ arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_UP);
-+ break;
-+ default:
-+ return -ENOTSUPP;
-+ }
-+
-+ *config = pinconf_to_config_packed(param, arg);
-+
-+ return -ENOTSUPP;
-+}
-+
-+static int bcm2712_pinconf_set(struct pinctrl_dev *pctldev,
-+ unsigned int pin, unsigned long *configs,
-+ unsigned int num_configs)
-+{
-+ struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+ u32 param, arg;
-+ int i;
-+
-+ for (i = 0; i < num_configs; i++) {
-+ param = pinconf_to_config_param(configs[i]);
-+ arg = pinconf_to_config_argument(configs[i]);
-+
-+ switch (param) {
-+ case PIN_CONFIG_BIAS_DISABLE:
-+ bcm2712_pull_config_set(pc, pin, BCM2712_PULL_NONE);
-+ break;
-+ case PIN_CONFIG_BIAS_PULL_DOWN:
-+ bcm2712_pull_config_set(pc, pin, BCM2712_PULL_DOWN);
-+ break;
-+ case PIN_CONFIG_BIAS_PULL_UP:
-+ bcm2712_pull_config_set(pc, pin, BCM2712_PULL_UP);
-+ break;
-+ default:
-+ return -ENOTSUPP;
-+ }
-+ } /* for each config */
-+
-+ return 0;
-+}
-+
-+static const struct pinconf_ops bcm2712_pinconf_ops = {
-+ .is_generic = true,
-+ .pin_config_get = bcm2712_pinconf_get,
-+ .pin_config_set = bcm2712_pinconf_set,
-+};
-+
-+static const struct pinctrl_desc bcm2712_c0_pinctrl_desc = {
-+ .name = "pinctrl-bcm2712",
-+ .pins = bcm2712_c0_gpio_pins,
-+ .npins = ARRAY_SIZE(bcm2712_c0_gpio_pins),
-+ .pctlops = &bcm2712_pctl_ops,
-+ .pmxops = &bcm2712_pmx_ops,
-+ .confops = &bcm2712_pinconf_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_c0_aon_pinctrl_desc = {
-+ .name = "aon-pinctrl-bcm2712",
-+ .pins = bcm2712_c0_aon_gpio_pins,
-+ .npins = ARRAY_SIZE(bcm2712_c0_aon_gpio_pins),
-+ .pctlops = &bcm2712_pctl_ops,
-+ .pmxops = &bcm2712_pmx_ops,
-+ .confops = &bcm2712_pinconf_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_d0_pinctrl_desc = {
-+ .name = "pinctrl-bcm2712",
-+ .pins = bcm2712_d0_gpio_pins,
-+ .npins = ARRAY_SIZE(bcm2712_d0_gpio_pins),
-+ .pctlops = &bcm2712_pctl_ops,
-+ .pmxops = &bcm2712_pmx_ops,
-+ .confops = &bcm2712_pinconf_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_d0_aon_pinctrl_desc = {
-+ .name = "aon-pinctrl-bcm2712",
-+ .pins = bcm2712_d0_aon_gpio_pins,
-+ .npins = ARRAY_SIZE(bcm2712_d0_aon_gpio_pins),
-+ .pctlops = &bcm2712_pctl_ops,
-+ .pmxops = &bcm2712_pmx_ops,
-+ .confops = &bcm2712_pinconf_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_c0_pinctrl_gpio_range = {
-+ .name = "pinctrl-bcm2712",
-+ .npins = ARRAY_SIZE(bcm2712_c0_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_c0_aon_pinctrl_gpio_range = {
-+ .name = "aon-pinctrl-bcm2712",
-+ .npins = ARRAY_SIZE(bcm2712_c0_aon_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_d0_pinctrl_gpio_range = {
-+ .name = "pinctrl-bcm2712",
-+ .npins = ARRAY_SIZE(bcm2712_d0_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_d0_aon_pinctrl_gpio_range = {
-+ .name = "aon-pinctrl-bcm2712",
-+ .npins = ARRAY_SIZE(bcm2712_d0_aon_gpio_pins),
-+};
-+
-+static const struct bcm_plat_data bcm2712_c0_plat_data = {
-+ .pctl_desc = &bcm2712_c0_pinctrl_desc,
-+ .gpio_range = &bcm2712_c0_pinctrl_gpio_range,
-+ .pin_regs = bcm2712_c0_gpio_pin_regs,
-+ .pin_funcs = bcm2712_c0_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_c0_aon_plat_data = {
-+ .pctl_desc = &bcm2712_c0_aon_pinctrl_desc,
-+ .gpio_range = &bcm2712_c0_aon_pinctrl_gpio_range,
-+ .pin_regs = bcm2712_c0_aon_gpio_pin_regs,
-+ .pin_funcs = bcm2712_c0_aon_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_d0_plat_data = {
-+ .pctl_desc = &bcm2712_d0_pinctrl_desc,
-+ .gpio_range = &bcm2712_d0_pinctrl_gpio_range,
-+ .pin_regs = bcm2712_d0_gpio_pin_regs,
-+ .pin_funcs = bcm2712_d0_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_d0_aon_plat_data = {
-+ .pctl_desc = &bcm2712_d0_aon_pinctrl_desc,
-+ .gpio_range = &bcm2712_d0_aon_pinctrl_gpio_range,
-+ .pin_regs = bcm2712_d0_aon_gpio_pin_regs,
-+ .pin_funcs = bcm2712_d0_aon_gpio_pin_funcs,
-+};
-+
-+static const struct of_device_id bcm2712_pinctrl_match[] = {
-+ {
-+ .compatible = "brcm,bcm2712-pinctrl",
-+ .data = &bcm2712_c0_plat_data,
-+ },
-+ {
-+ .compatible = "brcm,bcm2712-aon-pinctrl",
-+ .data = &bcm2712_c0_aon_plat_data,
-+ },
-+
-+ {
-+ .compatible = "brcm,bcm2712c0-pinctrl",
-+ .data = &bcm2712_c0_plat_data,
-+ },
-+ {
-+ .compatible = "brcm,bcm2712c0-aon-pinctrl",
-+ .data = &bcm2712_c0_aon_plat_data,
-+ },
-+
-+ {
-+ .compatible = "brcm,bcm2712d0-pinctrl",
-+ .data = &bcm2712_d0_plat_data,
-+ },
-+ {
-+ .compatible = "brcm,bcm2712d0-aon-pinctrl",
-+ .data = &bcm2712_d0_aon_plat_data,
-+ },
-+ {}
-+};
-+
-+static int bcm2712_pinctrl_probe(struct platform_device *pdev)
-+{
-+ struct device *dev = &pdev->dev;
-+ struct device_node *np = dev->of_node;
-+ const struct bcm_plat_data *pdata;
-+ const struct of_device_id *match;
-+ struct bcm2712_pinctrl *pc;
-+ const char **names;
-+ int num_pins, i;
-+
-+ match = of_match_node(bcm2712_pinctrl_match, np);
-+ if (!match)
-+ return -EINVAL;
-+ pdata = match->data;
-+
-+ pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+ if (!pc)
-+ return -ENOMEM;
-+
-+ platform_set_drvdata(pdev, pc);
-+ pc->dev = dev;
-+ spin_lock_init(&pc->lock);
-+
-+ pc->base = devm_of_iomap(dev, np, 0, NULL);
-+ if (IS_ERR(pc->base)) {
-+ dev_err(dev, "could not get IO memory\n");
-+ return PTR_ERR(pc->base);
-+ }
-+
-+ pc->pctl_desc = *pdata->pctl_desc;
-+ num_pins = pc->pctl_desc.npins;
-+ names = devm_kmalloc_array(dev, num_pins, sizeof(const char *),
-+ GFP_KERNEL);
-+ if (!names)
-+ return -ENOMEM;
-+ for (i = 0; i < num_pins; i++)
-+ names[i] = pc->pctl_desc.pins[i].name;
-+ pc->gpio_groups = names;
-+ pc->pin_regs = pdata->pin_regs;
-+ pc->pin_funcs = pdata->pin_funcs;
-+ pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+ if (IS_ERR(pc->pctl_dev))
-+ return PTR_ERR(pc->pctl_dev);
-+
-+ pc->gpio_range = *pdata->gpio_range;
-+ pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+ return 0;
-+}
-+
-+static struct platform_driver bcm2712_pinctrl_driver = {
-+ .probe = bcm2712_pinctrl_probe,
-+ .driver = {
-+ .name = MODULE_NAME,
-+ .of_match_table = bcm2712_pinctrl_match,
-+ .suppress_bind_attrs = true,
-+ },
-+};
-+builtin_platform_driver(bcm2712_pinctrl_driver);