aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/reset-controller.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-18 16:14:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-18 16:14:02 -0400
commit4a5219edcdae52bfb5eea0dfc2a7bd575961dad7 (patch)
tree863f6efeac5fe9ba4f1f8d23b32b2947130ed510 /include/linux/reset-controller.h
parent9797f6b0504122e4ad9ff047a3d0521ad6706386 (diff)
parent5420f9fd159761b88978c312c3b350546f8615bb (diff)
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Arnd Bergmann: "Driver updates for ARM SoCs, these contain various things that touch the drivers/ directory but got merged through arm-soc for practical reasons. For the most part, this is now related to power management controllers, which have not yet been abstracted into a separate subsystem, and typically require some code in drivers/soc or arch/arm to control the power domains. Another large chunk here is a rework of the NVIDIA Tegra USB3.0 support, which was surprisingly tricky and took a long time to get done. Finally, reset controller handling as always gets merged through here as well" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits) arm-ccn: Enable building as module soc/tegra: pmc: Add generic PM domain support usb: xhci: tegra: Add Tegra210 support usb: xhci: Add NVIDIA Tegra XUSB controller driver dt-bindings: usb: xhci-tegra: Add Tegra210 XUSB controller support dt-bindings: usb: Add NVIDIA Tegra XUSB controller binding PCI: tegra: Support per-lane PHYs dt-bindings: pci: tegra: Update for per-lane PHYs phy: tegra: Add Tegra210 support phy: Add Tegra XUSB pad controller support dt-bindings: phy: tegra-xusb-padctl: Add Tegra210 support dt-bindings: phy: Add NVIDIA Tegra XUSB pad controller binding phy: core: Allow children node to be overridden clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs drivers: firmware: psci: make two helper functions inline soc: renesas: rcar-sysc: Add support for R-Car H3 power areas soc: renesas: rcar-sysc: Add support for R-Car E2 power areas soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas soc: renesas: rcar-sysc: Add support for R-Car H2 power areas ...
Diffstat (limited to 'include/linux/reset-controller.h')
-rw-r--r--include/linux/reset-controller.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h
index a3a5bcdb1d02..b91ba932bbd4 100644
--- a/include/linux/reset-controller.h
+++ b/include/linux/reset-controller.h
@@ -31,6 +31,7 @@ struct of_phandle_args;
31 * @ops: a pointer to device specific struct reset_control_ops 31 * @ops: a pointer to device specific struct reset_control_ops
32 * @owner: kernel module of the reset controller driver 32 * @owner: kernel module of the reset controller driver
33 * @list: internal list of reset controller devices 33 * @list: internal list of reset controller devices
34 * @reset_control_head: head of internal list of requested reset controls
34 * @of_node: corresponding device tree node as phandle target 35 * @of_node: corresponding device tree node as phandle target
35 * @of_reset_n_cells: number of cells in reset line specifiers 36 * @of_reset_n_cells: number of cells in reset line specifiers
36 * @of_xlate: translation function to translate from specifier as found in the 37 * @of_xlate: translation function to translate from specifier as found in the
@@ -41,6 +42,7 @@ struct reset_controller_dev {
41 const struct reset_control_ops *ops; 42 const struct reset_control_ops *ops;
42 struct module *owner; 43 struct module *owner;
43 struct list_head list; 44 struct list_head list;
45 struct list_head reset_control_head;
44 struct device_node *of_node; 46 struct device_node *of_node;
45 int of_reset_n_cells; 47 int of_reset_n_cells;
46 int (*of_xlate)(struct reset_controller_dev *rcdev, 48 int (*of_xlate)(struct reset_controller_dev *rcdev,