[PATCH v4 5/5] reset: zx2967: use the reset-simple driver

2017-10-17 Thread Philipp Zabel 
The reset-simple driver can be used without changes.

Signed-off-by: Philipp Zabel 
Reviewed-by: Alexandru Gagniuc 
---
 MAINTAINERS  |  1 -
 drivers/reset/Kconfig| 10 +
 drivers/reset/Makefile   |  1 -
 drivers/reset/reset-simple.c |  2 +
 drivers/reset/reset-zx2967.c | 99 
 5 files changed, 4 insertions(+), 109 deletions(-)
 delete mode 100644 drivers/reset/reset-zx2967.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 3b9887b3644ef..d48d8a238fae1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2124,7 +2124,6 @@ F:drivers/gpio/gpio-zx.c
 F: drivers/i2c/busses/i2c-zx2967.c
 F: drivers/mmc/host/dw_mmc-zx.*
 F: drivers/pinctrl/zte/
-F: drivers/reset/reset-zx2967.c
 F: drivers/soc/zte/
 F: drivers/thermal/zx2967_thermal.c
 F: drivers/watchdog/zx2967_wdt.c
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 9bdb4fe1b03e6..de0090c911cd6 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -77,14 +77,14 @@ config RESET_PISTACHIO
 
 config RESET_SIMPLE
bool "Simple Reset Controller Driver" if COMPILE_TEST
-   default ARCH_SOCFPGA || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI
+   default ARCH_SOCFPGA || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || 
ARCH_ZX
help
  This enables a simple reset controller driver for reset lines that
  that can be asserted and deasserted by toggling bits in a contiguous,
  exclusive register space.
 
  Currently this driver supports Altera SoCFPGAs, the RCC reset
- controller in STM32 MCUs, and Allwinner SoCs.
+ controller in STM32 MCUs, Allwinner SoCs, and ZTE's zx2967 family.
 
 config RESET_SUNXI
bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI
@@ -121,12 +121,6 @@ config RESET_UNIPHIER
  Say Y if you want to control reset signals provided by System Control
  block, Media I/O block, Peripheral Block.
 
-config RESET_ZX2967
-   bool "ZTE ZX2967 Reset Driver"
-   depends on ARCH_ZX || COMPILE_TEST
-   help
- This enables the reset controller driver for ZTE's zx2967 family.
-
 config RESET_ZYNQ
bool "ZYNQ Reset Driver" if COMPILE_TEST
default ARCH_ZYNQ
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 98dd1eccc820c..48b64d63b75aa 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -17,6 +17,5 @@ obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
 obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o
 obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o
-obj-$(CONFIG_RESET_ZX2967) += reset-zx2967.o
 obj-$(CONFIG_RESET_ZYNQ) += reset-zynq.o
 
diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
index 273039ef02e64..a63f96d92035e 100644
--- a/drivers/reset/reset-simple.c
+++ b/drivers/reset/reset-simple.c
@@ -123,6 +123,8 @@ static const struct of_device_id reset_simple_dt_ids[] = {
{ .compatible = "st,stm32-rcc", },
{ .compatible = "allwinner,sun6i-a31-clock-reset",
.data = _simple_active_low },
+   { .compatible = "zte,zx296718-reset",
+   .data = _simple_active_low },
{ /* sentinel */ },
 };
 
diff --git a/drivers/reset/reset-zx2967.c b/drivers/reset/reset-zx2967.c
deleted file mode 100644
index 4f319f7753d4d..0
--- a/drivers/reset/reset-zx2967.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ZTE's zx2967 family reset controller driver
- *
- * Copyright (C) 2017 ZTE Ltd.
- *
- * Author: Baoyou Xie 
- *
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include 
-#include 
-#include 
-
-struct zx2967_reset {
-   void __iomem*reg_base;
-   spinlock_t  lock;
-   struct reset_controller_dev rcdev;
-};
-
-static int zx2967_reset_act(struct reset_controller_dev *rcdev,
-   unsigned long id, bool assert)
-{
-   struct zx2967_reset *reset = NULL;
-   int bank = id / 32;
-   int offset = id % 32;
-   u32 reg;
-   unsigned long flags;
-
-   reset = container_of(rcdev, struct zx2967_reset, rcdev);
-
-   spin_lock_irqsave(>lock, flags);
-
-   reg = readl_relaxed(reset->reg_base + (bank * 4));
-   if (assert)
-   reg &= ~BIT(offset);
-   else
-   reg |= BIT(offset);
-   writel_relaxed(reg, reset->reg_base + (bank * 4));
-
-   spin_unlock_irqrestore(>lock, flags);
-
-   return 0;
-}
-
-static int zx2967_reset_assert(struct reset_controller_dev *rcdev,
-  unsigned long id)
-{
-   return zx2967_reset_act(rcdev, id, true);
-}
-
-static int zx2967_reset_deassert(struct reset_controller_dev *rcdev,
-unsigned long id)
-{
-   return zx2967_reset_act(rcdev, id, false);
-}
-

[PATCH v4 5/5] reset: zx2967: use the reset-simple driver

2017-10-17 Thread Philipp Zabel 
The reset-simple driver can be used without changes.

Signed-off-by: Philipp Zabel 
Reviewed-by: Alexandru Gagniuc 
---
 MAINTAINERS  |  1 -
 drivers/reset/Kconfig| 10 +
 drivers/reset/Makefile   |  1 -
 drivers/reset/reset-simple.c |  2 +
 drivers/reset/reset-zx2967.c | 99 
 5 files changed, 4 insertions(+), 109 deletions(-)
 delete mode 100644 drivers/reset/reset-zx2967.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 3b9887b3644ef..d48d8a238fae1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2124,7 +2124,6 @@ F:drivers/gpio/gpio-zx.c
 F: drivers/i2c/busses/i2c-zx2967.c
 F: drivers/mmc/host/dw_mmc-zx.*
 F: drivers/pinctrl/zte/
-F: drivers/reset/reset-zx2967.c
 F: drivers/soc/zte/
 F: drivers/thermal/zx2967_thermal.c
 F: drivers/watchdog/zx2967_wdt.c
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 9bdb4fe1b03e6..de0090c911cd6 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -77,14 +77,14 @@ config RESET_PISTACHIO
 
 config RESET_SIMPLE
bool "Simple Reset Controller Driver" if COMPILE_TEST
-   default ARCH_SOCFPGA || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI
+   default ARCH_SOCFPGA || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || 
ARCH_ZX
help
  This enables a simple reset controller driver for reset lines that
  that can be asserted and deasserted by toggling bits in a contiguous,
  exclusive register space.
 
  Currently this driver supports Altera SoCFPGAs, the RCC reset
- controller in STM32 MCUs, and Allwinner SoCs.
+ controller in STM32 MCUs, Allwinner SoCs, and ZTE's zx2967 family.
 
 config RESET_SUNXI
bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI
@@ -121,12 +121,6 @@ config RESET_UNIPHIER
  Say Y if you want to control reset signals provided by System Control
  block, Media I/O block, Peripheral Block.
 
-config RESET_ZX2967
-   bool "ZTE ZX2967 Reset Driver"
-   depends on ARCH_ZX || COMPILE_TEST
-   help
- This enables the reset controller driver for ZTE's zx2967 family.
-
 config RESET_ZYNQ
bool "ZYNQ Reset Driver" if COMPILE_TEST
default ARCH_ZYNQ
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 98dd1eccc820c..48b64d63b75aa 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -17,6 +17,5 @@ obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
 obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o
 obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o
-obj-$(CONFIG_RESET_ZX2967) += reset-zx2967.o
 obj-$(CONFIG_RESET_ZYNQ) += reset-zynq.o
 
diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
index 273039ef02e64..a63f96d92035e 100644
--- a/drivers/reset/reset-simple.c
+++ b/drivers/reset/reset-simple.c
@@ -123,6 +123,8 @@ static const struct of_device_id reset_simple_dt_ids[] = {
{ .compatible = "st,stm32-rcc", },
{ .compatible = "allwinner,sun6i-a31-clock-reset",
.data = _simple_active_low },
+   { .compatible = "zte,zx296718-reset",
+   .data = _simple_active_low },
{ /* sentinel */ },
 };
 
diff --git a/drivers/reset/reset-zx2967.c b/drivers/reset/reset-zx2967.c
deleted file mode 100644
index 4f319f7753d4d..0
--- a/drivers/reset/reset-zx2967.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ZTE's zx2967 family reset controller driver
- *
- * Copyright (C) 2017 ZTE Ltd.
- *
- * Author: Baoyou Xie 
- *
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include 
-#include 
-#include 
-
-struct zx2967_reset {
-   void __iomem*reg_base;
-   spinlock_t  lock;
-   struct reset_controller_dev rcdev;
-};
-
-static int zx2967_reset_act(struct reset_controller_dev *rcdev,
-   unsigned long id, bool assert)
-{
-   struct zx2967_reset *reset = NULL;
-   int bank = id / 32;
-   int offset = id % 32;
-   u32 reg;
-   unsigned long flags;
-
-   reset = container_of(rcdev, struct zx2967_reset, rcdev);
-
-   spin_lock_irqsave(>lock, flags);
-
-   reg = readl_relaxed(reset->reg_base + (bank * 4));
-   if (assert)
-   reg &= ~BIT(offset);
-   else
-   reg |= BIT(offset);
-   writel_relaxed(reg, reset->reg_base + (bank * 4));
-
-   spin_unlock_irqrestore(>lock, flags);
-
-   return 0;
-}
-
-static int zx2967_reset_assert(struct reset_controller_dev *rcdev,
-  unsigned long id)
-{
-   return zx2967_reset_act(rcdev, id, true);
-}
-
-static int zx2967_reset_deassert(struct reset_controller_dev *rcdev,
-unsigned long id)
-{
-   return zx2967_reset_act(rcdev, id, false);
-}
-
-static const struct reset_control_ops zx2967_reset_ops = {
-