|
@@ -22,6 +22,7 @@
|
|
#include "clk-rcg.h"
|
|
#include "clk-rcg.h"
|
|
#include "clk-regmap.h"
|
|
#include "clk-regmap.h"
|
|
#include "reset.h"
|
|
#include "reset.h"
|
|
|
|
+#include "gdsc.h"
|
|
|
|
|
|
struct qcom_cc {
|
|
struct qcom_cc {
|
|
struct qcom_reset_controller reset;
|
|
struct qcom_reset_controller reset;
|
|
@@ -121,8 +122,19 @@ int qcom_cc_really_probe(struct platform_device *pdev,
|
|
|
|
|
|
ret = reset_controller_register(&reset->rcdev);
|
|
ret = reset_controller_register(&reset->rcdev);
|
|
if (ret)
|
|
if (ret)
|
|
- of_clk_del_provider(dev->of_node);
|
|
|
|
|
|
+ goto err_reset;
|
|
|
|
|
|
|
|
+ if (desc->gdscs && desc->num_gdscs) {
|
|
|
|
+ ret = gdsc_register(dev, desc->gdscs, desc->num_gdscs, regmap);
|
|
|
|
+ if (ret)
|
|
|
|
+ goto err_pd;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+err_pd:
|
|
|
|
+ reset_controller_unregister(&reset->rcdev);
|
|
|
|
+err_reset:
|
|
|
|
+ of_clk_del_provider(dev->of_node);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_cc_really_probe);
|
|
EXPORT_SYMBOL_GPL(qcom_cc_really_probe);
|
|
@@ -141,6 +153,7 @@ EXPORT_SYMBOL_GPL(qcom_cc_probe);
|
|
|
|
|
|
void qcom_cc_remove(struct platform_device *pdev)
|
|
void qcom_cc_remove(struct platform_device *pdev)
|
|
{
|
|
{
|
|
|
|
+ gdsc_unregister(&pdev->dev);
|
|
of_clk_del_provider(pdev->dev.of_node);
|
|
of_clk_del_provider(pdev->dev.of_node);
|
|
reset_controller_unregister(platform_get_drvdata(pdev));
|
|
reset_controller_unregister(platform_get_drvdata(pdev));
|
|
}
|
|
}
|