|
@@ -17,6 +17,7 @@
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
+#include <linux/reset.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/types.h>
|
|
#include <linux/types.h>
|
|
|
|
|
|
@@ -53,11 +54,12 @@ struct aspeed_adc_model_data {
|
|
};
|
|
};
|
|
|
|
|
|
struct aspeed_adc_data {
|
|
struct aspeed_adc_data {
|
|
- struct device *dev;
|
|
|
|
- void __iomem *base;
|
|
|
|
- spinlock_t clk_lock;
|
|
|
|
- struct clk_hw *clk_prescaler;
|
|
|
|
- struct clk_hw *clk_scaler;
|
|
|
|
|
|
+ struct device *dev;
|
|
|
|
+ void __iomem *base;
|
|
|
|
+ spinlock_t clk_lock;
|
|
|
|
+ struct clk_hw *clk_prescaler;
|
|
|
|
+ struct clk_hw *clk_scaler;
|
|
|
|
+ struct reset_control *rst;
|
|
};
|
|
};
|
|
|
|
|
|
#define ASPEED_CHAN(_idx, _data_reg_addr) { \
|
|
#define ASPEED_CHAN(_idx, _data_reg_addr) { \
|
|
@@ -217,6 +219,15 @@ static int aspeed_adc_probe(struct platform_device *pdev)
|
|
goto scaler_error;
|
|
goto scaler_error;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ data->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
|
|
|
|
+ if (IS_ERR(data->rst)) {
|
|
|
|
+ dev_err(&pdev->dev,
|
|
|
|
+ "invalid or missing reset controller device tree entry");
|
|
|
|
+ ret = PTR_ERR(data->rst);
|
|
|
|
+ goto reset_error;
|
|
|
|
+ }
|
|
|
|
+ reset_control_deassert(data->rst);
|
|
|
|
+
|
|
model_data = of_device_get_match_data(&pdev->dev);
|
|
model_data = of_device_get_match_data(&pdev->dev);
|
|
|
|
|
|
if (model_data->wait_init_sequence) {
|
|
if (model_data->wait_init_sequence) {
|
|
@@ -263,9 +274,10 @@ iio_register_error:
|
|
writel(ASPEED_OPERATION_MODE_POWER_DOWN,
|
|
writel(ASPEED_OPERATION_MODE_POWER_DOWN,
|
|
data->base + ASPEED_REG_ENGINE_CONTROL);
|
|
data->base + ASPEED_REG_ENGINE_CONTROL);
|
|
clk_disable_unprepare(data->clk_scaler->clk);
|
|
clk_disable_unprepare(data->clk_scaler->clk);
|
|
|
|
+reset_error:
|
|
|
|
+ reset_control_assert(data->rst);
|
|
clk_enable_error:
|
|
clk_enable_error:
|
|
clk_hw_unregister_divider(data->clk_scaler);
|
|
clk_hw_unregister_divider(data->clk_scaler);
|
|
-
|
|
|
|
scaler_error:
|
|
scaler_error:
|
|
clk_hw_unregister_divider(data->clk_prescaler);
|
|
clk_hw_unregister_divider(data->clk_prescaler);
|
|
return ret;
|
|
return ret;
|
|
@@ -280,6 +292,7 @@ static int aspeed_adc_remove(struct platform_device *pdev)
|
|
writel(ASPEED_OPERATION_MODE_POWER_DOWN,
|
|
writel(ASPEED_OPERATION_MODE_POWER_DOWN,
|
|
data->base + ASPEED_REG_ENGINE_CONTROL);
|
|
data->base + ASPEED_REG_ENGINE_CONTROL);
|
|
clk_disable_unprepare(data->clk_scaler->clk);
|
|
clk_disable_unprepare(data->clk_scaler->clk);
|
|
|
|
+ reset_control_assert(data->rst);
|
|
clk_hw_unregister_divider(data->clk_scaler);
|
|
clk_hw_unregister_divider(data->clk_scaler);
|
|
clk_hw_unregister_divider(data->clk_prescaler);
|
|
clk_hw_unregister_divider(data->clk_prescaler);
|
|
|
|
|