diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-04-06 13:38:08 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-04-06 13:38:08 -0700 |
| commit | b44c4ddf4a15c42a91a88aaa32b7d53cf43391cb (patch) | |
| tree | 04dbcb069c73c3c1fd82d177c50f44fac75beff1 /drivers/clk | |
| parent | a339bdf64a7c41a6c88cc7da2eb432c876d5ce19 (diff) | |
| parent | 5ced1923128470bda20d454cc6b07a8aa2f2e64d (diff) | |
Merge branch 'clk-davinci' into clk-next
* clk-davinci:
clk: davinci: add a reset lookup table for psc0
reset: modify the way reset lookup works for board files
reset: add support for non-DT systems
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/davinci/psc-da850.c | 7 | ||||
| -rw-r--r-- | drivers/clk/davinci/psc.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/davinci/psc-da850.c b/drivers/clk/davinci/psc-da850.c index ccc7eb17bf3a..d196dcbed560 100644 --- a/drivers/clk/davinci/psc-da850.c +++ b/drivers/clk/davinci/psc-da850.c @@ -6,6 +6,7 @@ */ #include <linux/clk-provider.h> +#include <linux/reset-controller.h> #include <linux/clk.h> #include <linux/clkdev.h> #include <linux/init.h> @@ -66,8 +67,14 @@ LPSC_CLKDEV3(ecap_clkdev, "fck", "ecap.0", "fck", "ecap.1", "fck", "ecap.2"); +static struct reset_control_lookup da850_psc0_reset_lookup_table[] = { + RESET_LOOKUP("da850-psc0", 15, "davinci-rproc.0", NULL), +}; + static int da850_psc0_init(struct device *dev, void __iomem *base) { + reset_controller_add_lookup(da850_psc0_reset_lookup_table, + ARRAY_SIZE(da850_psc0_reset_lookup_table)); return davinci_psc_register_clocks(dev, da850_psc0_info, 16, base); } diff --git a/drivers/clk/davinci/psc.c b/drivers/clk/davinci/psc.c index ff6f4a038e04..ce170e600f09 100644 --- a/drivers/clk/davinci/psc.c +++ b/drivers/clk/davinci/psc.c @@ -425,6 +425,7 @@ __davinci_psc_register_clocks(struct device *dev, psc->rcdev.ops = &davinci_psc_reset_ops; psc->rcdev.owner = THIS_MODULE; + psc->rcdev.dev = dev; psc->rcdev.of_node = dev->of_node; psc->rcdev.of_reset_n_cells = 1; psc->rcdev.of_xlate = davinci_psc_reset_of_xlate; |