瀏覽代碼

clk: davinci: add a reset lookup table for psc0

In order to be able to use the reset framework in legacy boot mode as
well, add the reset lookup table to the psc driver for da850 variant.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Bartosz Golaszewski 7 年之前
父節點
當前提交
5ced192312
共有 2 個文件被更改,包括 8 次插入0 次删除
  1. 7 0
      drivers/clk/davinci/psc-da850.c
  2. 1 0
      drivers/clk/davinci/psc.c

+ 7 - 0
drivers/clk/davinci/psc-da850.c

@@ -6,6 +6,7 @@
  */
  */
 
 
 #include <linux/clk-provider.h>
 #include <linux/clk-provider.h>
+#include <linux/reset-controller.h>
 #include <linux/clk.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clkdev.h>
 #include <linux/init.h>
 #include <linux/init.h>
@@ -66,8 +67,14 @@ LPSC_CLKDEV3(ecap_clkdev,	"fck",	"ecap.0",
 				"fck",	"ecap.1",
 				"fck",	"ecap.1",
 				"fck",	"ecap.2");
 				"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)
 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);
 	return davinci_psc_register_clocks(dev, da850_psc0_info, 16, base);
 }
 }
 
 

+ 1 - 0
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.ops = &davinci_psc_reset_ops;
 	psc->rcdev.owner = THIS_MODULE;
 	psc->rcdev.owner = THIS_MODULE;
+	psc->rcdev.dev = dev;
 	psc->rcdev.of_node = dev->of_node;
 	psc->rcdev.of_node = dev->of_node;
 	psc->rcdev.of_reset_n_cells = 1;
 	psc->rcdev.of_reset_n_cells = 1;
 	psc->rcdev.of_xlate = davinci_psc_reset_of_xlate;
 	psc->rcdev.of_xlate = davinci_psc_reset_of_xlate;