lkml.org 
[lkml]   [2018]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[resend PATCH v4 2/5] clk: mediatek: mt2701-mmsys: switch to platform device probing
    Date
    From: Matthias Brugger <mbrugger@suse.com>

    Switch probing for the MMSYS to support invocation to a plain
    paltform device. The driver will be probed by the DRM subsystem.

    Signed-off-by: Matthias Brugger <mbrugger@suse.com>
    ---
    drivers/clk/mediatek/clk-mt2701-mm.c | 42 ++++++++++++++++++++--------
    1 file changed, 30 insertions(+), 12 deletions(-)

    diff --git a/drivers/clk/mediatek/clk-mt2701-mm.c b/drivers/clk/mediatek/clk-mt2701-mm.c
    index fe1f85072fc5..200b1842b94b 100644
    --- a/drivers/clk/mediatek/clk-mt2701-mm.c
    +++ b/drivers/clk/mediatek/clk-mt2701-mm.c
    @@ -12,14 +12,20 @@
    * GNU General Public License for more details.
    */

    +#include <linux/module.h>
    #include <linux/clk-provider.h>
    #include <linux/platform_device.h>
    +#include <linux/slab.h>

    #include "clk-mtk.h"
    #include "clk-gate.h"

    #include <dt-bindings/clock/mt2701-clk.h>

    +struct clk_mt2701_mm_priv {
    + struct clk_onecell_data *clk_data;
    +};
    +
    static const struct mtk_gate_regs disp0_cg_regs = {
    .set_ofs = 0x0104,
    .clr_ofs = 0x0108,
    @@ -87,23 +93,25 @@ static const struct mtk_gate mm_clks[] = {
    GATE_DISP1(CLK_MM_TVE_FMM, "mm_tve_fmm", "mm_sel", 14),
    };

    -static const struct of_device_id of_match_clk_mt2701_mm[] = {
    - { .compatible = "mediatek,mt2701-mmsys", },
    - {}
    -};
    -
    static int clk_mt2701_mm_probe(struct platform_device *pdev)
    {
    - struct clk_onecell_data *clk_data;
    int r;
    - struct device_node *node = pdev->dev.of_node;
    + struct device_node *node = pdev->dev.parent->of_node;
    + struct clk_mt2701_mm_priv *private;
    +
    + private = devm_kzalloc(&pdev->dev, sizeof(*private), GFP_KERNEL);
    + if (!private)
    + return -ENOMEM;

    - clk_data = mtk_alloc_clk_data(CLK_MM_NR);
    + private->clk_data = mtk_alloc_clk_data(CLK_MM_NR);
    +
    + platform_set_drvdata(pdev, private);

    mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks),
    - clk_data);
    + private->clk_data);

    - r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
    + r = of_clk_add_provider(node, of_clk_src_onecell_get,
    + private->clk_data);
    if (r)
    dev_err(&pdev->dev,
    "could not register clock provider: %s: %d\n",
    @@ -112,12 +120,22 @@ static int clk_mt2701_mm_probe(struct platform_device *pdev)
    return r;
    }

    +static int clk_mt2701_mm_remove(struct platform_device *pdev)
    +{
    + struct clk_mt2701_mm_priv *private = platform_get_drvdata(pdev);
    +
    + kfree(private->clk_data);
    + kfree(private);
    +
    + return 0;
    +}
    +
    static struct platform_driver clk_mt2701_mm_drv = {
    .probe = clk_mt2701_mm_probe,
    + .remove = clk_mt2701_mm_remove,
    .driver = {
    .name = "clk-mt2701-mm",
    - .of_match_table = of_match_clk_mt2701_mm,
    },
    };

    -builtin_platform_driver(clk_mt2701_mm_drv);
    +module_platform_driver(clk_mt2701_mm_drv);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-07-18 00:03    [W:6.039 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site