* [PATCH v2 1/3] dt: bindings: add documentation for zx2967 family reset controller
@ 2017-01-16 10:56 ` Baoyou Xie
0 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: jun.nie, p.zabel, robh+dt, mark.rutland
Cc: linux-arm-kernel, devicetree, linux-kernel, shawnguo, baoyou.xie,
xie.baoyou, chen.chaokai, wang.qiang01
This patch adds dt-binding documentation for zx2967 family
reset controller.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Reviewed-by: Shawn Guo <shawnguo@kernel.org>
---
.../devicetree/bindings/reset/zte,zx2967-reset.txt | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
diff --git a/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
new file mode 100644
index 0000000..b015508
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
@@ -0,0 +1,20 @@
+ZTE zx2967 SoCs Reset Controller
+=======================================
+
+Please also refer to reset.txt in this directory for common reset
+controller binding usage.
+
+Required properties:
+- compatible: should be one of the following.
+ * zte,zx296718-reset
+- reg: physical base address of the controller and length of memory mapped
+ region.
+- #reset-cells: must be 1.
+
+example:
+
+ reset: reset-controller@1461060 {
+ compatible = "zte,zx296718-reset";
+ reg = <0x01461060 0x8>;
+ #reset-cells = <1>;
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 1/3] dt: bindings: add documentation for zx2967 family reset controller
@ 2017-01-16 10:56 ` Baoyou Xie
0 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds dt-binding documentation for zx2967 family
reset controller.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Reviewed-by: Shawn Guo <shawnguo@kernel.org>
---
.../devicetree/bindings/reset/zte,zx2967-reset.txt | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
diff --git a/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
new file mode 100644
index 0000000..b015508
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
@@ -0,0 +1,20 @@
+ZTE zx2967 SoCs Reset Controller
+=======================================
+
+Please also refer to reset.txt in this directory for common reset
+controller binding usage.
+
+Required properties:
+- compatible: should be one of the following.
+ * zte,zx296718-reset
+- reg: physical base address of the controller and length of memory mapped
+ region.
+- #reset-cells: must be 1.
+
+example:
+
+ reset: reset-controller at 1461060 {
+ compatible = "zte,zx296718-reset";
+ reg = <0x01461060 0x8>;
+ #reset-cells = <1>;
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
2017-01-16 10:56 ` Baoyou Xie
@ 2017-01-16 10:56 ` Baoyou Xie
-1 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: jun.nie, p.zabel, robh+dt, mark.rutland
Cc: linux-arm-kernel, devicetree, linux-kernel, shawnguo, baoyou.xie,
xie.baoyou, chen.chaokai, wang.qiang01
Add the zx2967 reset controller driver as maintained by ARM ZTE
architecture maintainers, as they're parts of the core IP.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2793808..08f8155 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1980,10 +1980,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-zx/
F: drivers/clk/zte/
+F: drivers/reset/reset-zx2967.c
F: drivers/soc/zte/
F: drivers/thermal/zx*
F: Documentation/devicetree/bindings/arm/zte.txt
F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
+F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
F: Documentation/devicetree/bindings/soc/zte/
F: Documentation/devicetree/bindings/thermal/zx*
F: include/dt-bindings/soc/zx*.h
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
@ 2017-01-16 10:56 ` Baoyou Xie
0 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Add the zx2967 reset controller driver as maintained by ARM ZTE
architecture maintainers, as they're parts of the core IP.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2793808..08f8155 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1980,10 +1980,12 @@ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-zx/
F: drivers/clk/zte/
+F: drivers/reset/reset-zx2967.c
F: drivers/soc/zte/
F: drivers/thermal/zx*
F: Documentation/devicetree/bindings/arm/zte.txt
F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
+F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
F: Documentation/devicetree/bindings/soc/zte/
F: Documentation/devicetree/bindings/thermal/zx*
F: include/dt-bindings/soc/zx*.h
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
2017-01-16 10:56 ` Baoyou Xie
@ 2017-01-16 10:56 ` Baoyou Xie
-1 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: jun.nie, p.zabel, robh+dt, mark.rutland
Cc: linux-arm-kernel, devicetree, linux-kernel, shawnguo, baoyou.xie,
xie.baoyou, chen.chaokai, wang.qiang01
This patch adds reset controller driver for ZTE's zx2967 family.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
drivers/reset/Kconfig | 6 +++
drivers/reset/Makefile | 1 +
drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
create mode 100644 drivers/reset/reset-zx2967.c
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 172dc96..f4cdfe9 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
new file mode 100644
index 0000000..bc95261
--- /dev/null
+++ b/drivers/reset/reset-zx2967.c
@@ -0,0 +1,125 @@
+/*
+ * ZTE's zx2967 family reset controller driver
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/reset-controller.h>
+
+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;
+ u32 bank = id / 32;
+ u32 offset = id % 32;
+ u32 reg;
+ unsigned long flags;
+
+ reset = container_of(rcdev, struct zx2967_reset, rcdev);
+
+ spin_lock_irqsave(&reset->lock, flags);
+
+ reg = readl(reset->reg_base + (bank * 4));
+ if (assert)
+ reg &= ~BIT(offset);
+ else
+ reg |= BIT(offset);
+ writel(reg, reset->reg_base + (bank * 4));
+
+ spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
+ .assert = zx2967_reset_assert,
+ .deassert = zx2967_reset_deassert,
+};
+
+static int zx2967_reset_probe(struct platform_device *pdev)
+{
+ struct zx2967_reset *reset;
+ struct resource *res;
+
+ reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
+ if (!reset)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(reset->reg_base))
+ return PTR_ERR(reset->reg_base);
+
+ spin_lock_init(&reset->lock);
+
+ reset->rcdev.owner = THIS_MODULE;
+ reset->rcdev.nr_resets = resource_size(res) * 8;
+ reset->rcdev.ops = &zx2967_reset_ops;
+ reset->rcdev.of_node = pdev->dev.of_node;
+
+ dev_info(&pdev->dev, "reset controller cnt:%d",
+ reset->rcdev.nr_resets);
+
+ return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
+}
+
+static int zx2967_reset_remove(struct platform_device *pdev)
+{
+ return 0;
+}
+
+static const struct of_device_id zx2967_reset_dt_ids[] = {
+ { .compatible = "zte,zx296718-reset", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
+
+static struct platform_driver zx2967_reset_driver = {
+ .probe = zx2967_reset_probe,
+ .remove = zx2967_reset_remove,
+ .driver = {
+ .name = "zx2967-reset",
+ .of_match_table = zx2967_reset_dt_ids,
+ },
+};
+
+static int __init zx2967_reset_init(void)
+{
+ return platform_driver_register(&zx2967_reset_driver);
+}
+arch_initcall(zx2967_reset_init);
+
+static void __exit zx2967_reset_exit(void)
+{
+ platform_driver_unregister(&zx2967_reset_driver);
+}
+module_exit(zx2967_reset_exit);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
+MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
+MODULE_LICENSE("GPL");
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
@ 2017-01-16 10:56 ` Baoyou Xie
0 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-16 10:56 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds reset controller driver for ZTE's zx2967 family.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
drivers/reset/Kconfig | 6 +++
drivers/reset/Makefile | 1 +
drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
create mode 100644 drivers/reset/reset-zx2967.c
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 172dc96..f4cdfe9 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
new file mode 100644
index 0000000..bc95261
--- /dev/null
+++ b/drivers/reset/reset-zx2967.c
@@ -0,0 +1,125 @@
+/*
+ * ZTE's zx2967 family reset controller driver
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/reset-controller.h>
+
+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;
+ u32 bank = id / 32;
+ u32 offset = id % 32;
+ u32 reg;
+ unsigned long flags;
+
+ reset = container_of(rcdev, struct zx2967_reset, rcdev);
+
+ spin_lock_irqsave(&reset->lock, flags);
+
+ reg = readl(reset->reg_base + (bank * 4));
+ if (assert)
+ reg &= ~BIT(offset);
+ else
+ reg |= BIT(offset);
+ writel(reg, reset->reg_base + (bank * 4));
+
+ spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
+ .assert = zx2967_reset_assert,
+ .deassert = zx2967_reset_deassert,
+};
+
+static int zx2967_reset_probe(struct platform_device *pdev)
+{
+ struct zx2967_reset *reset;
+ struct resource *res;
+
+ reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
+ if (!reset)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(reset->reg_base))
+ return PTR_ERR(reset->reg_base);
+
+ spin_lock_init(&reset->lock);
+
+ reset->rcdev.owner = THIS_MODULE;
+ reset->rcdev.nr_resets = resource_size(res) * 8;
+ reset->rcdev.ops = &zx2967_reset_ops;
+ reset->rcdev.of_node = pdev->dev.of_node;
+
+ dev_info(&pdev->dev, "reset controller cnt:%d",
+ reset->rcdev.nr_resets);
+
+ return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
+}
+
+static int zx2967_reset_remove(struct platform_device *pdev)
+{
+ return 0;
+}
+
+static const struct of_device_id zx2967_reset_dt_ids[] = {
+ { .compatible = "zte,zx296718-reset", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
+
+static struct platform_driver zx2967_reset_driver = {
+ .probe = zx2967_reset_probe,
+ .remove = zx2967_reset_remove,
+ .driver = {
+ .name = "zx2967-reset",
+ .of_match_table = zx2967_reset_dt_ids,
+ },
+};
+
+static int __init zx2967_reset_init(void)
+{
+ return platform_driver_register(&zx2967_reset_driver);
+}
+arch_initcall(zx2967_reset_init);
+
+static void __exit zx2967_reset_exit(void)
+{
+ platform_driver_unregister(&zx2967_reset_driver);
+}
+module_exit(zx2967_reset_exit);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
+MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
+MODULE_LICENSE("GPL");
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
2017-01-16 10:56 ` Baoyou Xie
@ 2017-01-16 14:28 ` Jun Nie
-1 siblings, 0 replies; 15+ messages in thread
From: Jun Nie @ 2017-01-16 14:28 UTC (permalink / raw)
To: Baoyou Xie, p.zabel, robh+dt, mark.rutland
Cc: devicetree, xie.baoyou, linux-kernel, chen.chaokai, wang.qiang01,
shawnguo, linux-arm-kernel
On 2017年01月16日 18:56, Baoyou Xie wrote:
> This patch adds reset controller driver for ZTE's zx2967 family.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> drivers/reset/Kconfig | 6 +++
> drivers/reset/Makefile | 1 +
> drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 132 insertions(+)
> create mode 100644 drivers/reset/reset-zx2967.c
>
> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> index 172dc96..f4cdfe9 100644
> --- a/drivers/reset/Kconfig
> +++ b/drivers/reset/Kconfig
> @@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
> --- a/drivers/reset/Makefile
> +++ b/drivers/reset/Makefile
> @@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
> obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
> obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
> new file mode 100644
> index 0000000..bc95261
> --- /dev/null
> +++ b/drivers/reset/reset-zx2967.c
> @@ -0,0 +1,125 @@
> +/*
> + * ZTE's zx2967 family reset controller driver
> + *
> + * Copyright (C) 2017 ZTE Ltd.
> + *
> + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> + *
> + * License terms: GNU General Public License (GPL) version 2
> + */
> +
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/reset-controller.h>
> +
> +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;
> + u32 bank = id / 32;
> + u32 offset = id % 32;
> + u32 reg;
> + unsigned long flags;
> +
> + reset = container_of(rcdev, struct zx2967_reset, rcdev);
> +
> + spin_lock_irqsave(&reset->lock, flags);
> +
> + reg = readl(reset->reg_base + (bank * 4));
readl_relaxed is recommended.
> + if (assert)
> + reg &= ~BIT(offset);
> + else
> + reg |= BIT(offset);
> + writel(reg, reset->reg_base + (bank * 4));
writel_relaxed is recommended.
> +
> + spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
> + .assert = zx2967_reset_assert,
> + .deassert = zx2967_reset_deassert,
> +};
> +
> +static int zx2967_reset_probe(struct platform_device *pdev)
> +{
> + struct zx2967_reset *reset;
> + struct resource *res;
> +
> + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
> + if (!reset)
> + return -ENOMEM;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(reset->reg_base))
> + return PTR_ERR(reset->reg_base);
> +
> + spin_lock_init(&reset->lock);
> +
> + reset->rcdev.owner = THIS_MODULE;
> + reset->rcdev.nr_resets = resource_size(res) * 8;
> + reset->rcdev.ops = &zx2967_reset_ops;
> + reset->rcdev.of_node = pdev->dev.of_node;
> +
> + dev_info(&pdev->dev, "reset controller cnt:%d",
> + reset->rcdev.nr_resets);
> +
> + return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
> +}
> +
> +static int zx2967_reset_remove(struct platform_device *pdev)
> +{
> + return 0;
> +}
> +
> +static const struct of_device_id zx2967_reset_dt_ids[] = {
> + { .compatible = "zte,zx296718-reset", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
> +
> +static struct platform_driver zx2967_reset_driver = {
> + .probe = zx2967_reset_probe,
> + .remove = zx2967_reset_remove,
> + .driver = {
> + .name = "zx2967-reset",
> + .of_match_table = zx2967_reset_dt_ids,
> + },
> +};
This line can replace all below code if you do not have any other
dependency in earlier stage.
builtin_platform_driver(zx2967_reset_driver);
> +
> +static int __init zx2967_reset_init(void)
> +{
> + return platform_driver_register(&zx2967_reset_driver);
> +}
> +arch_initcall(zx2967_reset_init);
> +
> +static void __exit zx2967_reset_exit(void)
> +{
> + platform_driver_unregister(&zx2967_reset_driver);
> +}
> +module_exit(zx2967_reset_exit);
> +
> +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> +MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
> +MODULE_LICENSE("GPL");
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
@ 2017-01-16 14:28 ` Jun Nie
0 siblings, 0 replies; 15+ messages in thread
From: Jun Nie @ 2017-01-16 14:28 UTC (permalink / raw)
To: linux-arm-kernel
On 2017?01?16? 18:56, Baoyou Xie wrote:
> This patch adds reset controller driver for ZTE's zx2967 family.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> drivers/reset/Kconfig | 6 +++
> drivers/reset/Makefile | 1 +
> drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 132 insertions(+)
> create mode 100644 drivers/reset/reset-zx2967.c
>
> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> index 172dc96..f4cdfe9 100644
> --- a/drivers/reset/Kconfig
> +++ b/drivers/reset/Kconfig
> @@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
> --- a/drivers/reset/Makefile
> +++ b/drivers/reset/Makefile
> @@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
> obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
> obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
> new file mode 100644
> index 0000000..bc95261
> --- /dev/null
> +++ b/drivers/reset/reset-zx2967.c
> @@ -0,0 +1,125 @@
> +/*
> + * ZTE's zx2967 family reset controller driver
> + *
> + * Copyright (C) 2017 ZTE Ltd.
> + *
> + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> + *
> + * License terms: GNU General Public License (GPL) version 2
> + */
> +
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/reset-controller.h>
> +
> +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;
> + u32 bank = id / 32;
> + u32 offset = id % 32;
> + u32 reg;
> + unsigned long flags;
> +
> + reset = container_of(rcdev, struct zx2967_reset, rcdev);
> +
> + spin_lock_irqsave(&reset->lock, flags);
> +
> + reg = readl(reset->reg_base + (bank * 4));
readl_relaxed is recommended.
> + if (assert)
> + reg &= ~BIT(offset);
> + else
> + reg |= BIT(offset);
> + writel(reg, reset->reg_base + (bank * 4));
writel_relaxed is recommended.
> +
> + spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
> + .assert = zx2967_reset_assert,
> + .deassert = zx2967_reset_deassert,
> +};
> +
> +static int zx2967_reset_probe(struct platform_device *pdev)
> +{
> + struct zx2967_reset *reset;
> + struct resource *res;
> +
> + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
> + if (!reset)
> + return -ENOMEM;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(reset->reg_base))
> + return PTR_ERR(reset->reg_base);
> +
> + spin_lock_init(&reset->lock);
> +
> + reset->rcdev.owner = THIS_MODULE;
> + reset->rcdev.nr_resets = resource_size(res) * 8;
> + reset->rcdev.ops = &zx2967_reset_ops;
> + reset->rcdev.of_node = pdev->dev.of_node;
> +
> + dev_info(&pdev->dev, "reset controller cnt:%d",
> + reset->rcdev.nr_resets);
> +
> + return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
> +}
> +
> +static int zx2967_reset_remove(struct platform_device *pdev)
> +{
> + return 0;
> +}
> +
> +static const struct of_device_id zx2967_reset_dt_ids[] = {
> + { .compatible = "zte,zx296718-reset", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
> +
> +static struct platform_driver zx2967_reset_driver = {
> + .probe = zx2967_reset_probe,
> + .remove = zx2967_reset_remove,
> + .driver = {
> + .name = "zx2967-reset",
> + .of_match_table = zx2967_reset_dt_ids,
> + },
> +};
This line can replace all below code if you do not have any other
dependency in earlier stage.
builtin_platform_driver(zx2967_reset_driver);
> +
> +static int __init zx2967_reset_init(void)
> +{
> + return platform_driver_register(&zx2967_reset_driver);
> +}
> +arch_initcall(zx2967_reset_init);
> +
> +static void __exit zx2967_reset_exit(void)
> +{
> + platform_driver_unregister(&zx2967_reset_driver);
> +}
> +module_exit(zx2967_reset_exit);
> +
> +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> +MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
> +MODULE_LICENSE("GPL");
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
@ 2017-01-16 14:38 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:38 UTC (permalink / raw)
To: Baoyou Xie
Cc: jun.nie, robh+dt, mark.rutland, linux-arm-kernel, devicetree,
linux-kernel, shawnguo, xie.baoyou, chen.chaokai, wang.qiang01
On Mon, 2017-01-16 at 18:56 +0800, Baoyou Xie wrote:
> Add the zx2967 reset controller driver as maintained by ARM ZTE
> architecture maintainers, as they're parts of the core IP.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> MAINTAINERS | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2793808..08f8155 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1980,10 +1980,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> F: arch/arm/mach-zx/
> F: drivers/clk/zte/
> +F: drivers/reset/reset-zx2967.c
> F: drivers/soc/zte/
> F: drivers/thermal/zx*
> F: Documentation/devicetree/bindings/arm/zte.txt
> F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
> +F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
> F: Documentation/devicetree/bindings/soc/zte/
> F: Documentation/devicetree/bindings/thermal/zx*
> F: include/dt-bindings/soc/zx*.h
This patch doesn't apply on top of reset/next. I can rebase it, but it
will cause a trivial merge conflict with the soc/thermal additions.
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
@ 2017-01-16 14:38 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:38 UTC (permalink / raw)
To: Baoyou Xie
Cc: jun.nie-QSEj5FYQhm4dnm+yROfE0A, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
mark.rutland-5wv7dgnIgG8,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
shawnguo-DgEjT+Ai2ygdnm+yROfE0A,
xie.baoyou-Th6q7B73Y6EnDS1+zs4M5A,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
On Mon, 2017-01-16 at 18:56 +0800, Baoyou Xie wrote:
> Add the zx2967 reset controller driver as maintained by ARM ZTE
> architecture maintainers, as they're parts of the core IP.
>
> Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
> MAINTAINERS | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2793808..08f8155 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1980,10 +1980,12 @@ L: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org (moderated for non-subscribers)
> S: Maintained
> F: arch/arm/mach-zx/
> F: drivers/clk/zte/
> +F: drivers/reset/reset-zx2967.c
> F: drivers/soc/zte/
> F: drivers/thermal/zx*
> F: Documentation/devicetree/bindings/arm/zte.txt
> F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
> +F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
> F: Documentation/devicetree/bindings/soc/zte/
> F: Documentation/devicetree/bindings/thermal/zx*
> F: include/dt-bindings/soc/zx*.h
This patch doesn't apply on top of reset/next. I can rebase it, but it
will cause a trivial merge conflict with the soc/thermal additions.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
@ 2017-01-16 14:38 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2017-01-16 at 18:56 +0800, Baoyou Xie wrote:
> Add the zx2967 reset controller driver as maintained by ARM ZTE
> architecture maintainers, as they're parts of the core IP.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
> MAINTAINERS | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2793808..08f8155 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1980,10 +1980,12 @@ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> F: arch/arm/mach-zx/
> F: drivers/clk/zte/
> +F: drivers/reset/reset-zx2967.c
> F: drivers/soc/zte/
> F: drivers/thermal/zx*
> F: Documentation/devicetree/bindings/arm/zte.txt
> F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
> +F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
> F: Documentation/devicetree/bindings/soc/zte/
> F: Documentation/devicetree/bindings/thermal/zx*
> F: include/dt-bindings/soc/zx*.h
This patch doesn't apply on top of reset/next. I can rebase it, but it
will cause a trivial merge conflict with the soc/thermal additions.
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
@ 2017-01-16 14:43 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:43 UTC (permalink / raw)
To: Jun Nie
Cc: Baoyou Xie, robh+dt, mark.rutland, linux-arm-kernel, devicetree,
linux-kernel, shawnguo, xie.baoyou, chen.chaokai, wang.qiang01
On Mon, 2017-01-16 at 22:28 +0800, Jun Nie wrote:
> On 2017年01月16日 18:56, Baoyou Xie wrote:
> > This patch adds reset controller driver for ZTE's zx2967 family.
> >
> > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > ---
> > drivers/reset/Kconfig | 6 +++
> > drivers/reset/Makefile | 1 +
> > drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 132 insertions(+)
> > create mode 100644 drivers/reset/reset-zx2967.c
> >
> > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> > index 172dc96..f4cdfe9 100644
> > --- a/drivers/reset/Kconfig
> > +++ b/drivers/reset/Kconfig
> > @@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
> > --- a/drivers/reset/Makefile
> > +++ b/drivers/reset/Makefile
> > @@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
> > obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
> > obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
> > new file mode 100644
> > index 0000000..bc95261
> > --- /dev/null
> > +++ b/drivers/reset/reset-zx2967.c
> > @@ -0,0 +1,125 @@
> > +/*
> > + * ZTE's zx2967 family reset controller driver
> > + *
> > + * Copyright (C) 2017 ZTE Ltd.
> > + *
> > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > + *
> > + * License terms: GNU General Public License (GPL) version 2
> > + */
> > +
> > +#include <linux/module.h>
> > +#include <linux/of_address.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/reset-controller.h>
> > +
> > +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;
> > + u32 bank = id / 32;
> > + u32 offset = id % 32;
Not terribly important, but int for bank and offset was just fine.
> > + u32 reg;
> > + unsigned long flags;
> > +
> > + reset = container_of(rcdev, struct zx2967_reset, rcdev);
> > +
> > + spin_lock_irqsave(&reset->lock, flags);
> > +
> > + reg = readl(reset->reg_base + (bank * 4));
>
> readl_relaxed is recommended.
>
> > + if (assert)
> > + reg &= ~BIT(offset);
> > + else
> > + reg |= BIT(offset);
> > + writel(reg, reset->reg_base + (bank * 4));
>
> writel_relaxed is recommended.
Why? Resets are usually not performance critical.
> > +
> > + spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
> > + .assert = zx2967_reset_assert,
> > + .deassert = zx2967_reset_deassert,
> > +};
> > +
> > +static int zx2967_reset_probe(struct platform_device *pdev)
> > +{
> > + struct zx2967_reset *reset;
> > + struct resource *res;
> > +
> > + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
> > + if (!reset)
> > + return -ENOMEM;
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(reset->reg_base))
> > + return PTR_ERR(reset->reg_base);
> > +
> > + spin_lock_init(&reset->lock);
> > +
> > + reset->rcdev.owner = THIS_MODULE;
> > + reset->rcdev.nr_resets = resource_size(res) * 8;
> > + reset->rcdev.ops = &zx2967_reset_ops;
> > + reset->rcdev.of_node = pdev->dev.of_node;
> > +
> > + dev_info(&pdev->dev, "reset controller cnt:%d",
> > + reset->rcdev.nr_resets);
This is a bit noisy. Can we just drop it?
> > + return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
> > +}
> > +
> > +static int zx2967_reset_remove(struct platform_device *pdev)
> > +{
> > + return 0;
> > +}
Remove this function.
> > +static const struct of_device_id zx2967_reset_dt_ids[] = {
> > + { .compatible = "zte,zx296718-reset", },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
> > +
> > +static struct platform_driver zx2967_reset_driver = {
> > + .probe = zx2967_reset_probe,
> > + .remove = zx2967_reset_remove,
Remove the above line.
> > + .driver = {
> > + .name = "zx2967-reset",
> > + .of_match_table = zx2967_reset_dt_ids,
> > + },
> > +};
>
> This line can replace all below code if you do not have any other
> dependency in earlier stage.
>
> builtin_platform_driver(zx2967_reset_driver);
>
> > +
> > +static int __init zx2967_reset_init(void)
> > +{
> > + return platform_driver_register(&zx2967_reset_driver);
> > +}
> > +arch_initcall(zx2967_reset_init);
> > +
> > +static void __exit zx2967_reset_exit(void)
> > +{
> > + platform_driver_unregister(&zx2967_reset_driver);
> > +}
> > +module_exit(zx2967_reset_exit);
> > +
> > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > +MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
> > +MODULE_LICENSE("GPL");
> >
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
@ 2017-01-16 14:43 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:43 UTC (permalink / raw)
To: Jun Nie
Cc: Baoyou Xie, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
mark.rutland-5wv7dgnIgG8,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
shawnguo-DgEjT+Ai2ygdnm+yROfE0A,
xie.baoyou-Th6q7B73Y6EnDS1+zs4M5A,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A
On Mon, 2017-01-16 at 22:28 +0800, Jun Nie wrote:
> On 2017年01月16日 18:56, Baoyou Xie wrote:
> > This patch adds reset controller driver for ZTE's zx2967 family.
> >
> > Signed-off-by: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > ---
> > drivers/reset/Kconfig | 6 +++
> > drivers/reset/Makefile | 1 +
> > drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 132 insertions(+)
> > create mode 100644 drivers/reset/reset-zx2967.c
> >
> > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> > index 172dc96..f4cdfe9 100644
> > --- a/drivers/reset/Kconfig
> > +++ b/drivers/reset/Kconfig
> > @@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
> > --- a/drivers/reset/Makefile
> > +++ b/drivers/reset/Makefile
> > @@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
> > obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
> > obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
> > new file mode 100644
> > index 0000000..bc95261
> > --- /dev/null
> > +++ b/drivers/reset/reset-zx2967.c
> > @@ -0,0 +1,125 @@
> > +/*
> > + * ZTE's zx2967 family reset controller driver
> > + *
> > + * Copyright (C) 2017 ZTE Ltd.
> > + *
> > + * Author: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > + *
> > + * License terms: GNU General Public License (GPL) version 2
> > + */
> > +
> > +#include <linux/module.h>
> > +#include <linux/of_address.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/reset-controller.h>
> > +
> > +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;
> > + u32 bank = id / 32;
> > + u32 offset = id % 32;
Not terribly important, but int for bank and offset was just fine.
> > + u32 reg;
> > + unsigned long flags;
> > +
> > + reset = container_of(rcdev, struct zx2967_reset, rcdev);
> > +
> > + spin_lock_irqsave(&reset->lock, flags);
> > +
> > + reg = readl(reset->reg_base + (bank * 4));
>
> readl_relaxed is recommended.
>
> > + if (assert)
> > + reg &= ~BIT(offset);
> > + else
> > + reg |= BIT(offset);
> > + writel(reg, reset->reg_base + (bank * 4));
>
> writel_relaxed is recommended.
Why? Resets are usually not performance critical.
> > +
> > + spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
> > + .assert = zx2967_reset_assert,
> > + .deassert = zx2967_reset_deassert,
> > +};
> > +
> > +static int zx2967_reset_probe(struct platform_device *pdev)
> > +{
> > + struct zx2967_reset *reset;
> > + struct resource *res;
> > +
> > + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
> > + if (!reset)
> > + return -ENOMEM;
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(reset->reg_base))
> > + return PTR_ERR(reset->reg_base);
> > +
> > + spin_lock_init(&reset->lock);
> > +
> > + reset->rcdev.owner = THIS_MODULE;
> > + reset->rcdev.nr_resets = resource_size(res) * 8;
> > + reset->rcdev.ops = &zx2967_reset_ops;
> > + reset->rcdev.of_node = pdev->dev.of_node;
> > +
> > + dev_info(&pdev->dev, "reset controller cnt:%d",
> > + reset->rcdev.nr_resets);
This is a bit noisy. Can we just drop it?
> > + return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
> > +}
> > +
> > +static int zx2967_reset_remove(struct platform_device *pdev)
> > +{
> > + return 0;
> > +}
Remove this function.
> > +static const struct of_device_id zx2967_reset_dt_ids[] = {
> > + { .compatible = "zte,zx296718-reset", },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
> > +
> > +static struct platform_driver zx2967_reset_driver = {
> > + .probe = zx2967_reset_probe,
> > + .remove = zx2967_reset_remove,
Remove the above line.
> > + .driver = {
> > + .name = "zx2967-reset",
> > + .of_match_table = zx2967_reset_dt_ids,
> > + },
> > +};
>
> This line can replace all below code if you do not have any other
> dependency in earlier stage.
>
> builtin_platform_driver(zx2967_reset_driver);
>
> > +
> > +static int __init zx2967_reset_init(void)
> > +{
> > + return platform_driver_register(&zx2967_reset_driver);
> > +}
> > +arch_initcall(zx2967_reset_init);
> > +
> > +static void __exit zx2967_reset_exit(void)
> > +{
> > + platform_driver_unregister(&zx2967_reset_driver);
> > +}
> > +module_exit(zx2967_reset_exit);
> > +
> > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>");
> > +MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
> > +MODULE_LICENSE("GPL");
> >
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family
@ 2017-01-16 14:43 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2017-01-16 14:43 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2017-01-16 at 22:28 +0800, Jun Nie wrote:
> On 2017?01?16? 18:56, Baoyou Xie wrote:
> > This patch adds reset controller driver for ZTE's zx2967 family.
> >
> > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > ---
> > drivers/reset/Kconfig | 6 +++
> > drivers/reset/Makefile | 1 +
> > drivers/reset/reset-zx2967.c | 125 +++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 132 insertions(+)
> > create mode 100644 drivers/reset/reset-zx2967.c
> >
> > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> > index 172dc96..f4cdfe9 100644
> > --- a/drivers/reset/Kconfig
> > +++ b/drivers/reset/Kconfig
> > @@ -86,6 +86,12 @@ 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 13b346e..2cd3f6c 100644
> > --- a/drivers/reset/Makefile
> > +++ b/drivers/reset/Makefile
> > @@ -13,4 +13,5 @@ obj-$(CONFIG_RESET_STM32) += reset-stm32.o
> > obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
> > obj-$(CONFIG_TI_SYSCON_RESET) += 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-zx2967.c b/drivers/reset/reset-zx2967.c
> > new file mode 100644
> > index 0000000..bc95261
> > --- /dev/null
> > +++ b/drivers/reset/reset-zx2967.c
> > @@ -0,0 +1,125 @@
> > +/*
> > + * ZTE's zx2967 family reset controller driver
> > + *
> > + * Copyright (C) 2017 ZTE Ltd.
> > + *
> > + * Author: Baoyou Xie <baoyou.xie@linaro.org>
> > + *
> > + * License terms: GNU General Public License (GPL) version 2
> > + */
> > +
> > +#include <linux/module.h>
> > +#include <linux/of_address.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/reset-controller.h>
> > +
> > +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;
> > + u32 bank = id / 32;
> > + u32 offset = id % 32;
Not terribly important, but int for bank and offset was just fine.
> > + u32 reg;
> > + unsigned long flags;
> > +
> > + reset = container_of(rcdev, struct zx2967_reset, rcdev);
> > +
> > + spin_lock_irqsave(&reset->lock, flags);
> > +
> > + reg = readl(reset->reg_base + (bank * 4));
>
> readl_relaxed is recommended.
>
> > + if (assert)
> > + reg &= ~BIT(offset);
> > + else
> > + reg |= BIT(offset);
> > + writel(reg, reset->reg_base + (bank * 4));
>
> writel_relaxed is recommended.
Why? Resets are usually not performance critical.
> > +
> > + spin_unlock_irqrestore(&reset->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 struct reset_control_ops zx2967_reset_ops = {
> > + .assert = zx2967_reset_assert,
> > + .deassert = zx2967_reset_deassert,
> > +};
> > +
> > +static int zx2967_reset_probe(struct platform_device *pdev)
> > +{
> > + struct zx2967_reset *reset;
> > + struct resource *res;
> > +
> > + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL);
> > + if (!reset)
> > + return -ENOMEM;
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + reset->reg_base = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(reset->reg_base))
> > + return PTR_ERR(reset->reg_base);
> > +
> > + spin_lock_init(&reset->lock);
> > +
> > + reset->rcdev.owner = THIS_MODULE;
> > + reset->rcdev.nr_resets = resource_size(res) * 8;
> > + reset->rcdev.ops = &zx2967_reset_ops;
> > + reset->rcdev.of_node = pdev->dev.of_node;
> > +
> > + dev_info(&pdev->dev, "reset controller cnt:%d",
> > + reset->rcdev.nr_resets);
This is a bit noisy. Can we just drop it?
> > + return devm_reset_controller_register(&pdev->dev, &reset->rcdev);
> > +}
> > +
> > +static int zx2967_reset_remove(struct platform_device *pdev)
> > +{
> > + return 0;
> > +}
Remove this function.
> > +static const struct of_device_id zx2967_reset_dt_ids[] = {
> > + { .compatible = "zte,zx296718-reset", },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
> > +
> > +static struct platform_driver zx2967_reset_driver = {
> > + .probe = zx2967_reset_probe,
> > + .remove = zx2967_reset_remove,
Remove the above line.
> > + .driver = {
> > + .name = "zx2967-reset",
> > + .of_match_table = zx2967_reset_dt_ids,
> > + },
> > +};
>
> This line can replace all below code if you do not have any other
> dependency in earlier stage.
>
> builtin_platform_driver(zx2967_reset_driver);
>
> > +
> > +static int __init zx2967_reset_init(void)
> > +{
> > + return platform_driver_register(&zx2967_reset_driver);
> > +}
> > +arch_initcall(zx2967_reset_init);
> > +
> > +static void __exit zx2967_reset_exit(void)
> > +{
> > + platform_driver_unregister(&zx2967_reset_driver);
> > +}
> > +module_exit(zx2967_reset_exit);
> > +
> > +MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
> > +MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
> > +MODULE_LICENSE("GPL");
> >
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture
2017-01-16 14:38 ` Philipp Zabel
(?)
(?)
@ 2017-01-17 0:49 ` Baoyou Xie
-1 siblings, 0 replies; 15+ messages in thread
From: Baoyou Xie @ 2017-01-17 0:49 UTC (permalink / raw)
To: Philipp Zabel
Cc: Jun Nie, Rob Herring, mark.rutland, linux-arm-kernel, devicetree,
Linux Kernel Mailing List, Shawn Guo, xie.baoyou, chen.chaokai,
wang.qiang01
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]
On 16 January 2017 at 22:38, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> On Mon, 2017-01-16 at 18:56 +0800, Baoyou Xie wrote:
> > Add the zx2967 reset controller driver as maintained by ARM ZTE
> > architecture maintainers, as they're parts of the core IP.
> >
> > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > ---
> > MAINTAINERS | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 2793808..08f8155 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -1980,10 +1980,12 @@ L: linux-arm-kernel@lists.infradead.org
> (moderated for non-subscribers)
> > S: Maintained
> > F: arch/arm/mach-zx/
> > F: drivers/clk/zte/
> > +F: drivers/reset/reset-zx2967.c
> > F: drivers/soc/zte/
> > F: drivers/thermal/zx*
> > F: Documentation/devicetree/bindings/arm/zte.txt
> > F: Documentation/devicetree/bindings/clock/zx296702-clk.txt
> > +F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
> > F: Documentation/devicetree/bindings/soc/zte/
> > F: Documentation/devicetree/bindings/thermal/zx*
> > F: include/dt-bindings/soc/zx*.h
>
> This patch doesn't apply on top of reset/next. I can rebase it, but it
> will cause a trivial merge conflict with the soc/thermal additions.
>
> I will send v3 patch, it base on linux/next branch and conflict without
the soc/thermal additions
> regards
> Philipp
>
>
[-- Attachment #2: Type: text/html, Size: 2339 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-01-17 0:49 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-16 10:56 [PATCH v2 1/3] dt: bindings: add documentation for zx2967 family reset controller Baoyou Xie
2017-01-16 10:56 ` Baoyou Xie
2017-01-16 10:56 ` [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture Baoyou Xie
2017-01-16 10:56 ` Baoyou Xie
2017-01-16 14:38 ` Philipp Zabel
2017-01-16 14:38 ` Philipp Zabel
2017-01-16 14:38 ` Philipp Zabel
2017-01-17 0:49 ` Baoyou Xie
2017-01-16 10:56 ` [PATCH v2 3/3] reset: zx2967: add reset controller driver for ZTE's zx2967 family Baoyou Xie
2017-01-16 10:56 ` Baoyou Xie
2017-01-16 14:28 ` Jun Nie
2017-01-16 14:28 ` Jun Nie
2017-01-16 14:43 ` Philipp Zabel
2017-01-16 14:43 ` Philipp Zabel
2017-01-16 14:43 ` Philipp Zabel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.