From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrxhJPwxJ42qljz9lrS7yai4Z+bSUDqCCwKKpxfnAVuTYMzWt+PR0gw5pwKhAftIjEapjmL ARC-Seal: i=1; a=rsa-sha256; t=1525084969; cv=none; d=google.com; s=arc-20160816; b=qaefa/V10lQrui/ukWRu0FZL0jBST5k5GkbpquEtGktLJpNMfZeBHYJ/ZFhv3erg63 uu1wosi58nR/yMAfCHG9khH3Jy5zN4AEhNgDkQQ3ta3SnZgNf8bHocmodZSSqBsKyah9 IWIP3rv6bKkNsNDzLzMx8gVJRubr3nRj6DuePF4aUTrlqxkld5+yOMLKzgizNgQWjXg3 m/Uxq+1syu4VR4G5x9Fd+qlDEaQuxcoKbU9XpSss8JsEcii7jV+ZHq+XxigzRUUDbSVh vGBb5ttiGjze+UN9sNvUrE8G3AkmNCQHRhA2CJ9H+QSIzsojZGgBAcKu7IF1mgSoNI8f ws0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to:date :cc:to:from:subject:message-id:arc-authentication-results; bh=20kL/13eOawciohh7AYlVva5jeLjcK26HDuDQikcbf0=; b=FNM1of0Kl10/wy6dtPDg1qqWjl5w3Vwl9VNs1y+1Ipf4w1f1jQ3/ApOsfO6k1z+LSi tYQ+s5LHJ7/iu2DCOXff+/GilO+WsU9sxEjsRdBpAp/BAD+EjLrgzxowv942W487CKp9 uub1IjVLSV/Z6+LThWjC0PsHszcjq5JQHmfX9IU07AOjUxQj/VKLI4hdXXbxSWaavRM/ kTeiZfzIVfY2gQLUeOBFay0ndwTqoGj7BNUSPUporqCwnx+hEpRFmprHgtWcbTwcIgC4 AdwdMGUcKPaz17upzWifZhxG+4aMmxVTzoZ3xar6YzAQxK0O0h2qk83Y2mMun3EJFj+p cdvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ck.hu@mediatek.com designates 210.61.82.183 as permitted sender) smtp.mailfrom=ck.hu@mediatek.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of ck.hu@mediatek.com designates 210.61.82.183 as permitted sender) smtp.mailfrom=ck.hu@mediatek.com X-UUID: d23e429c040447d1beb2cf9f1afe2cbd-20180430 Message-ID: <1525084962.25456.2.camel@mtksdaap41> Subject: Re: [v3 04/10] drm/mediatek: mt2701: switch to mfd probing. From: CK Hu To: CC: , , , , , , , , , , , , , , , , , , , , , Matthias Brugger Date: Mon, 30 Apr 2018 18:42:42 +0800 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1598890788706777550?= X-GMAIL-MSGID: =?utf-8?q?1599167497264686004?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Hi, Matthias: On Fri, 2018-04-27 at 11:23 +0200, matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > With the mtk-mmsys MFD device in place, we switch the probing for > mt2701 from device-tree to mfd. > > Signed-off-by: Matthias Brugger Reviewed-by: CK Hu Regards, CK > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 30 +++++++++++++++++++++++------- > 1 file changed, 23 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index a48e28adad09..88ee35907744 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -386,7 +386,7 @@ static int mtk_drm_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct mtk_drm_private *private; > - struct device_node *node; > + struct device_node *node, *parent_node, *mmsys_node; > struct component_match *match = NULL; > int ret; > int i; > @@ -399,12 +399,23 @@ static int mtk_drm_probe(struct platform_device *pdev) > INIT_WORK(&private->commit.work, mtk_atomic_work); > private->data = of_device_get_match_data(dev); > > - private->config_regs = syscon_node_to_regmap(dev->of_node); > - if (IS_ERR(private->config_regs)) > - return PTR_ERR(private->config_regs); > + /* Check if called from mfd */ > + if (!dev->of_node) { > + mmsys_node = pdev->dev.parent->of_node; > + private->data = (struct mtk_mmsys_driver_data *) > + platform_get_device_id(pdev)->driver_data; > + private->config_regs = > + syscon_node_to_regmap(mmsys_node); > + parent_node = mmsys_node->parent; > + } else { > + private->config_regs = syscon_node_to_regmap(dev->of_node); > + if (IS_ERR(private->config_regs)) > + return PTR_ERR(private->config_regs); > + parent_node = dev->of_node->parent; > + } > > /* Iterate over sibling DISP function blocks */ > - for_each_child_of_node(dev->of_node->parent, node) { > + for_each_child_of_node(parent_node, node) { > const struct of_device_id *of_id; > enum mtk_ddp_comp_type comp_type; > int comp_id; > @@ -545,13 +556,17 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > mtk_drm_sys_resume); > > static const struct of_device_id mtk_drm_of_ids[] = { > - { .compatible = "mediatek,mt2701-mmsys", > - .data = &mt2701_mmsys_driver_data}, > { .compatible = "mediatek,mt8173-mmsys", > .data = &mt8173_mmsys_driver_data}, > { } > }; > > +static const struct platform_device_id mtk_drm_ids[] = { > + { "drm-mt2701-mm", (kernel_ulong_t)&mt2701_mmsys_driver_data }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(platform, mtk_drm_ids); > + > static struct platform_driver mtk_drm_platform_driver = { > .probe = mtk_drm_probe, > .remove = mtk_drm_remove, > @@ -560,6 +575,7 @@ static struct platform_driver mtk_drm_platform_driver = { > .of_match_table = mtk_drm_of_ids, > .pm = &mtk_drm_pm_ops, > }, > + .id_table = mtk_drm_ids, > }; > > static struct platform_driver * const mtk_drm_drivers[] = { From mboxrd@z Thu Jan 1 00:00:00 1970 From: CK Hu Subject: Re: [v3 04/10] drm/mediatek: mt2701: switch to mfd probing. Date: Mon, 30 Apr 2018 18:42:42 +0800 Message-ID: <1525084962.25456.2.camel@mtksdaap41> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: matthias.bgg@kernel.org Cc: mark.rutland@arm.com, airlied@linux.ie, mturquette@baylibre.com, dri-devel@lists.freedesktop.org, laurent.pinchart@ideasonboard.com, ulrich.hecht+renesas@gmail.com, lee.jones@linaro.org, linux-clk@vger.kernel.org, linux@armlinux.org.uk, sean.wang@mediatek.com, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, Matthias Brugger , gregkh@linuxfoundation.org, rdunlap@infradead.org, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, davem@davemloft.net List-Id: linux-mediatek@lists.infradead.org SGksIE1hdHRoaWFzOgoKCk9uIEZyaSwgMjAxOC0wNC0yNyBhdCAxMToyMyArMDIwMCwgbWF0dGhp YXMuYmdnQGtlcm5lbC5vcmcgd3JvdGU6Cj4gRnJvbTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdn ZXJAc3VzZS5jb20+Cj4gCj4gV2l0aCB0aGUgbXRrLW1tc3lzIE1GRCBkZXZpY2UgaW4gcGxhY2Us IHdlIHN3aXRjaCB0aGUgcHJvYmluZyBmb3IKPiBtdDI3MDEgZnJvbSBkZXZpY2UtdHJlZSB0byBt ZmQuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdnZXJAc3VzZS5j b20+CgpSZXZpZXdlZC1ieTogQ0sgSHUgPGNrLmh1QG1lZGlhdGVrLmNvbT4KClJlZ2FyZHMsCkNL Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuYyB8IDMwICsr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0 aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L21lZGlhdGVrL210a19kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9kcnYuYwo+IGluZGV4IGE0OGUyOGFkYWQwOS4uODhlZTM1OTA3NzQ0IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKPiBAQCAtMzg2LDcgKzM4Niw3IEBAIHN0YXRp YyBpbnQgbXRrX2RybV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICB7Cj4g IAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2Owo+ICAJc3RydWN0IG10a19kcm1fcHJp dmF0ZSAqcHJpdmF0ZTsKPiAtCXN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZTsKPiArCXN0cnVjdCBk ZXZpY2Vfbm9kZSAqbm9kZSwgKnBhcmVudF9ub2RlLCAqbW1zeXNfbm9kZTsKPiAgCXN0cnVjdCBj b21wb25lbnRfbWF0Y2ggKm1hdGNoID0gTlVMTDsKPiAgCWludCByZXQ7Cj4gIAlpbnQgaTsKPiBA QCAtMzk5LDEyICszOTksMjMgQEAgc3RhdGljIGludCBtdGtfZHJtX3Byb2JlKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpCj4gIAlJTklUX1dPUksoJnByaXZhdGUtPmNvbW1pdC53b3JrLCBt dGtfYXRvbWljX3dvcmspOwo+ICAJcHJpdmF0ZS0+ZGF0YSA9IG9mX2RldmljZV9nZXRfbWF0Y2hf ZGF0YShkZXYpOwo+ICAKPiAtCXByaXZhdGUtPmNvbmZpZ19yZWdzID0gc3lzY29uX25vZGVfdG9f cmVnbWFwKGRldi0+b2Zfbm9kZSk7Cj4gLQlpZiAoSVNfRVJSKHByaXZhdGUtPmNvbmZpZ19yZWdz KSkKPiAtCQlyZXR1cm4gUFRSX0VSUihwcml2YXRlLT5jb25maWdfcmVncyk7Cj4gKwkvKiBDaGVj ayBpZiBjYWxsZWQgZnJvbSBtZmQgKi8KPiArCWlmICghZGV2LT5vZl9ub2RlKSB7Cj4gKwkJbW1z eXNfbm9kZSA9IHBkZXYtPmRldi5wYXJlbnQtPm9mX25vZGU7Cj4gKwkJcHJpdmF0ZS0+ZGF0YSA9 IChzdHJ1Y3QgbXRrX21tc3lzX2RyaXZlcl9kYXRhICopCj4gKwkJCQlwbGF0Zm9ybV9nZXRfZGV2 aWNlX2lkKHBkZXYpLT5kcml2ZXJfZGF0YTsKPiArCQlwcml2YXRlLT5jb25maWdfcmVncyA9Cj4g KwkJCXN5c2Nvbl9ub2RlX3RvX3JlZ21hcChtbXN5c19ub2RlKTsKPiArCQlwYXJlbnRfbm9kZSA9 IG1tc3lzX25vZGUtPnBhcmVudDsKPiArCX0gZWxzZSB7Cj4gKwkJcHJpdmF0ZS0+Y29uZmlnX3Jl Z3MgPSBzeXNjb25fbm9kZV90b19yZWdtYXAoZGV2LT5vZl9ub2RlKTsKPiArCQlpZiAoSVNfRVJS KHByaXZhdGUtPmNvbmZpZ19yZWdzKSkKPiArCQkJcmV0dXJuIFBUUl9FUlIocHJpdmF0ZS0+Y29u ZmlnX3JlZ3MpOwo+ICsJCXBhcmVudF9ub2RlID0gZGV2LT5vZl9ub2RlLT5wYXJlbnQ7Cj4gKwl9 Cj4gIAo+ICAJLyogSXRlcmF0ZSBvdmVyIHNpYmxpbmcgRElTUCBmdW5jdGlvbiBibG9ja3MgKi8K PiAtCWZvcl9lYWNoX2NoaWxkX29mX25vZGUoZGV2LT5vZl9ub2RlLT5wYXJlbnQsIG5vZGUpIHsK PiArCWZvcl9lYWNoX2NoaWxkX29mX25vZGUocGFyZW50X25vZGUsIG5vZGUpIHsKPiAgCQljb25z dCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkICpvZl9pZDsKPiAgCQllbnVtIG10a19kZHBfY29tcF90eXBl IGNvbXBfdHlwZTsKPiAgCQlpbnQgY29tcF9pZDsKPiBAQCAtNTQ1LDEzICs1NTYsMTcgQEAgc3Rh dGljIFNJTVBMRV9ERVZfUE1fT1BTKG10a19kcm1fcG1fb3BzLCBtdGtfZHJtX3N5c19zdXNwZW5k LAo+ICAJCQkgbXRrX2RybV9zeXNfcmVzdW1lKTsKPiAgCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg b2ZfZGV2aWNlX2lkIG10a19kcm1fb2ZfaWRzW10gPSB7Cj4gLQl7IC5jb21wYXRpYmxlID0gIm1l ZGlhdGVrLG10MjcwMS1tbXN5cyIsCj4gLQkgIC5kYXRhID0gJm10MjcwMV9tbXN5c19kcml2ZXJf ZGF0YX0sCj4gIAl7IC5jb21wYXRpYmxlID0gIm1lZGlhdGVrLG10ODE3My1tbXN5cyIsCj4gIAkg IC5kYXRhID0gJm10ODE3M19tbXN5c19kcml2ZXJfZGF0YX0sCj4gIAl7IH0KPiAgfTsKPiAgCj4g K3N0YXRpYyBjb25zdCBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlX2lkIG10a19kcm1faWRzW10gPSB7 Cj4gKwl7ICJkcm0tbXQyNzAxLW1tIiwgKGtlcm5lbF91bG9uZ190KSZtdDI3MDFfbW1zeXNfZHJp dmVyX2RhdGEgfSwKPiArCXsgLyogc2VudGluZWwgKi8gfSwKPiArfTsKPiArTU9EVUxFX0RFVklD RV9UQUJMRShwbGF0Zm9ybSwgbXRrX2RybV9pZHMpOwo+ICsKPiAgc3RhdGljIHN0cnVjdCBwbGF0 Zm9ybV9kcml2ZXIgbXRrX2RybV9wbGF0Zm9ybV9kcml2ZXIgPSB7Cj4gIAkucHJvYmUJPSBtdGtf ZHJtX3Byb2JlLAo+ICAJLnJlbW92ZQk9IG10a19kcm1fcmVtb3ZlLAo+IEBAIC01NjAsNiArNTc1 LDcgQEAgc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2RybV9wbGF0Zm9ybV9kcml2 ZXIgPSB7Cj4gIAkJLm9mX21hdGNoX3RhYmxlID0gbXRrX2RybV9vZl9pZHMsCj4gIAkJLnBtICAg ICA9ICZtdGtfZHJtX3BtX29wcywKPiAgCX0sCj4gKwkuaWRfdGFibGUgPSBtdGtfZHJtX2lkcywK PiAgfTsKPiAgCj4gIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyICogY29uc3QgbXRrX2Ry bV9kcml2ZXJzW10gPSB7CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: ck.hu@mediatek.com (CK Hu) Date: Mon, 30 Apr 2018 18:42:42 +0800 Subject: [v3 04/10] drm/mediatek: mt2701: switch to mfd probing. In-Reply-To: References: Message-ID: <1525084962.25456.2.camel@mtksdaap41> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, Matthias: On Fri, 2018-04-27 at 11:23 +0200, matthias.bgg at kernel.org wrote: > From: Matthias Brugger > > With the mtk-mmsys MFD device in place, we switch the probing for > mt2701 from device-tree to mfd. > > Signed-off-by: Matthias Brugger Reviewed-by: CK Hu Regards, CK > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 30 +++++++++++++++++++++++------- > 1 file changed, 23 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index a48e28adad09..88ee35907744 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -386,7 +386,7 @@ static int mtk_drm_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct mtk_drm_private *private; > - struct device_node *node; > + struct device_node *node, *parent_node, *mmsys_node; > struct component_match *match = NULL; > int ret; > int i; > @@ -399,12 +399,23 @@ static int mtk_drm_probe(struct platform_device *pdev) > INIT_WORK(&private->commit.work, mtk_atomic_work); > private->data = of_device_get_match_data(dev); > > - private->config_regs = syscon_node_to_regmap(dev->of_node); > - if (IS_ERR(private->config_regs)) > - return PTR_ERR(private->config_regs); > + /* Check if called from mfd */ > + if (!dev->of_node) { > + mmsys_node = pdev->dev.parent->of_node; > + private->data = (struct mtk_mmsys_driver_data *) > + platform_get_device_id(pdev)->driver_data; > + private->config_regs = > + syscon_node_to_regmap(mmsys_node); > + parent_node = mmsys_node->parent; > + } else { > + private->config_regs = syscon_node_to_regmap(dev->of_node); > + if (IS_ERR(private->config_regs)) > + return PTR_ERR(private->config_regs); > + parent_node = dev->of_node->parent; > + } > > /* Iterate over sibling DISP function blocks */ > - for_each_child_of_node(dev->of_node->parent, node) { > + for_each_child_of_node(parent_node, node) { > const struct of_device_id *of_id; > enum mtk_ddp_comp_type comp_type; > int comp_id; > @@ -545,13 +556,17 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > mtk_drm_sys_resume); > > static const struct of_device_id mtk_drm_of_ids[] = { > - { .compatible = "mediatek,mt2701-mmsys", > - .data = &mt2701_mmsys_driver_data}, > { .compatible = "mediatek,mt8173-mmsys", > .data = &mt8173_mmsys_driver_data}, > { } > }; > > +static const struct platform_device_id mtk_drm_ids[] = { > + { "drm-mt2701-mm", (kernel_ulong_t)&mt2701_mmsys_driver_data }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(platform, mtk_drm_ids); > + > static struct platform_driver mtk_drm_platform_driver = { > .probe = mtk_drm_probe, > .remove = mtk_drm_remove, > @@ -560,6 +575,7 @@ static struct platform_driver mtk_drm_platform_driver = { > .of_match_table = mtk_drm_of_ids, > .pm = &mtk_drm_pm_ops, > }, > + .id_table = mtk_drm_ids, > }; > > static struct platform_driver * const mtk_drm_drivers[] = {