From: Laurentiu Mihalcea <[email protected]>
i.MX8ULP's SIM (System Integration Module) allows
control and configuration of certain components
form the domain it's assigned to. Add DT node
and schema for it. Its child shall also be
included.
---
Changes in v2:
- Reset controller is now also a syscon provider.
- Changed vendor prefix to nxp.
- Link to v1: https://lore.kernel.org/all/[email protected]/
---
Laurentiu Mihalcea (3):
dt-bindings: reset: add schema for imx8ulp SIM reset
reset: add driver for imx8ulp SIM reset controller
arm64: dts: imx8ulp: add AVD-SIM node
.../bindings/reset/nxp,imx8ulp-sim-reset.yaml | 68 ++++++++++++
arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 13 +++
drivers/reset/Kconfig | 7 ++
drivers/reset/Makefile | 1 +
drivers/reset/reset-imx8ulp-sim.c | 103 ++++++++++++++++++
include/dt-bindings/reset/imx8ulp-sim-reset.h | 16 +++
6 files changed, 208 insertions(+)
create mode 100644 Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
create mode 100644 drivers/reset/reset-imx8ulp-sim.c
create mode 100644 include/dt-bindings/reset/imx8ulp-sim-reset.h
---
base-commit: fec32ea96dd90bf0af97e001f380d4a240013aa0
From: Laurentiu Mihalcea <[email protected]>
Add schema for imx8ulp's SIM reset controller.
Signed-off-by: Liu Ying <[email protected]>
Signed-off-by: Laurentiu Mihalcea <[email protected]>
---
.../bindings/reset/nxp,imx8ulp-sim-reset.yaml | 68 +++++++++++++++++++
1 file changed, 68 insertions(+)
create mode 100644 Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
diff --git a/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml b/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
new file mode 100644
index 000000000000..e7faec55ff36
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/reset/nxp,imx8ulp-sim-reset.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP i.MX8ULP System Integration Module Reset Controller
+
+maintainers:
+ - Liu Ying <[email protected]>
+
+description: |
+ Some instances of i.MX8ULP's SIM may offer control
+ over the reset of some components of a certain domain
+ (e.g: AVD-SIM).
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - nxp,imx8ulp-avd-sim-reset
+ - const: syscon
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ '#reset-cells':
+ const: 1
+
+ mux-controller:
+ $ref: ../mux/reg-mux.yaml
+
+required:
+ - compatible
+ - reg
+ - '#reset-cells'
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: nxp,imx8ulp-avd-sim-reset
+ then:
+ required:
+ - mux-controller
+ - clocks
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/imx8ulp-clock.h>
+ syscon@2da50000 {
+ compatible = "nxp,imx8ulp-avd-sim-reset", "syscon";
+ reg = <0x2da50000 0x38>;
+ clocks = <&pcc5 IMX8ULP_CLK_AVD_SIM>;
+ #reset-cells = <1>;
+
+ mux-controller {
+ compatible = "mmio-mux";
+ #mux-control-cells = <1>;
+ mux-reg-masks = <0x8 0x00000200>;
+ };
+ };
--
2.34.1
From: Laurentiu Mihalcea <[email protected]>
Certain components can be reset via the SIM module.
Add reset controller driver for the SIM module to
allow drivers for said components to control the
reset signal(s).
Signed-off-by: Liu Ying <[email protected]>
Signed-off-by: Laurentiu Mihalcea <[email protected]>
---
drivers/reset/Kconfig | 7 ++
drivers/reset/Makefile | 1 +
drivers/reset/reset-imx8ulp-sim.c | 103 ++++++++++++++++++
include/dt-bindings/reset/imx8ulp-sim-reset.h | 16 +++
4 files changed, 127 insertions(+)
create mode 100644 drivers/reset/reset-imx8ulp-sim.c
create mode 100644 include/dt-bindings/reset/imx8ulp-sim-reset.h
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 7112f5932609..9b3574a4f1c6 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -91,6 +91,13 @@ config RESET_IMX7
help
This enables the reset controller driver for i.MX7 SoCs.
+config RESET_IMX8ULP_SIM
+ tristate "i.MX8ULP SIM Reset Driver"
+ depends on ARCH_MXC
+ help
+ This enables the SIM (System Integration Module) reset driver
+ for i.MX8ULP SoC.
+
config RESET_INTEL_GW
bool "Intel Reset Controller Driver"
depends on X86 || COMPILE_TEST
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index fd8b49fa46fc..f257d6a41f1e 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -42,3 +42,4 @@ obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o
obj-$(CONFIG_RESET_UNIPHIER_GLUE) += reset-uniphier-glue.o
obj-$(CONFIG_RESET_ZYNQ) += reset-zynq.o
obj-$(CONFIG_ARCH_ZYNQMP) += reset-zynqmp.o
+obj-$(CONFIG_RESET_IMX8ULP_SIM) += reset-imx8ulp-sim.o
diff --git a/drivers/reset/reset-imx8ulp-sim.c b/drivers/reset/reset-imx8ulp-sim.c
new file mode 100644
index 000000000000..d1b9511a5c6a
--- /dev/null
+++ b/drivers/reset/reset-imx8ulp-sim.c
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/*
+ * Copyright 2024 NXP
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset-controller.h>
+#include <dt-bindings/reset/imx8ulp-sim-reset.h>
+#include <linux/of_platform.h>
+
+#define AVD_SIM_SYSCTRL0 0x8
+
+struct imx8ulp_sim_reset {
+ struct reset_controller_dev rcdev;
+ struct regmap *regmap;
+};
+
+static const u32 imx8ulp_sim_reset_bits[IMX8ULP_SIM_RESET_NUM] = {
+ [IMX8ULP_SIM_RESET_MIPI_DSI_RST_DPI_N] = BIT(3),
+ [IMX8ULP_SIM_RESET_MIPI_DSI_RST_ESC_N] = BIT(4),
+ [IMX8ULP_SIM_RESET_MIPI_DSI_RST_BYTE_N] = BIT(5),
+};
+
+static inline struct imx8ulp_sim_reset *
+to_imx8ulp_sim_reset(struct reset_controller_dev *rcdev)
+{
+ return container_of(rcdev, struct imx8ulp_sim_reset, rcdev);
+}
+
+static int imx8ulp_sim_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ struct imx8ulp_sim_reset *simr = to_imx8ulp_sim_reset(rcdev);
+ const u32 bit = imx8ulp_sim_reset_bits[id];
+
+ return regmap_update_bits(simr->regmap, AVD_SIM_SYSCTRL0, bit, 0);
+}
+
+static int imx8ulp_sim_reset_deassert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ struct imx8ulp_sim_reset *simr = to_imx8ulp_sim_reset(rcdev);
+ const u32 bit = imx8ulp_sim_reset_bits[id];
+
+ return regmap_update_bits(simr->regmap, AVD_SIM_SYSCTRL0, bit, bit);
+}
+
+static const struct reset_control_ops imx8ulp_sim_reset_ops = {
+ .assert = imx8ulp_sim_reset_assert,
+ .deassert = imx8ulp_sim_reset_deassert,
+};
+
+static const struct of_device_id imx8ulp_sim_reset_dt_ids[] = {
+ { .compatible = "nxp,imx8ulp-avd-sim-reset", },
+ { /* sentinel */ },
+};
+
+static int imx8ulp_sim_reset_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct imx8ulp_sim_reset *simr;
+ int ret;
+
+ simr = devm_kzalloc(dev, sizeof(*simr), GFP_KERNEL);
+ if (!simr)
+ return -ENOMEM;
+
+ simr->regmap = syscon_node_to_regmap(dev->of_node);
+ if (IS_ERR(simr->regmap)) {
+ ret = PTR_ERR(simr->regmap);
+ dev_err(dev, "failed to get regmap: %d\n", ret);
+ return ret;
+ }
+
+ simr->rcdev.owner = THIS_MODULE;
+ simr->rcdev.nr_resets = IMX8ULP_SIM_RESET_NUM;
+ simr->rcdev.ops = &imx8ulp_sim_reset_ops;
+ simr->rcdev.of_node = dev->of_node;
+
+ ret = devm_of_platform_populate(dev);
+ if (ret)
+ return ret;
+
+ return devm_reset_controller_register(dev, &simr->rcdev);
+}
+
+static struct platform_driver imx8ulp_sim_reset_driver = {
+ .probe = imx8ulp_sim_reset_probe,
+ .driver = {
+ .name = KBUILD_MODNAME,
+ .of_match_table = imx8ulp_sim_reset_dt_ids,
+ },
+};
+module_platform_driver(imx8ulp_sim_reset_driver);
+
+MODULE_AUTHOR("Liu Ying <[email protected]>");
+MODULE_DESCRIPTION("NXP i.MX8ULP System Integration Module Reset driver");
+MODULE_LICENSE("GPL");
diff --git a/include/dt-bindings/reset/imx8ulp-sim-reset.h b/include/dt-bindings/reset/imx8ulp-sim-reset.h
new file mode 100644
index 000000000000..9f8fb8680a5e
--- /dev/null
+++ b/include/dt-bindings/reset/imx8ulp-sim-reset.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
+
+/*
+ * Copyright 2024 NXP
+ */
+
+#ifndef DT_BINDINGS_RESET_IMX8ULP_SIM_H
+#define DT_BINDINGS_RESET_IMX8ULP_SIM_H
+
+#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_DPI_N 0
+#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_ESC_N 1
+#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_BYTE_N 2
+
+#define IMX8ULP_SIM_RESET_NUM 3
+
+#endif /* DT_BINDINGS_RESET_IMX8ULP_SIM_H */
--
2.34.1
From: Laurentiu Mihalcea <[email protected]>
Add node for imx8ulp's AVD-SIM module. This also
includes its children.
Signed-off-by: Liu Ying <[email protected]>
Signed-off-by: Laurentiu Mihalcea <[email protected]>
---
arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
index e32d5afcf4a9..1ffa4da23042 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
@@ -614,6 +614,19 @@ per_bridge5: bus@2d800000 {
#size-cells = <1>;
ranges;
+ avd_sim: syscon@2da50000 {
+ compatible = "nxp,imx8ulp-avd-sim-reset", "syscon";
+ reg = <0x2da50000 0x38>;
+ clocks = <&pcc5 IMX8ULP_CLK_AVD_SIM>;
+ #reset-cells = <1>;
+
+ mux: mux-controller {
+ compatible = "mmio-mux";
+ #mux-control-cells = <1>;
+ mux-reg-masks = <0x8 0x00000200>;
+ };
+ };
+
cgc2: clock-controller@2da60000 {
compatible = "fsl,imx8ulp-cgc2";
reg = <0x2da60000 0x10000>;
--
2.34.1
On 09/06/2024 14:58, Laurentiu Mihalcea wrote:
> From: Laurentiu Mihalcea <[email protected]>
>
> Add schema for imx8ulp's SIM reset controller.
>
> Signed-off-by: Liu Ying <[email protected]>
> Signed-off-by: Laurentiu Mihalcea <[email protected]>
> ---
> .../bindings/reset/nxp,imx8ulp-sim-reset.yaml | 68 +++++++++++++++++++
> 1 file changed, 68 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
>
> diff --git a/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml b/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
> new file mode 100644
> index 000000000000..e7faec55ff36
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/reset/nxp,imx8ulp-sim-reset.yaml
Use compatible as filename.
> @@ -0,0 +1,68 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/reset/nxp,imx8ulp-sim-reset.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: NXP i.MX8ULP System Integration Module Reset Controller
> +
> +maintainers:
> + - Liu Ying <[email protected]>
> +
> +description: |
Do not need '|' unless you need to preserve formatting.
> + Some instances of i.MX8ULP's SIM may offer control
> + over the reset of some components of a certain domain
> + (e.g: AVD-SIM).
> +
> +properties:
> + compatible:
> + items:
> + - enum:
> + - nxp,imx8ulp-avd-sim-reset
> + - const: syscon
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> + '#reset-cells':
> + const: 1
> +
> + mux-controller:
> + $ref: ../mux/reg-mux.yaml
Full path, so /schemas/mux/reg-mux.yaml#
> +
> +required:
> + - compatible
> + - reg
> + - '#reset-cells'
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: nxp,imx8ulp-avd-sim-reset
> + then:
> + required:
> + - mux-controller
> + - clocks
This does not make much sense. You do not have other variants.
> +
> +additionalProperties: false
Best regards,
Krzysztof
On 09/06/2024 14:59, Laurentiu Mihalcea wrote:
> From: Laurentiu Mihalcea <[email protected]>
>
> Certain components can be reset via the SIM module.
> Add reset controller driver for the SIM module to
> allow drivers for said components to control the
> reset signal(s).
>
> Signed-off-by: Liu Ying <[email protected]>
> Signed-off-by: Laurentiu Mihalcea <[email protected]>
> ---
> drivers/reset/Kconfig | 7 ++
> drivers/reset/Makefile | 1 +
> drivers/reset/reset-imx8ulp-sim.c | 103 ++++++++++++++++++
> include/dt-bindings/reset/imx8ulp-sim-reset.h | 16 +++
That's a binding, not driver. Keep it *always* with binding.
> 4 files changed, 127 insertions(+)
> create mode 100644 drivers/reset/reset-imx8ulp-sim.c
> create mode 100644 include/dt-bindings/reset/imx8ulp-sim-reset.h
>
> +static int imx8ulp_sim_reset_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct imx8ulp_sim_reset *simr;
> + int ret;
> +
> + simr = devm_kzalloc(dev, sizeof(*simr), GFP_KERNEL);
> + if (!simr)
> + return -ENOMEM;
> +
> + simr->regmap = syscon_node_to_regmap(dev->of_node);
> + if (IS_ERR(simr->regmap)) {
> + ret = PTR_ERR(simr->regmap);
> + dev_err(dev, "failed to get regmap: %d\n", ret);
> + return ret;
syntax is return dev_err_probe()
> + }
> +
> +MODULE_AUTHOR("Liu Ying <[email protected]>");
> +MODULE_DESCRIPTION("NXP i.MX8ULP System Integration Module Reset driver");
> +MODULE_LICENSE("GPL");
> diff --git a/include/dt-bindings/reset/imx8ulp-sim-reset.h b/include/dt-bindings/reset/imx8ulp-sim-reset.h
> new file mode 100644
> index 000000000000..9f8fb8680a5e
> --- /dev/null
> +++ b/include/dt-bindings/reset/imx8ulp-sim-reset.h
> @@ -0,0 +1,16 @@
> +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
> +
> +/*
> + * Copyright 2024 NXP
> + */
> +
> +#ifndef DT_BINDINGS_RESET_IMX8ULP_SIM_H
> +#define DT_BINDINGS_RESET_IMX8ULP_SIM_H
> +
> +#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_DPI_N 0
> +#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_ESC_N 1
> +#define IMX8ULP_SIM_RESET_MIPI_DSI_RST_BYTE_N 2
> +
> +#define IMX8ULP_SIM_RESET_NUM 3
Drop, not suitable for bindings.
> +
> +#endif /* DT_BINDINGS_RESET_IMX8ULP_SIM_H */
Best regards,
Krzysztof