|
@@ -23,6 +23,7 @@
|
|
#include <linux/interrupt.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
+#include <linux/reset.h>
|
|
#include <media/rc-core.h>
|
|
#include <media/rc-core.h>
|
|
|
|
|
|
#define SUNXI_IR_DEV "sunxi-ir"
|
|
#define SUNXI_IR_DEV "sunxi-ir"
|
|
@@ -95,6 +96,7 @@ struct sunxi_ir {
|
|
int irq;
|
|
int irq;
|
|
struct clk *clk;
|
|
struct clk *clk;
|
|
struct clk *apb_clk;
|
|
struct clk *apb_clk;
|
|
|
|
+ struct reset_control *rst;
|
|
const char *map_name;
|
|
const char *map_name;
|
|
};
|
|
};
|
|
|
|
|
|
@@ -166,15 +168,29 @@ static int sunxi_ir_probe(struct platform_device *pdev)
|
|
return PTR_ERR(ir->clk);
|
|
return PTR_ERR(ir->clk);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /* Reset (optional) */
|
|
|
|
+ ir->rst = devm_reset_control_get_optional(dev, NULL);
|
|
|
|
+ if (IS_ERR(ir->rst)) {
|
|
|
|
+ ret = PTR_ERR(ir->rst);
|
|
|
|
+ if (ret == -EPROBE_DEFER)
|
|
|
|
+ return ret;
|
|
|
|
+ ir->rst = NULL;
|
|
|
|
+ } else {
|
|
|
|
+ ret = reset_control_deassert(ir->rst);
|
|
|
|
+ if (ret)
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
+
|
|
ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
|
|
ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(dev, "set ir base clock failed!\n");
|
|
dev_err(dev, "set ir base clock failed!\n");
|
|
- return ret;
|
|
|
|
|
|
+ goto exit_reset_assert;
|
|
}
|
|
}
|
|
|
|
|
|
if (clk_prepare_enable(ir->apb_clk)) {
|
|
if (clk_prepare_enable(ir->apb_clk)) {
|
|
dev_err(dev, "try to enable apb_ir_clk failed\n");
|
|
dev_err(dev, "try to enable apb_ir_clk failed\n");
|
|
- return -EINVAL;
|
|
|
|
|
|
+ ret = -EINVAL;
|
|
|
|
+ goto exit_reset_assert;
|
|
}
|
|
}
|
|
|
|
|
|
if (clk_prepare_enable(ir->clk)) {
|
|
if (clk_prepare_enable(ir->clk)) {
|
|
@@ -271,6 +287,9 @@ exit_clkdisable_clk:
|
|
clk_disable_unprepare(ir->clk);
|
|
clk_disable_unprepare(ir->clk);
|
|
exit_clkdisable_apb_clk:
|
|
exit_clkdisable_apb_clk:
|
|
clk_disable_unprepare(ir->apb_clk);
|
|
clk_disable_unprepare(ir->apb_clk);
|
|
|
|
+exit_reset_assert:
|
|
|
|
+ if (ir->rst)
|
|
|
|
+ reset_control_assert(ir->rst);
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -282,6 +301,8 @@ static int sunxi_ir_remove(struct platform_device *pdev)
|
|
|
|
|
|
clk_disable_unprepare(ir->clk);
|
|
clk_disable_unprepare(ir->clk);
|
|
clk_disable_unprepare(ir->apb_clk);
|
|
clk_disable_unprepare(ir->apb_clk);
|
|
|
|
+ if (ir->rst)
|
|
|
|
+ reset_control_assert(ir->rst);
|
|
|
|
|
|
spin_lock_irqsave(&ir->ir_lock, flags);
|
|
spin_lock_irqsave(&ir->ir_lock, flags);
|
|
/* disable IR IRQ */
|
|
/* disable IR IRQ */
|