lkml.org 
[lkml]   [2019]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 01/13] pwm: mediatek: add a property "num-pwms"
    Date
    From: Ryder Lee <ryder.lee@mediatek.com>

    This adds a property "num-pwms" to avoid having an endless
    list of compatibles with no differences for the same driver.

    Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
    Signed-off-by: Sam Shih <sam.shih@mediatek.com>
    ---
    Used:
    https://patchwork.kernel.org/project/linux-mediatek/list/?series=68207

    Changes since v5:
    Check num-pwms value is no more than MTK_CLK_MAX - 2 (MAIN + TOP)

    Changes since v4:
    Follow reviewer's comments:
    Move the changes of droping the check for of_device_get_match_data returning non-NULL to next patch

    Change-Id: I5a7aa05f5dec346612bd417f1c4530abc85f77a8
    ---
    drivers/pwm/pwm-mediatek.c | 36 ++++++++++++++++++++++++++++--------
    1 file changed, 28 insertions(+), 8 deletions(-)

    diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c
    index eb6674ce995f..e214f4f57107 100644
    --- a/drivers/pwm/pwm-mediatek.c
    +++ b/drivers/pwm/pwm-mediatek.c
    @@ -55,7 +55,7 @@ static const char * const mtk_pwm_clk_name[MTK_CLK_MAX] = {
    };

    struct mtk_pwm_platform_data {
    - unsigned int num_pwms;
    + unsigned int fallback_npwms;
    bool pwm45_fixup;
    bool has_clks;
    };
    @@ -227,9 +227,10 @@ static const struct pwm_ops mtk_pwm_ops = {
    static int mtk_pwm_probe(struct platform_device *pdev)
    {
    const struct mtk_pwm_platform_data *data;
    + struct device_node *np = pdev->dev.of_node;
    struct mtk_pwm_chip *pc;
    struct resource *res;
    - unsigned int i;
    + unsigned int i, npwms;
    int ret;

    pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
    @@ -246,7 +247,26 @@ static int mtk_pwm_probe(struct platform_device *pdev)
    if (IS_ERR(pc->regs))
    return PTR_ERR(pc->regs);

    - for (i = 0; i < data->num_pwms + 2 && pc->soc->has_clks; i++) {
    + ret = of_property_read_u32(np, "num-pwms", &npwms);
    + if (ret < 0) {
    + /* It's deprecated, we should specify num_pwms via DT now. */
    + if (pc->soc->fallback_npwms) {
    + npwms = pc->soc->fallback_npwms;
    + dev_warn(&pdev->dev, "DT is outdated, please update it\n");
    + } else {
    + dev_err(&pdev->dev, "failed to get number of PWMs\n");
    + return ret;
    + }
    + }
    +
    + /* MAIN + TOP + NPWM < MTK_CLK_MAX */
    + if ((npwms + 2) > MTK_CLK_MAX) {
    + dev_warn(&pdev->dev, "number of PWMs is larger than %d\n",
    + MTK_CLK_MAX - 2);
    + npwms = MTK_CLK_MAX - 2;
    + }
    +
    + for (i = 0; i < npwms + 2 && pc->soc->has_clks; i++) {
    pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]);
    if (IS_ERR(pc->clks[i])) {
    dev_err(&pdev->dev, "clock: %s fail: %ld\n",
    @@ -260,7 +280,7 @@ static int mtk_pwm_probe(struct platform_device *pdev)
    pc->chip.dev = &pdev->dev;
    pc->chip.ops = &mtk_pwm_ops;
    pc->chip.base = -1;
    - pc->chip.npwm = data->num_pwms;
    + pc->chip.npwm = npwms;

    ret = pwmchip_add(&pc->chip);
    if (ret < 0) {
    @@ -279,25 +299,25 @@ static int mtk_pwm_remove(struct platform_device *pdev)
    }

    static const struct mtk_pwm_platform_data mt2712_pwm_data = {
    - .num_pwms = 8,
    + .fallback_npwms = 8,
    .pwm45_fixup = false,
    .has_clks = true,
    };

    static const struct mtk_pwm_platform_data mt7622_pwm_data = {
    - .num_pwms = 6,
    + .fallback_npwms = 6,
    .pwm45_fixup = false,
    .has_clks = true,
    };

    static const struct mtk_pwm_platform_data mt7623_pwm_data = {
    - .num_pwms = 5,
    + .fallback_npwms = 5,
    .pwm45_fixup = true,
    .has_clks = true,
    };

    static const struct mtk_pwm_platform_data mt7628_pwm_data = {
    - .num_pwms = 4,
    + .fallback_npwms = 4,
    .pwm45_fixup = true,
    .has_clks = false,
    };
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-22 09:00    [W:4.224 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site