Reset controller API to reset IP modules on i.MX5 and i.MX6
Subsystems (6)
Philipp Zabel
maintainerv4 cover Reset controller API to reset IP modules on i.MX5 and i.MX6
[Added Len, Pavel, Rafael, and linux-pm to Cc, as there might be some
need for integration with the PM runtime infrastructure?]
The system reset controller (SRC) on i.MX51, i.MX53, and i.MX6q controls reset lines to the GPU, VPU, IPU, and OpenVG IP modules.
The following patches add a simple API for devices to request being reset by separate reset controller hardware and implements the reset signal device tree binding proposed by Stephen Warren. Contrary to Tegra hardware, the i.MX SRC contains self-deasserting reset registers, so I've included both ops to manually assert/deassert a reset line, as well as a "reset" operation that is supposed to assert the reset line and wait for it to deassert.
Also included is a GPIO reset controller driver that can handle reset lines of external ICs connected to GPIOs.
The i.MX SRC is enhanced to provide a reset controller and the IPU driver is made to request being reset by calling the device_reset(&pdev->dev) convenience wrapper during probing.
I'm not sure how integration with the PM runtime should look like, since there are quite different use cases for pulling a reset line. (Does the device need to be reset once, or to be reset every time it comes out of suspend? Or maybe the reset is just needed when the device gets stuck).
Changes since v3:
- Addressed Stephen's concerns, adding id translation functionality and the missing devm_put_reset_controller to the core,
- switched the gpio-reset driver's reset-delays property to microseconds and added an optional initially-in-reset property,
- and reworked the gpio-reset probe function to better handle requested GPIOs returning -EPROBE_DEFER.
regards
Philipp
--- .../devicetree/bindings/reset/fsl,imx-src.txt | 49 ++++ .../devicetree/bindings/reset/gpio-reset.txt | 37 +++ Documentation/devicetree/bindings/reset/reset.txt | 75 +++++ .../bindings/staging/imx-drm/fsl-imx-drm.txt | 3 + arch/arm/boot/dts/imx51.dtsi | 7 + arch/arm/boot/dts/imx53.dtsi | 7 + arch/arm/boot/dts/imx6q.dtsi | 1 + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- arch/arm/mach-imx/Kconfig | 3 + arch/arm/mach-imx/mm-imx5.c | 2 + arch/arm/mach-imx/src.c | 69 ++++- drivers/Kconfig | 2 + drivers/Makefile | 3 + drivers/reset/Kconfig | 26 ++ drivers/reset/Makefile | 2 + drivers/reset/core.c | 298 ++++++++++++++++++++ drivers/reset/gpio-reset.c | 208 ++++++++++++++ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 12 +- include/linux/reset-controller.h | 51 ++++ include/linux/reset.h | 17 ++ 20 files changed, 871 insertions(+), 5 deletions(-)
Philipp Zabel
maintainerPATCH v4 1/8 dt: describe base reset signal binding
From: Stephen Warren <[email protected]>
This binding is intended to represent the hardware reset signals present internally in most IC (SoC, FPGA, ...) designs.
It consists of a binding for a reset controller device (provider), and a pair of properties, "resets" and "reset-names", to link a device node (consumer) to its reset controller via phandle, similarly to the clock and interrupt bindings.
The reset controller has all information necessary to reset the consumer device. That could be provided via device tree, or it could be implemented in hardware.
The aim is to enable device drivers to request a framework API to issue a reset simply by providing their struct device pointer as the most common case.
--- Documentation/devicetree/bindings/reset/reset.txt | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/reset.txt
Documentation/devicetree/bindings/reset/reset.txt new file +75 -0
@@ -0,0 +1,75 @@ += Reset Signal Device Tree Bindings = + +This binding is intended to represent the hardware reset signals present +internally in most IC (SoC, FPGA, ...) designs. Reset signals for whole +standalone chips are most likely better represented as GPIOs, although there +are likely to be exceptions to this rule. + +Hardware blocks typically receive a reset signal. This signal is generated by +a reset provider (e.g. power management or clock module) and received by a +reset consumer (the module being reset, or a module managing when a sub- +ordinate module is reset). This binding exists to represent the provider and +consumer, and provide a way to couple the two together. + +A reset signal is represented by the phandle of the provider, plus a reset +specifier - a list of DT cells that represents the reset signal within the +provider. The length (number of cells) and semantics of the reset specifier +are dictated by the binding of the reset provider, although common schemes +are described below. + +A word on where to place reset signal consumers in device tree: It is possible +in hardware for a reset signal to affect multiple logically separate HW blocks +at once. In this case, it would be unwise to represent this reset signal in +the DT node of each affected HW block, since if activated, an unrelated block +may be reset. Instead, reset signals should be represented in the DT node +where it makes most sense to control it; this may be a bus node if all +children of the bus are affected by the reset signal, or an individual HW +block node for dedicated reset signals. The intent of this binding is to give +appropriate software access to the reset signals in order to manage the HW, +rather than to slavishly enumerate the reset signal that affects each HW +block. + += Reset providers = + +Required properties: +#reset-cells: Number of cells in a reset specifier; Typically 0 for nodes + with a single reset output and 1 for nodes with multiple + reset outputs. + +For example: + + rst: reset-controller { + #reset-cells = <1>; + }; + += Reset consumers = + +Required properties: +resets: List of phandle and reset specifier pairs, one pair + for each reset signal that affects the device, or that the + device manages. Note: if the reset provider specifies '0' for + #reset-cells, then only the phandle portion of the pair will + appear. + +Optional properties: +reset-names: List of reset signal name strings sorted in the same order as + the resets property. Consumers drivers will use reset-names to + match reset signal names with reset specifiers. + +For example: + + device { + resets = <&rst 20>; + reset-names = "reset"; + }; + +This represents a device with a single reset signal named "reset". + + bus { + resets = <&rst 10> <&rst 11> <&rst 12> <&rst 11>; + reset-names = "i2s1", "i2s2", "dma", "mixer"; + }; + +This represents a bus that controls the reset signal of each of four sub- +ordinate devices. Consider for example a bus that fails to operate unless no +child device has reset asserted.
Signature · 1 line
1.7.10.4
Philipp Zabel
maintainerPATCH v4 2/8 reset: Add reset controller API
In reply to Philipp ZabelThis adds a simple API for devices to request being reset by separate reset controller hardware and implements the reset signal device tree binding.
---
Changes since v3:
- Added of_xlate and nr_resets to reset_controller_dev, and of_reset_simple_xlate.
- Added devm_put_reset_controller.
- Put the rcdev owner module if rstc kzalloc fails.
--- drivers/Kconfig | 2 + drivers/Makefile | 3 + drivers/reset/Kconfig | 13 ++ drivers/reset/Makefile | 1 + drivers/reset/core.c | 298 ++++++++++++++++++++++++++++++++++++++ include/linux/reset-controller.h | 51 +++++++ include/linux/reset.h | 17 +++ 7 files changed, 385 insertions(+) create mode 100644 drivers/reset/Kconfig create mode 100644 drivers/reset/Makefile create mode 100644 drivers/reset/core.c create mode 100644 include/linux/reset-controller.h create mode 100644 include/linux/reset.h
drivers/Kconfig +2 -0
@@ -162,4 +162,6 @@ source "drivers/irqchip/Kconfig" source "drivers/ipack/Kconfig" +source "drivers/reset/Kconfig" + endmenu
drivers/Makefile +3 -0
@@ -42,6 +42,9 @@ ifndef CONFIG_ARCH_USES_GETTIMEOFFSET obj-y += clocksource/ endif +# reset controllers early, since gpu drivers might rely on them to initialize +obj-$(CONFIG_RESET_CONTROLLER) += reset/ + # tty/ comes before char/ so that the VT console is the boot-time # default. obj-y += tty/
drivers/reset/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +config ARCH_HAS_RESET_CONTROLLER + bool + +menuconfig RESET_CONTROLLER + bool "Reset Controller Support" + default y if ARCH_HAS_RESET_CONTROLLER + help + Generic Reset Controller support. + + This framework is designed to abstract reset handling of devices + via GPIOs or SoC-internal reset controller modules. + + If unsure, say no.
drivers/reset/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_RESET_CONTROLLER) += core.o
drivers/reset/core.c new file +298 -0
298 lines not on this page · raw message
include/linux/reset-controller.h new file +51 -0
51 lines not on this page · raw message
include/linux/reset.h new file +17 -0
@@ -0,0 +1,17 @@ +#ifndef _LINUX_RESET_H_ +#define _LINUX_RESET_H_ + +struct device ; +struct reset_control ; + +int reset_control_reset (struct reset_control *rstc); +int reset_control_assert (struct reset_control *rstc); +int reset_control_deassert (struct reset_control *rstc); + +struct reset_control *reset_control_get (struct device *dev,const char *id); +void reset_control_put (struct reset_control *rstc); +struct reset_control *devm_reset_control_get (struct device *dev,const char *id); + +int device_reset (struct device *dev); + +#endif
Signature · 1 line
1.7.10.4
PATCH v4 2/8 reset: Add reset controller API
drivers/reset/core.c line 50
Quoted 11 lines · Philipp Zabel
This adds a simple API for devices to request being reset by separate reset controller hardware and implements the reset signal device tree binding.
drivers/reset/core.c +5
-0+int of_reset_simple_xlate (struct reset_controller_dev *rcdev, +const struct of_phandle_args *reset_spec,u32 *flags) +{ +if (WARN_ON (reset_spec->args_count < rcdev->of_reset_n_cells)) +return -EINVAL ;
Would != make more sense than < ?
drivers/reset/core.c line 56
Quoted 6 lines
drivers/reset/core.c +6
-0+ +if (reset_spec->args[0 ] >= rcdev->nr_resets) +return -EINVAL ; + +if (flags) + *flags = reset_spec->args[1 ];
if (flags)
if (reset_spec->args_count > 1)
*flags = reset_spec->args[1];
else
*flags = 0;?
Quoted 1 line
+struct
reset_control*reset_control_get(struct device *dev, const char *id)
...
drivers/reset/core.c line 169
Quoted 9 lines
drivers/reset/core.c +9
-0+mutex_lock (&reset_controller_list_mutex); + rcdev =NULL ; +list_for_each_entry (r, &reset_controller_list, list) { +if (args.np == r->of_node) { + rcdev = r; +break ; + } + } +mutex_unlock (&reset_controller_list_mutex);
At this point, rcdev could be removed from that list, and perhaps even start to point at free'd memory.
drivers/reset/core.c line 179
Quoted 10 lines
drivers/reset/core.c +10
-0+of_node_put (args.np); + +if (!rcdev) +return ERR_PTR (-ENODEV ); + + rstc_id = rcdev->of_xlate (rcdev, &args,NULL ); +if (rstc_id <0 ) +return ERR_PTR (rstc_id); + +try_module_get (rcdev->owner);
What about error-handling here?
I think you want to drop reset_controller_list_mutex only after the call to try_module_get()?
drivers/reset/core.c line 249
Quoted 5 lines
drivers/reset/core.c +5
-0+static int devm_reset_control_match (struct device *dev,void *res,void *data) +{ +struct reset_control **rstc = res; +if (!rstc || !*rstc) { +WARN_ON (!rstc || !*rstc);
I think you can if (WARN_ON(...)).
I'm not sure if the error-checks are quite right though; reset_control_get always returns an error-pointer for errors, never NULL, so the pointer can't ever be NULL. If it somehow was (e.g. client usage error), then that NULL pointer would never match anything, so the error-check still wouldn't be useful.
I'm not sure why this is a ** here; below in devm_reset_control_put() you pass a just a *; are you expected to pass &rstc there instead?
Quoted 10 lines
drivers/reset/core.c +10
-0+void devm_reset_control_put (struct reset_control *rstc) +{ +int ret; + + ret =devres_release (rstc->dev, devm_reset_control_release, + devm_reset_control_match, rstc); +if (ret) +WARN_ON (ret); +} +EXPORT_SYMBOL_GPL (devm_reset_control_put);
Philipp Zabel
maintainerPATCH v4 2/8 reset: Add reset controller API
Hi Stephen,
Am Freitag, den 01.03.2013, 13:00 -0700 schrieb Stephen Warren:
Quoted 7 lines · Philipp Zabel
Quoted 5 lines
This adds a simple API for devices to request being reset by separate reset controller hardware and implements the reset signal device tree binding.
drivers/reset/core.c +0
-0
Quoted 7 lines
drivers/reset/core.c line 50
Quoted 5 lines
drivers/reset/core.c +5
-0+int of_reset_simple_xlate (struct reset_controller_dev *rcdev, +const struct of_phandle_args *reset_spec,u32 *flags) +{ +if (WARN_ON (reset_spec->args_count < rcdev->of_reset_n_cells)) +return -EINVAL ;Would != make more sense than < ?
I copied this from of_gpio_simple_xlate, because the parsing will work if args_count > of_reset_n_cells. In this case the device tree contains a #reset-cells larger than what the reset controller driver expects. Is this reason enough to assume the whole reset_spec is invalid?
Quoted 8 lines
drivers/reset/core.c line 56
Quoted 6 lines
drivers/reset/core.c +6
-0+ +if (reset_spec->args[0 ] >= rcdev->nr_resets) +return -EINVAL ; + +if (flags) + *flags = reset_spec->args[1 ];if (flags)
Quoted 6 lines
if (reset_spec->args_count > 1) *flags = reset_spec->args[1]; else *flags = 0;?
In gpiolib, of_get_named_gpio_flags clears the flags, so that the xlate implementations don't have to do it. The core doesn't use the flags, so this is not a problem. I don't see the need for of_get_named_reset_flags, since the reset consumer drivers shouldn't care for those. Maybe it would be better to remove the flags parameter from the xlate function altogether.
Quoted 14 lines
Quoted 1 line
+struct
reset_control*reset_control_get(struct device *dev, const char *id)...
drivers/reset/core.c line 169
Quoted 9 lines
drivers/reset/core.c +9
-0+mutex_lock (&reset_controller_list_mutex); + rcdev =NULL ; +list_for_each_entry (r, &reset_controller_list, list) { +if (args.np == r->of_node) { + rcdev = r; +break ; + } + } +mutex_unlock (&reset_controller_list_mutex);At this point, rcdev could be removed from that list, and perhaps even start to point at free'd memory.
I'll move the unlock down.
Quoted 13 lines
drivers/reset/core.c line 179
Quoted 10 lines
drivers/reset/core.c +10
-0+of_node_put (args.np); + +if (!rcdev) +return ERR_PTR (-ENODEV ); + + rstc_id = rcdev->of_xlate (rcdev, &args,NULL ); +if (rstc_id <0 ) +return ERR_PTR (rstc_id); + +try_module_get (rcdev->owner);What about error-handling here?
Quoted 2 lines
I think you want to drop
reset_controller_list_mutexonly after the call totry_module_get()?
I will.
Quoted 7 lines
drivers/reset/core.c line 249
Quoted 5 lines
drivers/reset/core.c +5
-0+static int devm_reset_control_match (struct device *dev,void *res,void *data) +{ +struct reset_control **rstc = res; +if (!rstc || !*rstc) { +WARN_ON (!rstc || !*rstc);I think you can if (
WARN_ON(...)).
Yes.
Quoted 5 lines
I'm not sure if the error-checks are quite right though;
reset_control_getalways returns an error-pointer for errors, never NULL, so the pointer can't ever be NULL. If it somehow was (e.g. client usage error), then that NULL pointer would never match anything, so the error-check still wouldn't be useful.
The void *res parameter of dr_match_t is given the data field of struct devres (dr->data) when called by devres_release. A few subsystems do the same check, so I figured there could be other devres managed resources that could have dr->data == NULL. Looking at devres.c again, this doesn't really seem to be the case. I'll drop it.
Quoted 2 lines
I'm not sure why this is a ** here; below in
devm_reset_control_put()you pass a just a *; are you expected to pass &rstc there instead?
dr->data is filled in and returned by devres_alloc in devm_reset_control_get and contains a struct reset_control **ptr. So that should be right, but ...
reset_control_get right now always allocates a new struct reset_control, instead of keeping them around in a list and just returning a new reference for already existing reset_controls, which kind of defeats the purpose of the above. The idea was that drivers sharing a reset line should also use the same struct reset_control.
thanks
Philipp
PATCH v4 2/8 reset: Add reset controller API
Quoted 18 lines · Philipp Zabel
Hi Stephen,
Am Freitag, den 01.03.2013, 13:00 -0700 schrieb Stephen Warren:
Quoted 7 lines · Philipp Zabel
Quoted 5 lines
This adds a simple API for devices to request being reset by separate reset controller hardware and implements the reset signal device tree binding.
drivers/reset/core.c +0
-0Quoted 7 lines
drivers/reset/core.c line 50
Quoted 5 lines
drivers/reset/core.c +5
-0+int of_reset_simple_xlate (struct reset_controller_dev *rcdev, +const struct of_phandle_args *reset_spec,u32 *flags) +{ +if (WARN_ON (reset_spec->args_count < rcdev->of_reset_n_cells)) +return -EINVAL ;Would != make more sense than < ?
Quoted 4 lines
I copied this from
of_gpio_simple_xlate, because the parsing will work ifargs_count>of_reset_n_cells. In this case the device tree contains a #reset-cells larger than what the reset controller driver expects. Is this reason enough to assume the wholereset_specis invalid?
Well, there's certainly something unexpected going on; what are those extra cells expected to mean? I'd tend to make that an error myself to avoid unexpected symptoms. I'd tend to want to make the same change to of_gpio_simple_xlate().
Quoted 13 lines
Quoted 13 lines
drivers/reset/core.c line 56
Quoted 6 lines
drivers/reset/core.c +6
-0+ +if (reset_spec->args[0 ] >= rcdev->nr_resets) +return -EINVAL ; + +if (flags) + *flags = reset_spec->args[1 ];if (flags)
if (reset_spec->args_count > 1) *flags = reset_spec->args[1]; else *flags = 0;
Quoted 8 lines
Quoted 1 line
?
In gpiolib,
of_get_named_gpio_flagsclears the flags, so that the xlate implementations don't have to do it. The core doesn't use the flags, so this is not a problem. I don't see the need forof_get_named_reset_flags, since the reset consumer drivers shouldn't care for those. Maybe it would be better to remove the flags parameter from the xlate function altogether.
Yes, since there are no flags, removing the parameter makes most sense.
Philipp Zabel
maintainerPATCH v4 3/8 ARM i.MX6q: Add GPU, VPU, IPU, and OpenVG resets to System Reset Controller (SRC)
In reply to Philipp ZabelThe SRC has auto-deasserting reset bits that control reset lines to the GPU, VPU, IPU, and OpenVG IP modules. This patch adds a reset controller that can be controlled by those devices using the reset controller API.
---
Changes since v3:
- Renamed imx_src_reset to imx_src_reset_module
- Set rcdev.nr_resets
--- .../devicetree/bindings/reset/fsl,imx-src.txt | 49 +++++++++++++++ arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/src.c | 65 ++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt
Documentation/devicetree/bindings/reset/fsl,imx-src.txt new file +49 -0
@@ -0,0 +1,49 @@ +Freescale i.MX System Reset Controller +====================================== + +Please also refer to reset.txt in this directory for common reset +controller binding usage. + +Required properties: +- compatible: Should be "fsl,<chip>-src" +- reg: should be register base and length as documented in the + datasheet +- interrupts: Should contain SRC interrupt and CPU WDOG interrupt, + in this order. +- #reset-cells: 1, see below + +example: + +src: src at 020d8000 { + compatible = "fsl,imx6q-src"; + reg = <0x020d8000 0x4000>; + interrupts = <0 91 0x04 0 96 0x04>; + #reset-cells = <1>; +}; + +Specifying reset lines connected to IP modules +============================================== + +The system reset controller can be used to reset the GPU, VPU, +IPU, and OpenVG IP modules on i.MX5 and i.MX6 ICs. Those device +nodes should specify the reset line on the SRC in their resets +property, containing a phandle to the SRC device node and a +RESET_INDEX specifying which module to reset, as described in +reset.txt + +example: + + ipu1: ipu at 02400000 { + resets = <&src 2>; + }; + ipu2: ipu at 02800000 { + resets = <&src 4>; + }; + +The following RESET_INDEX values are valid for i.MX5: +GPU_RESET 0 +VPU_RESET 1 +IPU1_RESET 2 +OPEN_VG_RESET 3 +The following additional RESET_INDEX value is valid for i.MX6: +IPU2_RESET 4
arch/arm/mach-imx/Kconfig +1 -0
@@ -73,6 +73,7 @@ config HAVE_IMX_MMDC config HAVE_IMX_SRC def_bool y if SMP + select ARCH_HAS_RESET_CONTROLLER config IMX_HAVE_IOMUX_V1 bool
arch/arm/mach-imx/src.c +65 -0
110 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v4 3/8 ARM i.MX6q: Add GPU, VPU, IPU, and OpenVG resets to System Reset Controller (SRC)
Quoted 9 lines · Philipp Zabel
The SRC has auto-deasserting reset bits that control reset lines to the GPU, VPU, IPU, and OpenVG IP modules. This patch adds a reset controller that can be controlled by those devices using the reset controller API.
Documentation/devicetree/bindings/reset/fsl,imx-src.txt +2
-0+Specifying reset lines connected to IP modules +==============================================
...
Documentation/devicetree/bindings/reset/fsl,imx-src.txt line 41
Quoted 8 lines
Documentation/devicetree/bindings/reset/fsl,imx-src.txt +8
-0+example: + + ipu1: ipu at 02400000 { + resets = <&src 2>; + }; + ipu2: ipu at 02800000 { + resets = <&src 4>; + };
reset-names is mandatory in the documentation and implementation; you should probably add them to the example too.
Nit: You could use BIT(x) instead of 1 << x in a few places in this file. But not a big deal.
PATCH v4 3/8 ARM i.MX6q: Add GPU, VPU, IPU, and OpenVG resets to System Reset Controller (SRC)
Quoted 11 lines · Stephen Warren
Quoted 9 lines · Philipp Zabel
The SRC has auto-deasserting reset bits that control reset lines to the GPU, VPU, IPU, and OpenVG IP modules. This patch adds a reset controller that can be controlled by those devices using the reset controller API.
Documentation/devicetree/bindings/reset/fsl,imx-src.txt +2
-0+Specifying reset lines connected to IP modules +==============================================...
Quoted 11 lines
Documentation/devicetree/bindings/reset/fsl,imx-src.txt line 41
Quoted 8 lines
Documentation/devicetree/bindings/reset/fsl,imx-src.txt +8
-0+example: + + ipu1: ipu at 02400000 { + resets = <&src 2>; + }; + ipu2: ipu at 02800000 { + resets = <&src 4>; + };reset-names is mandatory in the documentation and implementation; you should probably add them to the example too.
Oh, looking at the code further, I see reset-names is optional if the client node only has one reset defined. So ignore my comment above.
Philipp Zabel
maintainerPATCH v4 4/8 ARM i.MX6q: Link system reset controller (SRC) to IPU in DT
In reply to Philipp Zabel--- arch/arm/boot/dts/imx6q.dtsi | 1 + arch/arm/boot/dts/imx6qdl.dtsi | 2 ++ 2 files changed, 3 insertions(+)
arch/arm/boot/dts/imx6q.dtsi +1 -0
@@ -291,6 +291,7 @@ interrupts = <0 8 0x4 0 7 0x4>; clocks = <&clks 133>, <&clks 134>, <&clks 137>; clock-names = "bus", "di0", "di1"; + resets = <&src 4>; }; }; };
arch/arm/boot/dts/imx6qdl.dtsi +2 -0
@@ -516,6 +516,7 @@ compatible = "fsl,imx6q-src"; reg = <0x020d8000 0x4000>; interrupts = <0 91 0x04 0 96 0x04>; + #reset-cells = <1>; }; gpc: gpc at 020dc000 {
@@ -795,6 +796,7 @@ interrupts = <0 6 0x4 0 5 0x4>; clocks = <&clks 130>, <&clks 131>, <&clks 132>; clock-names = "bus", "di0", "di1"; + resets = <&src 2>; }; }; };
Signature · 1 line
1.7.10.4
Philipp Zabel
maintainerPATCH v4 5/8 staging: drm/imx: Use SRC to reset IPU
In reply to Philipp ZabelRequest the System Reset Controller to reset the IPU if specified via device tree phandle.
--- .../devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt | 3 +++ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +3 -0
@@ -8,6 +8,8 @@ Required properties: - interrupts: Should contain sync interrupt and error interrupt, in this order. - #crtc-cells: 1, See below +- resets: phandle pointing to the system reset controller and + reset line index, see reset/fsl,imx-src.txt for details example:
@@ -16,6 +18,7 @@ ipu: ipu at 18000000 { compatible = "fsl,imx53-ipu"; reg = <0x18000000 0x080000000>; interrupts = <11 10>; + resets = <&src 2>; }; Parallel display support
drivers/staging/imx-drm/ipu-v3/ipu-common.c +9 -3
@@ -16,6 +16,7 @@#include <linux/export.h> #include <linux/types.h> #include <linux/init.h> +#include <linux/reset.h> #include <linux/platform_device.h> #include <linux/err.h> #include <linux/spinlock.h>
@@ -660,7 +661,7 @@ int ipu_idmac_disable_channel(struct ipuv3_channel *channel) }EXPORT_SYMBOL_GPL (ipu_idmac_disable_channel); -static int ipu_reset (struct ipu_soc *ipu) +static int ipu_memory_reset (struct ipu_soc *ipu) {unsigned long timeout;
@@ -1104,7 +1105,12 @@ static int ipu_probe(struct platform_device *pdev)if (ret) goto out_failed_irq; - ret =ipu_reset (ipu); + ret =device_reset (&pdev->dev); +if (ret) { +dev_err (&pdev->dev,"failed to reset: %d\n" , ret); + goto out_failed_reset; + } + ret =ipu_memory_reset (ipu);if (ret) goto out_failed_reset;
@@ -1130,8 +1136,8 @@ static int ipu_probe(struct platform_device *pdev) failed_add_clients:ipu_submodules_exit (ipu); failed_submodules_init: -ipu_irq_exit (ipu); out_failed_reset: +ipu_irq_exit (ipu); out_failed_irq:clk_disable_unprepare (ipu->clk); failed_clk_get:
Signature · 1 line
1.7.10.4
Philipp Zabel
maintainerPATCH v4 6/8 ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53
In reply to Philipp ZabelThe SRC in i.MX51 and i.MX53 is similar to the one in i.MX6q minus the IPU2 reset line and multi core CPU reset/enable bits.
--- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/mach-imx/Kconfig | 2 ++ arch/arm/mach-imx/mm-imx5.c | 2 ++ arch/arm/mach-imx/src.c | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +1 -1
@@ -513,7 +513,7 @@ }; src: src at 020d8000 { - compatible = "fsl,imx6q-src"; + compatible = "fsl,imx6q-src", "fsl,imx51-src"; reg = <0x020d8000 0x4000>; interrupts = <0 91 0x04 0 96 0x04>; #reset-cells = <1>;
arch/arm/mach-imx/Kconfig +2 -0
@@ -166,6 +166,7 @@ config SOC_IMX51 bool select ARCH_MX5 select ARCH_MX51 + select HAVE_IMX_SRC select PINCTRL select PINCTRL_IMX51 select SOC_IMX5
@@ -793,6 +794,7 @@ config SOC_IMX53 select ARCH_MX5 select ARCH_MX53 select HAVE_CAN_FLEXCAN if CAN + select HAVE_IMX_SRC select IMX_HAVE_PLATFORM_IMX2_WDT select PINCTRL select PINCTRL_IMX53
arch/arm/mach-imx/mm-imx5.c +2 -0
@@ -84,6 +84,7 @@ void __init imx51_init_early(void)mxc_set_cpu_type (MXC_CPU_MX51 );mxc_iomux_v3_init (MX51_IO_ADDRESS (MX51_IOMUXC_BASE_ADDR ));mxc_arch_reset_init (MX51_IO_ADDRESS (MX51_WDOG1_BASE_ADDR )); +imx_src_init (); }void __init imx53_init_early (void )
@@ -91,6 +92,7 @@ void __init imx53_init_early(void)mxc_set_cpu_type (MXC_CPU_MX53 );mxc_iomux_v3_init (MX53_IO_ADDRESS (MX53_IOMUXC_BASE_ADDR ));mxc_arch_reset_init (MX53_IO_ADDRESS (MX53_WDOG1_BASE_ADDR )); +imx_src_init (); }void __init mx51_init_irq (void )
arch/arm/mach-imx/src.c +3 -1
@@ -121,7 +121,9 @@ void __init imx_src_init(void)struct device_node *np;u32 val; - np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6q-src" ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx51-src" ); +if (!np) +return ; src_base =of_iomap (np,0 );WARN_ON (!src_base);
Signature · 1 line
1.7.10.4
Philipp Zabel
maintainerPATCH v4 7/8 ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree
In reply to Philipp ZabelAlso, link SRC to IPU via phandle.
--- arch/arm/boot/dts/imx51.dtsi | 7 +++++++ arch/arm/boot/dts/imx53.dtsi | 7 +++++++ 2 files changed, 14 insertions(+)
arch/arm/boot/dts/imx51.dtsi +7 -0
@@ -67,6 +67,7 @@ compatible = "fsl,imx51-ipu"; reg = <0x40000000 0x20000000>; interrupts = <11 10>; + resets = <&src 2>; }; aips at 70000000 { /* AIPS1 */
@@ -501,6 +502,12 @@ status = "disabled"; }; + src: src at 73fd0000 { + compatible = "fsl,imx51-src"; + reg = <0x73fd0000 0x4000>; + #reset-cells = <1>; + }; + clks: ccm at 73fd4000{ compatible = "fsl,imx51-ccm"; reg = <0x73fd4000 0x4000>;
arch/arm/boot/dts/imx53.dtsi +7 -0
@@ -72,6 +72,7 @@ compatible = "fsl,imx53-ipu"; reg = <0x18000000 0x080000000>; interrupts = <11 10>; + resets = <&src 2>; }; aips at 50000000 { /* AIPS1 */
@@ -558,6 +559,12 @@ status = "disabled"; }; + src: src at 53fd0000 { + compatible = "fsl,imx53-src", "fsl,imx51-src"; + reg = <0x53fd0000 0x4000>; + #reset-cells = <1>; + }; + clks: ccm at 53fd4000{ compatible = "fsl,imx53-ccm"; reg = <0x53fd4000 0x4000>;
Signature · 1 line
1.7.10.4
Philipp Zabel
maintainerPATCH v4 8/8 reset: Add driver for gpio-controlled reset pins
In reply to Philipp ZabelThis driver implements a reset controller device that toggles gpios connected to reset pins of peripheral ICs. The delay between assertion and de-assertion of the reset signal can be configured.
---
Changes since v3:
- Switched reset-delays property from milliseconds to microseconds and declared it optional.
- Added initially-in-reset property.
- Handle of_get_named_gpio_flags returning EPROBE_DEFER silently.
- Store bool active_low instead of gpio flags in struct reset_gpio.
- Moved delay out of struct gpio_reset into its own array.
- Use rcdev.nr_resets instead of nr_gpios to keep a count of array elements.
- Let gpio_reset_set take struct reset_controller_dev directly, simplifying gpio_reset_assert and gpio_reset_deassert.
- First call of_get_named_gpio_flags on all gpios to determine if any return EPROBE_DEFER - only then parse the reset-delays and initially-in-reset properties, finally request the gpios.
- Add MODULE_* annotation
--- .../devicetree/bindings/reset/gpio-reset.txt | 37 ++++ drivers/reset/Kconfig | 13 ++ drivers/reset/Makefile | 1 + drivers/reset/gpio-reset.c | 208 ++++++++++++++++++++ 4 files changed, 259 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/gpio-reset.txt create mode 100644 drivers/reset/gpio-reset.c
Documentation/devicetree/bindings/reset/gpio-reset.txt new file +37 -0
@@ -0,0 +1,37 @@ +GPIO reset controller +===================== + +A GPIO reset controller controls a number of GPIOs that are connected +to reset pins of peripheral ICs. + +Please also refer to reset.txt in this directory for common reset +controller binding usage. + +Required properties: +- compatible: Should be "gpio-reset" +- reset-gpios: List of gpios used as reset lines. The gpio specifier for this + property depends on the gpio controller that provides the gpio. +- #reset-cells: 1, see below + +Optional properties: +- reset-delays: List of delays in microseconds. The corresponding gpio reset + line should be asserted for this duration to reset. +- initially-in-reset: List of integers. Zero if the initial state should be + a deasserted reset line, nonzero if the line should be + kept in reset. + +example: + +gpio_reset: gpio-reset { + compatible = "gpio-reset"; + reset-gpios = <&gpio5 0 1>; /* active-low */ + reset-delays = <10000>; /* 10 ms */ + initially-in-reset: <1>; + #reset-cells = <1>; +}; + +/* Device with nRESET pin connected to GPIO5_0 */ +sii902x at 39 { + /* ... */ + resets = <&gpio_reset 0>; /* active-low GPIO5_0, 10 ms reset delay */ +};
drivers/reset/Kconfig +13 -0
@@ -11,3 +11,16 @@ menuconfig RESET_CONTROLLER via GPIOs or SoC-internal reset controller modules. If unsure, say no. + +if RESET_CONTROLLER + +config RESET_GPIO + tristate "GPIO reset controller support" + depends on GENERIC_GPIO + help + This driver provides support for reset lines that are controlled + directly by GPIOs. + The delay between assertion and de-assertion of the reset signal + can be configured. + +endif
drivers/reset/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_RESET_CONTROLLER) += core.o +obj-$(CONFIG_RESET_GPIO) += gpio-reset.o
drivers/reset/gpio-reset.c new file +208 -0
208 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v4 8/8 reset: Add driver for gpio-controlled reset pins
Quoted 3 lines · Philipp Zabel
This driver implements a reset controller device that toggles gpios connected to reset pins of peripheral ICs. The delay between assertion and de-assertion of the reset signal can be configured.
Fabio Estevam
reviewerPATCH v4 8/8 reset: Add driver for gpio-controlled reset pins
In reply to Philipp ZabelQuoted 5 lines · Philipp Zabel
This driver implements a reset controller device that toggles gpios connected to reset pins of peripheral ICs. The delay between assertion and de-assertion of the reset signal can be configured.
Signed-off-by Philipp Zabel <[email protected]>
Looks good and it is a very useful binding.
Will anyone apply this?
Thanks,
Fabio Estevam
Philipp Zabel
maintainerPATCH v4 8/8 reset: Add driver for gpio-controlled reset pins
Hi Fabio,
Am Montag, den 27.05.2013, 13:25 -0300 schrieb Fabio Estevam:
Quoted 10 lines · Philipp Zabel
Quoted 5 lines
This driver implements a reset controller device that toggles gpios connected to reset pins of peripheral ICs. The delay between assertion and de-assertion of the reset signal can be configured.
Signed-off-by Philipp Zabel <[email protected]>Looks good and it is a very useful binding.
Will anyone apply this?
I have tried to address Olof's concerns by making the gpio-reset driver only handle a single gpio per device.
I'll send a new patch for review.
regards
Philipp