aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/reset/reset-ath79.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-09 13:01:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-09 13:01:15 -0400
commit0160e00ae8e987be8822745fb166aa76451c9bcc (patch)
treedeca2d09a729155ed0cb631f2bc8f557e634ab06 /drivers/reset/reset-ath79.c
parentc81ee18e97e4e3162169a749eb7f2b79b3510c7a (diff)
parentb6942b68f85ed3161c91741791ec6f1779574919 (diff)
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Olof Johansson: "Driver updates for ARM SoCs: Reset subsystem, merged through arm-soc by tradition: - Make bool drivers explicitly non-modular - New support for i.MX7 and Arria10 reset controllers PATA driver for Palmchip BK371 (acked by Tejun) Power domain drivers for i.MX (GPC, GPCv2) - Moved out of mach-imx for GPC - Bunch of tweaks, fixes, etc PMC support for Tegra186 SoC detection support for Renesas RZ/G1H and RZ/G1N Move Tegra flow controller driver from mach directory to drivers/soc - (Power management / CPU power driver) Misc smaller tweaks for other platforms" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits) soc: pm-domain: Fix the mangled urls soc: renesas: rcar-sysc: Add support for R-Car H3 ES2.0 soc: renesas: rcar-sysc: Add support for fixing up power area tables soc: renesas: Register SoC device early soc: imx: gpc: add workaround for i.MX6QP to the GPC PD driver dt-bindings: imx-gpc: add i.MX6 QuadPlus compatible soc: imx: gpc: add defines for domain index soc: imx: Add GPCv2 power gating driver dt-bindings: Add GPCv2 power gating driver ARM/clk: move the ICST library to drivers/clk ARM: plat-versatile: remove stale clock header ARM: keystone: Drop PM domain support for k2g soc: ti: Add ti_sci_pm_domains driver dt-bindings: Add TI SCI PM Domains PM / Domains: Do not check if simple providers have phandle cells PM / Domains: Add generic data pointer to genpd data struct soc/tegra: Add initial flowctrl support for Tegra132/210 soc/tegra: flowctrl: Add basic platform driver soc/tegra: Move Tegra flowctrl driver ARM: tegra: Remove unnecessary inclusion of flowctrl header ...
Diffstat (limited to 'drivers/reset/reset-ath79.c')
-rw-r--r--drivers/reset/reset-ath79.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/reset/reset-ath79.c b/drivers/reset/reset-ath79.c
index 6b97631f5489..2674880e5492 100644
--- a/drivers/reset/reset-ath79.c
+++ b/drivers/reset/reset-ath79.c
@@ -1,4 +1,7 @@
1/* 1/*
2 * AR71xx Reset Controller Driver
3 * Author: Alban Bedel
4 *
2 * Copyright (C) 2015 Alban Bedel <albeu@free.fr> 5 * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
3 * 6 *
4 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
@@ -13,7 +16,7 @@
13 */ 16 */
14 17
15#include <linux/io.h> 18#include <linux/io.h>
16#include <linux/module.h> 19#include <linux/init.h>
17#include <linux/platform_device.h> 20#include <linux/platform_device.h>
18#include <linux/reset-controller.h> 21#include <linux/reset-controller.h>
19#include <linux/reboot.h> 22#include <linux/reboot.h>
@@ -127,31 +130,17 @@ static int ath79_reset_probe(struct platform_device *pdev)
127 return 0; 130 return 0;
128} 131}
129 132
130static int ath79_reset_remove(struct platform_device *pdev)
131{
132 struct ath79_reset *ath79_reset = platform_get_drvdata(pdev);
133
134 unregister_restart_handler(&ath79_reset->restart_nb);
135
136 return 0;
137}
138
139static const struct of_device_id ath79_reset_dt_ids[] = { 133static const struct of_device_id ath79_reset_dt_ids[] = {
140 { .compatible = "qca,ar7100-reset", }, 134 { .compatible = "qca,ar7100-reset", },
141 { }, 135 { },
142}; 136};
143MODULE_DEVICE_TABLE(of, ath79_reset_dt_ids);
144 137
145static struct platform_driver ath79_reset_driver = { 138static struct platform_driver ath79_reset_driver = {
146 .probe = ath79_reset_probe, 139 .probe = ath79_reset_probe,
147 .remove = ath79_reset_remove,
148 .driver = { 140 .driver = {
149 .name = "ath79-reset", 141 .name = "ath79-reset",
150 .of_match_table = ath79_reset_dt_ids, 142 .of_match_table = ath79_reset_dt_ids,
143 .suppress_bind_attrs = true,
151 }, 144 },
152}; 145};
153module_platform_driver(ath79_reset_driver); 146builtin_platform_driver(ath79_reset_driver);
154
155MODULE_AUTHOR("Alban Bedel <albeu@free.fr>");
156MODULE_DESCRIPTION("AR71xx Reset Controller Driver");
157MODULE_LICENSE("GPL");