From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1993EECE562 for ; Fri, 21 Sep 2018 07:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB66A21547 for ; Fri, 21 Sep 2018 07:40:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB66A21547 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389502AbeIUN1n (ORCPT ); Fri, 21 Sep 2018 09:27:43 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:5369 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2389481AbeIUN1n (ORCPT ); Fri, 21 Sep 2018 09:27:43 -0400 X-UUID: 028053f4f8384db09560bb8af7ef80d7-20180921 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 374287492; Fri, 21 Sep 2018 15:39:54 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 21 Sep 2018 15:39:52 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Fri, 21 Sep 2018 15:39:52 +0800 Message-ID: <1537515592.20660.1.camel@mtksdaap41> Subject: Re: [PATCH v3 02/12] drm/mediatek: move hardware register to node data From: CK Hu To: Bibby Hsieh CC: David Airlie , Matthias Brugger , Daniel Vetter , , , Yingjoe Chen , Cawa Cheng , Daniel Kurtz , "Philipp Zabel" , YT Shen , "Thierry Reding" , Mao Huang , , , "Sascha Hauer" , chunhui dai Date: Fri, 21 Sep 2018 15:39:52 +0800 In-Reply-To: <20180921032822.30771-3-bibby.hsieh@mediatek.com> References: <20180921032822.30771-1-bibby.hsieh@mediatek.com> <20180921032822.30771-3-bibby.hsieh@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-SNTS-SMTP: 10B53D0C9EC26DAE4BDE6B7CC4C4B2F1E344C5BF338E36640D031A0FFF0540B22000:8 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Bibby: On Fri, 2018-09-21 at 11:28 +0800, Bibby Hsieh wrote: > From: chunhui dai > > The address of register DPI_H_FRE_CON is different in different IC. > Using of_node data to find this address. > Reviewed-by: CK Hu > Signed-off-by: chunhui dai > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 19 ++++++++++++++++--- > drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 1 - > 2 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index d9373e67d328..74a32833bde1 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -72,6 +73,7 @@ struct mtk_dpi { > struct clk *tvd_clk; > int irq; > struct drm_display_mode mode; > + const struct mtk_dpi_conf *conf; > enum mtk_dpi_out_color_format color_format; > enum mtk_dpi_out_yc_map yc_map; > enum mtk_dpi_out_bit_num bit_num; > @@ -117,6 +119,10 @@ struct mtk_dpi_yc_limit { > u16 c_bottom; > }; > > +struct mtk_dpi_conf { > + u32 reg_h_fre_con; > +}; > + > static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) > { > u32 tmp = readl(dpi->regs + offset) & ~mask; > @@ -342,7 +348,7 @@ static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, bool enable) > > static void mtk_dpi_config_2n_h_fre(struct mtk_dpi *dpi) > { > - mtk_dpi_mask(dpi, DPI_H_FRE_CON, H_FRE_2N, H_FRE_2N); > + mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, H_FRE_2N, H_FRE_2N); > } > > static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, > @@ -668,6 +674,10 @@ static const struct component_ops mtk_dpi_component_ops = { > .unbind = mtk_dpi_unbind, > }; > > +static const struct mtk_dpi_conf mt8173_conf = { > + .reg_h_fre_con = 0xe0, > +}; > + > static int mtk_dpi_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -682,6 +692,7 @@ static int mtk_dpi_probe(struct platform_device *pdev) > return -ENOMEM; > > dpi->dev = dev; > + dpi->conf = (struct mtk_dpi_conf *)of_device_get_match_data(dev); > > mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > dpi->regs = devm_ioremap_resource(dev, mem); > @@ -761,8 +772,10 @@ static int mtk_dpi_remove(struct platform_device *pdev) > } > > static const struct of_device_id mtk_dpi_of_ids[] = { > - { .compatible = "mediatek,mt8173-dpi", }, > - {} > + { .compatible = "mediatek,mt8173-dpi", > + .data = &mt8173_conf, > + }, > + { }, > }; > > struct platform_driver mtk_dpi_driver = { > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > index 4b6ad4751a31..040444d7718d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > +++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > @@ -223,6 +223,5 @@ > #define ESAV_CODE2 (0xFFF << 0) > #define ESAV_CODE3_MSB BIT(16) > > -#define DPI_H_FRE_CON 0xE0 > #define H_FRE_2N BIT(25) > #endif /* __MTK_DPI_REGS_H */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: CK Hu Subject: Re: [PATCH v3 02/12] drm/mediatek: move hardware register to node data Date: Fri, 21 Sep 2018 15:39:52 +0800 Message-ID: <1537515592.20660.1.camel@mtksdaap41> References: <20180921032822.30771-1-bibby.hsieh@mediatek.com> <20180921032822.30771-3-bibby.hsieh@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180921032822.30771-3-bibby.hsieh@mediatek.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Bibby Hsieh Cc: linux-kernel@vger.kernel.org, Sascha Hauer , chunhui dai , David Airlie , Daniel Vetter , Cawa Cheng , dri-devel@lists.freedesktop.org, Mao Huang , Thierry Reding , linux-mediatek@lists.infradead.org, Matthias Brugger , Yingjoe Chen , linux-arm-kernel@lists.infradead.org List-Id: linux-mediatek@lists.infradead.org SGksIEJpYmJ5OgoKT24gRnJpLCAyMDE4LTA5LTIxIGF0IDExOjI4ICswODAwLCBCaWJieSBIc2ll aCB3cm90ZToKPiBGcm9tOiBjaHVuaHVpIGRhaSA8Y2h1bmh1aS5kYWlAbWVkaWF0ZWsuY29tPgo+ IAo+IFRoZSBhZGRyZXNzIG9mIHJlZ2lzdGVyIERQSV9IX0ZSRV9DT04gaXMgZGlmZmVyZW50IGlu IGRpZmZlcmVudCBJQy4KPiBVc2luZyBvZl9ub2RlIGRhdGEgdG8gZmluZCB0aGlzIGFkZHJlc3Mu Cj4gCgpSZXZpZXdlZC1ieTogQ0sgSHUgPGNrLmh1QG1lZGlhdGVrLmNvbT4KCj4gU2lnbmVkLW9m Zi1ieTogY2h1bmh1aSBkYWkgPGNodW5odWkuZGFpQG1lZGlhdGVrLmNvbT4KPiAtLS0KPiAgZHJp dmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcGkuYyAgICAgIHwgMTkgKysrKysrKysrKysrKysr Ky0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RwaV9yZWdzLmggfCAgMSAtCj4g IDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcGkuYyBiL2RyaXZlcnMv Z3B1L2RybS9tZWRpYXRlay9tdGtfZHBpLmMKPiBpbmRleCBkOTM3M2U2N2QzMjguLjc0YTMyODMz YmRlMSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RwaS5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcGkuYwo+IEBAIC0xOCw2ICsxOCw3 IEBACj4gICNpbmNsdWRlIDxsaW51eC9jb21wb25lbnQuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3Bs YXRmb3JtX2RldmljZS5oPgo+ICAjaW5jbHVkZSA8bGludXgvb2YuaD4KPiArI2luY2x1ZGUgPGxp bnV4L29mX2RldmljZS5oPgo+ICAjaW5jbHVkZSA8bGludXgvb2ZfZ3JhcGguaD4KPiAgI2luY2x1 ZGUgPGxpbnV4L2ludGVycnVwdC5oPgo+ICAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KPiBAQCAt NzIsNiArNzMsNyBAQCBzdHJ1Y3QgbXRrX2RwaSB7Cj4gIAlzdHJ1Y3QgY2xrICp0dmRfY2xrOwo+ ICAJaW50IGlycTsKPiAgCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlIG1vZGU7Cj4gKwljb25zdCBz dHJ1Y3QgbXRrX2RwaV9jb25mICpjb25mOwo+ICAJZW51bSBtdGtfZHBpX291dF9jb2xvcl9mb3Jt YXQgY29sb3JfZm9ybWF0Owo+ICAJZW51bSBtdGtfZHBpX291dF95Y19tYXAgeWNfbWFwOwo+ICAJ ZW51bSBtdGtfZHBpX291dF9iaXRfbnVtIGJpdF9udW07Cj4gQEAgLTExNyw2ICsxMTksMTAgQEAg c3RydWN0IG10a19kcGlfeWNfbGltaXQgewo+ICAJdTE2IGNfYm90dG9tOwo+ICB9Owo+ICAKPiAr c3RydWN0IG10a19kcGlfY29uZiB7Cj4gKwl1MzIgcmVnX2hfZnJlX2NvbjsKPiArfTsKPiArCj4g IHN0YXRpYyB2b2lkIG10a19kcGlfbWFzayhzdHJ1Y3QgbXRrX2RwaSAqZHBpLCB1MzIgb2Zmc2V0 LCB1MzIgdmFsLCB1MzIgbWFzaykKPiAgewo+ICAJdTMyIHRtcCA9IHJlYWRsKGRwaS0+cmVncyAr IG9mZnNldCkgJiB+bWFzazsKPiBAQCAtMzQyLDcgKzM0OCw3IEBAIHN0YXRpYyB2b2lkIG10a19k cGlfY29uZmlnX3N3YXBfaW5wdXQoc3RydWN0IG10a19kcGkgKmRwaSwgYm9vbCBlbmFibGUpCj4g IAo+ICBzdGF0aWMgdm9pZCBtdGtfZHBpX2NvbmZpZ18ybl9oX2ZyZShzdHJ1Y3QgbXRrX2RwaSAq ZHBpKQo+ICB7Cj4gLQltdGtfZHBpX21hc2soZHBpLCBEUElfSF9GUkVfQ09OLCBIX0ZSRV8yTiwg SF9GUkVfMk4pOwo+ICsJbXRrX2RwaV9tYXNrKGRwaSwgZHBpLT5jb25mLT5yZWdfaF9mcmVfY29u LCBIX0ZSRV8yTiwgSF9GUkVfMk4pOwo+ICB9Cj4gIAo+ICBzdGF0aWMgdm9pZCBtdGtfZHBpX2Nv bmZpZ19jb2xvcl9mb3JtYXQoc3RydWN0IG10a19kcGkgKmRwaSwKPiBAQCAtNjY4LDYgKzY3NCwx MCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGNvbXBvbmVudF9vcHMgbXRrX2RwaV9jb21wb25lbnRf b3BzID0gewo+ICAJLnVuYmluZCA9IG10a19kcGlfdW5iaW5kLAo+ICB9Owo+ICAKPiArc3RhdGlj IGNvbnN0IHN0cnVjdCBtdGtfZHBpX2NvbmYgbXQ4MTczX2NvbmYgPSB7Cj4gKwkucmVnX2hfZnJl X2NvbiA9IDB4ZTAsCj4gK307Cj4gKwo+ICBzdGF0aWMgaW50IG10a19kcGlfcHJvYmUoc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiAgewo+ICAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBk ZXYtPmRldjsKPiBAQCAtNjgyLDYgKzY5Miw3IEBAIHN0YXRpYyBpbnQgbXRrX2RwaV9wcm9iZShz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICAJCXJldHVybiAtRU5PTUVNOwo+ICAKPiAg CWRwaS0+ZGV2ID0gZGV2Owo+ICsJZHBpLT5jb25mID0gKHN0cnVjdCBtdGtfZHBpX2NvbmYgKilv Zl9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoZGV2KTsKPiAgCj4gIAltZW0gPSBwbGF0Zm9ybV9nZXRf cmVzb3VyY2UocGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOwo+ICAJZHBpLT5yZWdzID0gZGV2bV9p b3JlbWFwX3Jlc291cmNlKGRldiwgbWVtKTsKPiBAQCAtNzYxLDggKzc3MiwxMCBAQCBzdGF0aWMg aW50IG10a19kcGlfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gIH0KPiAg Cj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG10a19kcGlfb2ZfaWRzW10gPSB7 Cj4gLQl7IC5jb21wYXRpYmxlID0gIm1lZGlhdGVrLG10ODE3My1kcGkiLCB9LAo+IC0Je30KPiAr CXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4MTczLWRwaSIsCj4gKwkgIC5kYXRhID0gJm10 ODE3M19jb25mLAo+ICsJfSwKPiArCXsgfSwKPiAgfTsKPiAgCj4gIHN0cnVjdCBwbGF0Zm9ybV9k cml2ZXIgbXRrX2RwaV9kcml2ZXIgPSB7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9t ZWRpYXRlay9tdGtfZHBpX3JlZ3MuaCBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHBp X3JlZ3MuaAo+IGluZGV4IDRiNmFkNDc1MWEzMS4uMDQwNDQ0ZDc3MThkIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHBpX3JlZ3MuaAo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9tZWRpYXRlay9tdGtfZHBpX3JlZ3MuaAo+IEBAIC0yMjMsNiArMjIzLDUgQEAKPiAg I2RlZmluZSBFU0FWX0NPREUyCQkJKDB4RkZGIDw8IDApCj4gICNkZWZpbmUgRVNBVl9DT0RFM19N U0IJCQlCSVQoMTYpCj4gIAo+IC0jZGVmaW5lIERQSV9IX0ZSRV9DT04JCTB4RTAKPiAgI2RlZmlu ZSBIX0ZSRV8yTgkJCUJJVCgyNSkKPiAgI2VuZGlmIC8qIF9fTVRLX0RQSV9SRUdTX0ggKi8KCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: ck.hu@mediatek.com (CK Hu) Date: Fri, 21 Sep 2018 15:39:52 +0800 Subject: [PATCH v3 02/12] drm/mediatek: move hardware register to node data In-Reply-To: <20180921032822.30771-3-bibby.hsieh@mediatek.com> References: <20180921032822.30771-1-bibby.hsieh@mediatek.com> <20180921032822.30771-3-bibby.hsieh@mediatek.com> Message-ID: <1537515592.20660.1.camel@mtksdaap41> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, Bibby: On Fri, 2018-09-21 at 11:28 +0800, Bibby Hsieh wrote: > From: chunhui dai > > The address of register DPI_H_FRE_CON is different in different IC. > Using of_node data to find this address. > Reviewed-by: CK Hu > Signed-off-by: chunhui dai > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 19 ++++++++++++++++--- > drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 1 - > 2 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index d9373e67d328..74a32833bde1 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -72,6 +73,7 @@ struct mtk_dpi { > struct clk *tvd_clk; > int irq; > struct drm_display_mode mode; > + const struct mtk_dpi_conf *conf; > enum mtk_dpi_out_color_format color_format; > enum mtk_dpi_out_yc_map yc_map; > enum mtk_dpi_out_bit_num bit_num; > @@ -117,6 +119,10 @@ struct mtk_dpi_yc_limit { > u16 c_bottom; > }; > > +struct mtk_dpi_conf { > + u32 reg_h_fre_con; > +}; > + > static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) > { > u32 tmp = readl(dpi->regs + offset) & ~mask; > @@ -342,7 +348,7 @@ static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, bool enable) > > static void mtk_dpi_config_2n_h_fre(struct mtk_dpi *dpi) > { > - mtk_dpi_mask(dpi, DPI_H_FRE_CON, H_FRE_2N, H_FRE_2N); > + mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, H_FRE_2N, H_FRE_2N); > } > > static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, > @@ -668,6 +674,10 @@ static const struct component_ops mtk_dpi_component_ops = { > .unbind = mtk_dpi_unbind, > }; > > +static const struct mtk_dpi_conf mt8173_conf = { > + .reg_h_fre_con = 0xe0, > +}; > + > static int mtk_dpi_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -682,6 +692,7 @@ static int mtk_dpi_probe(struct platform_device *pdev) > return -ENOMEM; > > dpi->dev = dev; > + dpi->conf = (struct mtk_dpi_conf *)of_device_get_match_data(dev); > > mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > dpi->regs = devm_ioremap_resource(dev, mem); > @@ -761,8 +772,10 @@ static int mtk_dpi_remove(struct platform_device *pdev) > } > > static const struct of_device_id mtk_dpi_of_ids[] = { > - { .compatible = "mediatek,mt8173-dpi", }, > - {} > + { .compatible = "mediatek,mt8173-dpi", > + .data = &mt8173_conf, > + }, > + { }, > }; > > struct platform_driver mtk_dpi_driver = { > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > index 4b6ad4751a31..040444d7718d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > +++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h > @@ -223,6 +223,5 @@ > #define ESAV_CODE2 (0xFFF << 0) > #define ESAV_CODE3_MSB BIT(16) > > -#define DPI_H_FRE_CON 0xE0 > #define H_FRE_2N BIT(25) > #endif /* __MTK_DPI_REGS_H */