Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp170557rdb; Tue, 5 Dec 2023 01:56:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiRIfhgkxETBpMF5+NwcgMF10Je6wSY0T4chmI8zbVQsiXNe0VHo+UUowTXDhhZCsLUJBM X-Received: by 2002:aa7:999d:0:b0:6ce:2731:d5d3 with SMTP id k29-20020aa7999d000000b006ce2731d5d3mr585297pfh.68.1701770199838; Tue, 05 Dec 2023 01:56:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701770199; cv=none; d=google.com; s=arc-20160816; b=u1JdZIy9cBwiik1RGwVDQXSWyWjncpBycKA2ImhA095pBbSyymF9ZNOEqEfJKKkdMV fjKPU3pvySd3GSWi+yjf9cuwpWceBXePB7XB9yQKx4+HwXFktQlfrO6mEzkBosaZoTCn w5x8WK0MhWT7kqMb/8lhyLeIJjwGtjzjVMIZpOExZUetypojxXBsG0Dr1Fymf34Mg3lG Ut+J776yIB4twhdDdJ6o2q2WsGOht2tiCX+auMnniKtSllIEkhCC+gUHOVVKalMgIrmy 19vfm6bLUPNECar+Z6kP8F2GiLxGNVlUubQGjK2kIS9JzUeP4iyhKqkaP5Unv1wiBYfn Y9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=frJJRCHSxF/OWA6pC3QHQdcePurIycQlexrY3blx4Q0=; fh=S4scCjmGHuTpFNsRpx5F7zvdPnZW78Fse4yFoJp+Y6U=; b=RtgXOEpYOUmNPDjBC83JT4KVKwjHDYtWd/cBRCHAHF5wlcSpAZtkxzETjpNoJblq0J Ri6lih0mqjS2jL6TqZBNrq6SgkZ8Y2U6uOIpibougcmhCn1dzapEYwe+vLlIHW8ki4Sb buNgTgKRFiGJ2KHLErx57ycvoZk+wGsPhlcgPgiPjyVt+X4QrZ6Rhoh5ntjUZuyhZcaI /YwH0IXYFN05IwH4QzulWam/6UnGeSWuHgneguBRe8zd2mfZ+KHE7EKOiAFdcQiDQHQP +/dTz5CFYunfwQozJhpsWi/4wcRfUHAZcwPs9QcT8a7kJOGxDPWLVEvjv48dZJv54qYM eaEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id j4-20020a056a00130400b006cdcd785487si9416443pfu.304.2023.12.05.01.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 01:56:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E58FC801B3BF; Tue, 5 Dec 2023 01:56:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235014AbjLEJz2 (ORCPT + 99 others); Tue, 5 Dec 2023 04:55:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229971AbjLEJz0 (ORCPT ); Tue, 5 Dec 2023 04:55:26 -0500 Received: from sakura.ysato.name (ik1-413-38519.vs.sakura.ne.jp [153.127.30.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 10E2BA0; Tue, 5 Dec 2023 01:55:32 -0800 (PST) Received: from SIOS1075.ysato.name (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by sakura.ysato.name (Postfix) with ESMTPSA id 2DA221C066B; Tue, 5 Dec 2023 18:46:48 +0900 (JST) From: Yoshinori Sato To: linux-sh@vger.kernel.org Cc: Yoshinori Sato , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Thomas Gleixner , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Greg Kroah-Hartman , Jiri Slaby , Magnus Damm , Daniel Lezcano , Rich Felker , John Paul Adrian Glaubitz , Lee Jones , Helge Deller , Heiko Stuebner , Jernej Skrabec , Chris Morgan , Linus Walleij , Randy Dunlap , Arnd Bergmann , Hyeonggon Yoo <42.hyeyoo@gmail.com>, David Rientjes , Vlastimil Babka , Baoquan He , Andrew Morton , Guenter Roeck , Stephen Rothwell , Guo Ren , Javier Martinez Canillas , Azeem Shaikh , Palmer Dabbelt , Bin Meng , Max Filippov , Tom Rix , Herve Codina , Jacky Huang , Lukas Bulwahn , Jonathan Corbet , Biju Das , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sam Ravnborg , Michael Karcher , Sergey Shtylyov , Laurent Pinchart , linux-ide@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-pci@vger.kernel.org, linux-serial@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [DO NOT MERGE v5 23/37] mfd: sm501: Convert platform_data to OF property Date: Tue, 5 Dec 2023 18:45:42 +0900 Message-Id: <68532082074b0c8fe9945b481678aab77520f517.1701768028.git.ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 05 Dec 2023 01:56:34 -0800 (PST) Various parameters of SM501 can be set using platform_data, so parameters cannot be passed in the DeviceTree target. Expands the parameters set in platform_data so that they can be specified using DeviceTree properties. Signed-off-by: Yoshinori Sato --- drivers/mfd/sm501.c | 99 +++++++++++++++++++++++++++++++++++ drivers/video/fbdev/sm501fb.c | 82 +++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+) diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 28027982cf69..f0104fdf0f34 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -1370,6 +1370,99 @@ static int sm501_init_dev(struct sm501_devdata *sm) return 0; } +static void sm501_of_read_reg_init(struct device_node *np, + const char *propname, struct sm501_reg_init *val) +{ + u32 u32_val[2]; + + if (!of_property_read_u32_array(np, propname, u32_val, sizeof(u32_val))) { + val->set = u32_val[0]; + val->mask = u32_val[1]; + } +} + +/* Read GPIO I2C configuration */ +static int sm501_parse_dt_gpio_i2c(struct device *dev, struct sm501_platdata *plat, + struct device_node *np) +{ + struct sm501_platdata_gpio_i2c *gpio_i2c_p; + struct property *prop; + u32 gpio_i2c[5]; + const __be32 *p; + unsigned int i; + u32 i2c_nr; + + prop = of_find_property(np, "smi,gpio-i2c", NULL); + if (!prop) + return 0; + + i2c_nr = of_property_count_u32_elems(np, "smi,gpio-i2c"); + + /* GPIO I2C define 5 words per channel. */ + if (i2c_nr % 5) + return -EINVAL; + i2c_nr /= 5; + plat->gpio_i2c = devm_kzalloc(dev, sizeof(*plat->gpio_i2c) * i2c_nr, + GFP_KERNEL); + if (!plat->gpio_i2c) + return -ENOMEM; + + plat->gpio_i2c_nr = i2c_nr; + gpio_i2c_p = plat->gpio_i2c; + + for (; i2c_nr > 0; i2c_nr--) { + for (i = 0; i < ARRAY_SIZE(gpio_i2c); i++) { + p = of_prop_next_u32(prop, p, &gpio_i2c[i]); + if (!p) + return -EINVAL; + } + gpio_i2c_p->bus_num = gpio_i2c[0]; + gpio_i2c_p->pin_sda = gpio_i2c[1]; + gpio_i2c_p->pin_scl = gpio_i2c[2]; + gpio_i2c_p->udelay = gpio_i2c[3]; + gpio_i2c_p->timeout = gpio_i2c[4]; + gpio_i2c_p++; + } + return 0; +} + +/* Build platform_data from OF property */ +static int sm501_parse_dt(struct sm501_devdata *sm, struct device_node *np) +{ + struct sm501_platdata *plat; + u32 u32_val; + int ret; + + plat = devm_kzalloc(sm->dev, sizeof(*plat), GFP_KERNEL); + if (!plat) + return -ENOMEM; + + plat->init = devm_kzalloc(sm->dev, sizeof(*plat->init), GFP_KERNEL); + if (!plat->init) + return -ENOMEM; + + if (!of_property_read_u32(np, "smi,devices", &u32_val)) + plat->init->devices = u32_val; + if (!of_property_read_u32(np, "smi,mclk", &u32_val)) + plat->init->mclk = u32_val; + if (!of_property_read_u32(np, "smi,m1xclk", &u32_val)) + plat->init->m1xclk = u32_val; + + sm501_of_read_reg_init(np, "smi,misc-timing", &plat->init->misc_timing); + sm501_of_read_reg_init(np, "smi,misc-control", &plat->init->misc_control); + sm501_of_read_reg_init(np, "smi,gpio-low", &plat->init->gpio_low); + sm501_of_read_reg_init(np, "smi,gpio-high", &plat->init->gpio_high); + + if (IS_ENABLED(CONFIG_MFD_SM501_GPIO) && + (plat->init->devices & SM501_USE_GPIO)) { + ret = sm501_parse_dt_gpio_i2c(sm->dev, plat, np); + if (ret) + return ret; + } + sm->platdata = plat; + return 0; +} + static int sm501_plat_probe(struct platform_device *dev) { struct sm501_devdata *sm; @@ -1406,6 +1499,12 @@ static int sm501_plat_probe(struct platform_device *dev) goto err_res; } + if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) { + ret = sm501_parse_dt(sm, dev->dev.of_node); + if (ret) + goto err_res; + } + platform_set_drvdata(dev, sm); sm->regs = ioremap(sm->io_res->start, resource_size(sm->io_res)); diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c index d6fdc1737cd2..d35285819d28 100644 --- a/drivers/video/fbdev/sm501fb.c +++ b/drivers/video/fbdev/sm501fb.c @@ -1932,6 +1932,82 @@ static int sm501fb_start_one(struct sm501fb_info *info, return 0; } +#if defined(CONFIG_OF) +/* parse CRT / panel configuration */ +static struct sm501_platdata_fbsub *dt_fbsub(struct device *dev, + struct device_node *np, + const char *name) +{ + struct sm501_platdata_fbsub *fbsub = NULL; + struct fb_videomode *def_mode = NULL; + struct device_node *child; + const void *p_edid; + u32 flags = 0; + u32 bpp = 0; + int len; + + child = of_get_child_by_name(np, name); + if (child == NULL) + return NULL; + + p_edid = of_get_property(child, "edid", &len); + if (p_edid && len == EDID_LENGTH) { + struct fb_monspecs *specs; + u8 *edid; + + edid = kmemdup(p_edid, EDID_LENGTH, GFP_KERNEL); + if (edid) { + specs = kzalloc(sizeof(*specs), GFP_KERNEL); + if (specs) { + fb_edid_to_monspecs(edid, specs); + def_mode = specs->modedb; + } + } + kfree(edid); + } + + of_property_read_u32(child, "bpp", &bpp); + + /* If flags property is obtained, fbsub is returned. */ + if (!of_property_read_u32(child, "smi,flags", &flags)) { + fbsub = devm_kzalloc(dev, sizeof(*fbsub), GFP_KERNEL); + if (fbsub) { + fbsub->def_mode = def_mode; + fbsub->def_bpp = bpp; + fbsub->flags = flags; + } + } + return fbsub; +} + +/* Build platform_data from OF property */ +static struct sm501_platdata_fb *pdata_from_dt(struct device *dev, struct device_node *np) +{ + enum sm501_fb_routing fb_route = SM501_FB_OWN; + struct sm501_platdata_fb *pdata = NULL; + struct sm501_platdata_fbsub *fb_crt; + struct sm501_platdata_fbsub *fb_pnl; + unsigned int flags = 0; + + if (of_property_read_bool(np, "route-crt-panel")) + fb_route = SM501_FB_CRT_PANEL; + if (of_property_read_bool(np, "swap-fb-endian")) + flags = SM501_FBPD_SWAP_FB_ENDIAN; + fb_crt = dt_fbsub(dev, np, "crt"); + fb_pnl = dt_fbsub(dev, np, "panel"); + if (fb_crt || fb_pnl) { + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (pdata) { + pdata->fb_route = fb_route; + pdata->flags = flags; + pdata->fb_crt = fb_crt; + pdata->fb_pnl = fb_pnl; + } + } + return pdata; +} +#endif + static int sm501fb_probe(struct platform_device *pdev) { struct sm501fb_info *info; @@ -1974,6 +2050,12 @@ static int sm501fb_probe(struct platform_device *pdev) if (info->edid_data) found = 1; } + /* Get platform data compatible configuration */ + if (!found) { + info->pdata = pdata_from_dt(dev, np); + if (info->pdata) + found = 1; + } } #endif if (!found) { -- 2.39.2