jh71x0: update patches and config

[openwrt/staging/wigyori.git] / target / linux / jh71x0 / patches-6.1 / 0015-reset-starfive-Add-StarFive-JH7110-reset-driver.patch

diff --git a/target/linux/jh71x0/patches-6.1/0015-reset-starfive-Add-StarFive-JH7110-reset-driver.patch b/target/linux/jh71x0/patches-6.1/0015-reset-starfive-Add-StarFive-JH7110-reset-driver.patch
new file mode 100644 (file)
index 0000000..35e3c02
--- /dev/null
+++ b/target/linux/jh71x0/patches-6.1/0015-reset-starfive-Add-StarFive-JH7110-reset-driver.patch
@@ -0,0 +1,123 @@
+From 367d8276ade1a68f8370deb4aee67ecd2c4e487d Mon Sep 17 00:00:00 2001
+From: Hal Feng <hal.feng@starfivetech.com>
+Date: Sat, 1 Apr 2023 19:19:27 +0800
+Subject: [PATCH 015/129] reset: starfive: Add StarFive JH7110 reset driver
+
+Add auxiliary driver to support StarFive JH7110 system
+and always-on resets.
+
+Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
+Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
+Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
+Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
+---
+ drivers/reset/starfive/Kconfig                |  8 +++
+ drivers/reset/starfive/Makefile               |  1 +
+ .../reset/starfive/reset-starfive-jh7110.c    | 70 +++++++++++++++++++
+ 3 files changed, 79 insertions(+)
+ create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c
+
+diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig
+index 1927a5a3b..1fa706a2c 100644
+--- a/drivers/reset/starfive/Kconfig
++++ b/drivers/reset/starfive/Kconfig
+@@ -10,3 +10,11 @@ config RESET_STARFIVE_JH7100
+       default ARCH_STARFIVE
+       help
+         This enables the reset controller driver for the StarFive JH7100 SoC.
++
++config RESET_STARFIVE_JH7110
++      bool "StarFive JH7110 Reset Driver"
++      depends on AUXILIARY_BUS && CLK_STARFIVE_JH7110_SYS
++      select RESET_STARFIVE_JH71X0
++      default ARCH_STARFIVE
++      help
++        This enables the reset controller driver for the StarFive JH7110 SoC.
+diff --git a/drivers/reset/starfive/Makefile b/drivers/reset/starfive/Makefile
+index f6aa12466..7a44b66fb 100644
+--- a/drivers/reset/starfive/Makefile
++++ b/drivers/reset/starfive/Makefile
+@@ -2,3 +2,4 @@
+ obj-$(CONFIG_RESET_STARFIVE_JH71X0)           += reset-starfive-jh71x0.o
+ 
+ obj-$(CONFIG_RESET_STARFIVE_JH7100)           += reset-starfive-jh7100.o
++obj-$(CONFIG_RESET_STARFIVE_JH7110)           += reset-starfive-jh7110.o
+diff --git a/drivers/reset/starfive/reset-starfive-jh7110.c b/drivers/reset/starfive/reset-starfive-jh7110.c
+new file mode 100644
+index 000000000..c1b3a490d
+--- /dev/null
++++ b/drivers/reset/starfive/reset-starfive-jh7110.c
+@@ -0,0 +1,70 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Reset driver for the StarFive JH7110 SoC
++ *
++ * Copyright (C) 2022 StarFive Technology Co., Ltd.
++ */
++
++#include <linux/auxiliary_bus.h>
++
++#include "reset-starfive-jh71x0.h"
++
++#include <dt-bindings/reset/starfive,jh7110-crg.h>
++
++struct jh7110_reset_info {
++      unsigned int nr_resets;
++      unsigned int assert_offset;
++      unsigned int status_offset;
++};
++
++static const struct jh7110_reset_info jh7110_sys_info = {
++      .nr_resets = JH7110_SYSRST_END,
++      .assert_offset = 0x2F8,
++      .status_offset = 0x308,
++};
++
++static const struct jh7110_reset_info jh7110_aon_info = {
++      .nr_resets = JH7110_AONRST_END,
++      .assert_offset = 0x38,
++      .status_offset = 0x3C,
++};
++
++static int jh7110_reset_probe(struct auxiliary_device *adev,
++                            const struct auxiliary_device_id *id)
++{
++      struct jh7110_reset_info *info = (struct jh7110_reset_info *)(id->driver_data);
++      void __iomem **base = (void __iomem **)dev_get_drvdata(adev->dev.parent);
++
++      if (!info || !base)
++              return -ENODEV;
++
++      return reset_starfive_jh71x0_register(&adev->dev, adev->dev.parent->of_node,
++                                            *base + info->assert_offset,
++                                            *base + info->status_offset,
++                                            NULL,
++                                            info->nr_resets,
++                                            NULL);
++}
++
++static const struct auxiliary_device_id jh7110_reset_ids[] = {
++      {
++              .name = "clk_starfive_jh7110_sys.rst-sys",
++              .driver_data = (kernel_ulong_t)&jh7110_sys_info,
++      },
++      {
++              .name = "clk_starfive_jh7110_sys.rst-aon",
++              .driver_data = (kernel_ulong_t)&jh7110_aon_info,
++      },
++      { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(auxiliary, jh7110_reset_ids);
++
++static struct auxiliary_driver jh7110_reset_driver = {
++      .probe          = jh7110_reset_probe,
++      .id_table       = jh7110_reset_ids,
++};
++module_auxiliary_driver(jh7110_reset_driver);
++
++MODULE_AUTHOR("Hal Feng <hal.feng@starfivetech.com>");
++MODULE_DESCRIPTION("StarFive JH7110 reset driver");
++MODULE_LICENSE("GPL");
+-- 
+2.25.1
+