jh71x0: update patches and config
[openwrt/staging/wigyori.git] / target / linux / jh71x0 / patches-6.1 / 0004-pinctrl-starfive-Add-StarFive-JH7110-aon-controller-.patch
diff --git a/target/linux/jh71x0/patches-6.1/0004-pinctrl-starfive-Add-StarFive-JH7110-aon-controller-.patch b/target/linux/jh71x0/patches-6.1/0004-pinctrl-starfive-Add-StarFive-JH7110-aon-controller-.patch
deleted file mode 100644 (file)
index c2d667d..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-From 5aea7c46928566cd8ed5e568e103fad2f12b3582 Mon Sep 17 00:00:00 2001
-From: Jianlong Huang <jianlong.huang@starfivetech.com>
-Date: Thu, 9 Feb 2023 22:37:02 +0800
-Subject: [PATCH 04/95] pinctrl: starfive: Add StarFive JH7110 aon controller
- driver
-
-Add pinctrl driver for StarFive JH7110 SoC aon pinctrl controller.
-
-Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
-Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
-Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>
-Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
----
- drivers/pinctrl/starfive/Kconfig              |  12 ++
- drivers/pinctrl/starfive/Makefile             |   1 +
- .../starfive/pinctrl-starfive-jh7110-aon.c    | 177 ++++++++++++++++++
- 3 files changed, 190 insertions(+)
- create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
-
-diff --git a/drivers/pinctrl/starfive/Kconfig b/drivers/pinctrl/starfive/Kconfig
-index 453c8a0b3118..8192ac2087fc 100644
---- a/drivers/pinctrl/starfive/Kconfig
-+++ b/drivers/pinctrl/starfive/Kconfig
-@@ -37,3 +37,15 @@ config PINCTRL_STARFIVE_JH7110_SYS
-         This also provides an interface to the GPIO pins not used by other
-         peripherals supporting inputs, outputs, configuring pull-up/pull-down
-         and interrupts on input changes.
-+
-+config PINCTRL_STARFIVE_JH7110_AON
-+      tristate "Always-on pinctrl and GPIO driver for the StarFive JH7110 SoC"
-+      depends on SOC_STARFIVE  || COMPILE_TEST
-+      depends on OF
-+      select PINCTRL_STARFIVE_JH7110
-+      default SOC_STARFIVE
-+      help
-+        Say yes here to support always-on pin control on the StarFive JH7110 SoC.
-+        This also provides an interface to the GPIO pins not used by other
-+        peripherals supporting inputs, outputs, configuring pull-up/pull-down
-+        and interrupts on input changes.
-diff --git a/drivers/pinctrl/starfive/Makefile b/drivers/pinctrl/starfive/Makefile
-index dc2d1e392314..ee0d32d085cb 100644
---- a/drivers/pinctrl/starfive/Makefile
-+++ b/drivers/pinctrl/starfive/Makefile
-@@ -4,3 +4,4 @@ obj-$(CONFIG_PINCTRL_STARFIVE_JH7100)  += pinctrl-starfive-jh7100.o
- obj-$(CONFIG_PINCTRL_STARFIVE_JH7110)         += pinctrl-starfive-jh7110.o
- obj-$(CONFIG_PINCTRL_STARFIVE_JH7110_SYS)     += pinctrl-starfive-jh7110-sys.o
-+obj-$(CONFIG_PINCTRL_STARFIVE_JH7110_AON)     += pinctrl-starfive-jh7110-aon.o
-diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
-new file mode 100644
-index 000000000000..8cf28aaed254
---- /dev/null
-+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
-@@ -0,0 +1,177 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Pinctrl / GPIO driver for StarFive JH7110 SoC aon controller
-+ *
-+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
-+ */
-+
-+#include <linux/err.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/of_irq.h>
-+#include <linux/of_platform.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regmap.h>
-+#include <linux/slab.h>
-+
-+#include <dt-bindings/pinctrl/starfive,jh7110-pinctrl.h>
-+
-+#include "../core.h"
-+#include "../pinconf.h"
-+#include "../pinmux.h"
-+#include "pinctrl-starfive-jh7110.h"
-+
-+#define JH7110_AON_NGPIO              4
-+#define JH7110_AON_GC_BASE            64
-+
-+/* registers */
-+#define JH7110_AON_DOEN                       0x0
-+#define JH7110_AON_DOUT                       0x4
-+#define JH7110_AON_GPI                        0x8
-+#define JH7110_AON_GPIOIN             0x2c
-+
-+#define JH7110_AON_GPIOEN             0xc
-+#define JH7110_AON_GPIOIS             0x10
-+#define JH7110_AON_GPIOIC             0x14
-+#define JH7110_AON_GPIOIBE            0x18
-+#define JH7110_AON_GPIOIEV            0x1c
-+#define JH7110_AON_GPIOIE             0x20
-+#define JH7110_AON_GPIORIS            0x28
-+#define JH7110_AON_GPIOMIS            0x28
-+
-+#define JH7110_AON_GPO_PDA_0_5_CFG    0x30
-+
-+static const struct pinctrl_pin_desc jh7110_aon_pins[] = {
-+      PINCTRL_PIN(PAD_TESTEN,         "TESTEN"),
-+      PINCTRL_PIN(PAD_RGPIO0,         "RGPIO0"),
-+      PINCTRL_PIN(PAD_RGPIO1,         "RGPIO1"),
-+      PINCTRL_PIN(PAD_RGPIO2,         "RGPIO2"),
-+      PINCTRL_PIN(PAD_RGPIO3,         "RGPIO3"),
-+      PINCTRL_PIN(PAD_RSTN,           "RSTN"),
-+      PINCTRL_PIN(PAD_GMAC0_MDC,      "GMAC0_MDC"),
-+      PINCTRL_PIN(PAD_GMAC0_MDIO,     "GMAC0_MDIO"),
-+      PINCTRL_PIN(PAD_GMAC0_RXD0,     "GMAC0_RXD0"),
-+      PINCTRL_PIN(PAD_GMAC0_RXD1,     "GMAC0_RXD1"),
-+      PINCTRL_PIN(PAD_GMAC0_RXD2,     "GMAC0_RXD2"),
-+      PINCTRL_PIN(PAD_GMAC0_RXD3,     "GMAC0_RXD3"),
-+      PINCTRL_PIN(PAD_GMAC0_RXDV,     "GMAC0_RXDV"),
-+      PINCTRL_PIN(PAD_GMAC0_RXC,      "GMAC0_RXC"),
-+      PINCTRL_PIN(PAD_GMAC0_TXD0,     "GMAC0_TXD0"),
-+      PINCTRL_PIN(PAD_GMAC0_TXD1,     "GMAC0_TXD1"),
-+      PINCTRL_PIN(PAD_GMAC0_TXD2,     "GMAC0_TXD2"),
-+      PINCTRL_PIN(PAD_GMAC0_TXD3,     "GMAC0_TXD3"),
-+      PINCTRL_PIN(PAD_GMAC0_TXEN,     "GMAC0_TXEN"),
-+      PINCTRL_PIN(PAD_GMAC0_TXC,      "GMAC0_TXC"),
-+};
-+
-+static int jh7110_aon_set_one_pin_mux(struct jh7110_pinctrl *sfp,
-+                                    unsigned int pin,
-+                                    unsigned int din, u32 dout,
-+                                    u32 doen, u32 func)
-+{
-+      if (pin < sfp->gc.ngpio && func == 0)
-+              jh7110_set_gpiomux(sfp, pin, din, dout, doen);
-+
-+      return 0;
-+}
-+
-+static int jh7110_aon_get_padcfg_base(struct jh7110_pinctrl *sfp,
-+                                    unsigned int pin)
-+{
-+      if (pin < PAD_GMAC0_MDC)
-+              return JH7110_AON_GPO_PDA_0_5_CFG;
-+
-+      return -1;
-+}
-+
-+static void jh7110_aon_irq_handler(struct irq_desc *desc)
-+{
-+      struct jh7110_pinctrl *sfp = jh7110_from_irq_desc(desc);
-+      struct irq_chip *chip = irq_desc_get_chip(desc);
-+      unsigned long mis;
-+      unsigned int pin;
-+
-+      chained_irq_enter(chip, desc);
-+
-+      mis = readl_relaxed(sfp->base + JH7110_AON_GPIOMIS);
-+      for_each_set_bit(pin, &mis, JH7110_AON_NGPIO)
-+              generic_handle_domain_irq(sfp->gc.irq.domain, pin);
-+
-+      chained_irq_exit(chip, desc);
-+}
-+
-+static int jh7110_aon_init_hw(struct gpio_chip *gc)
-+{
-+      struct jh7110_pinctrl *sfp = container_of(gc,
-+                      struct jh7110_pinctrl, gc);
-+
-+      /* mask all GPIO interrupts */
-+      writel_relaxed(0, sfp->base + JH7110_AON_GPIOIE);
-+      /* clear edge interrupt flags */
-+      writel_relaxed(0, sfp->base + JH7110_AON_GPIOIC);
-+      writel_relaxed(0x0f, sfp->base + JH7110_AON_GPIOIC);
-+      /* enable GPIO interrupts */
-+      writel_relaxed(1, sfp->base + JH7110_AON_GPIOEN);
-+      return 0;
-+}
-+
-+static const struct jh7110_gpio_irq_reg jh7110_aon_irq_reg = {
-+      .is_reg_base    = JH7110_AON_GPIOIS,
-+      .ic_reg_base    = JH7110_AON_GPIOIC,
-+      .ibe_reg_base   = JH7110_AON_GPIOIBE,
-+      .iev_reg_base   = JH7110_AON_GPIOIEV,
-+      .ie_reg_base    = JH7110_AON_GPIOIE,
-+      .ris_reg_base   = JH7110_AON_GPIORIS,
-+      .mis_reg_base   = JH7110_AON_GPIOMIS,
-+};
-+
-+static const struct jh7110_pinctrl_soc_info jh7110_aon_pinctrl_info = {
-+      .pins           = jh7110_aon_pins,
-+      .npins          = ARRAY_SIZE(jh7110_aon_pins),
-+      .ngpios         = JH7110_AON_NGPIO,
-+      .gc_base        = JH7110_AON_GC_BASE,
-+      .dout_reg_base  = JH7110_AON_DOUT,
-+      .dout_mask      = GENMASK(3, 0),
-+      .doen_reg_base  = JH7110_AON_DOEN,
-+      .doen_mask      = GENMASK(2, 0),
-+      .gpi_reg_base   = JH7110_AON_GPI,
-+      .gpi_mask       = GENMASK(3, 0),
-+      .gpioin_reg_base           = JH7110_AON_GPIOIN,
-+      .irq_reg                   = &jh7110_aon_irq_reg,
-+      .jh7110_set_one_pin_mux  = jh7110_aon_set_one_pin_mux,
-+      .jh7110_get_padcfg_base  = jh7110_aon_get_padcfg_base,
-+      .jh7110_gpio_irq_handler = jh7110_aon_irq_handler,
-+      .jh7110_gpio_init_hw     = jh7110_aon_init_hw,
-+};
-+
-+static const struct of_device_id jh7110_aon_pinctrl_of_match[] = {
-+      {
-+              .compatible = "starfive,jh7110-aon-pinctrl",
-+              .data = &jh7110_aon_pinctrl_info,
-+      },
-+      { /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, jh7110_aon_pinctrl_of_match);
-+
-+static struct platform_driver jh7110_aon_pinctrl_driver = {
-+      .probe = jh7110_pinctrl_probe,
-+      .driver = {
-+              .name = "starfive-jh7110-aon-pinctrl",
-+              .of_match_table = jh7110_aon_pinctrl_of_match,
-+      },
-+};
-+module_platform_driver(jh7110_aon_pinctrl_driver);
-+
-+MODULE_DESCRIPTION("Pinctrl driver for the StarFive JH7110 SoC aon controller");
-+MODULE_AUTHOR("Jianlong Huang <jianlong.huang@starfivetech.com>");
-+MODULE_LICENSE("GPL");
--- 
-2.20.1
-