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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 8FD54C43381 for ; Wed, 27 Feb 2019 16:24:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53D2D20C01 for ; Wed, 27 Feb 2019 16:24:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="W51+FEil" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730291AbfB0QYo (ORCPT ); Wed, 27 Feb 2019 11:24:44 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:4752 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726223AbfB0QYn (ORCPT ); Wed, 27 Feb 2019 11:24:43 -0500 X-IronPort-AV: E=Sophos;i="5.58,420,1544511600"; d="scan'208";a="25323669" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Feb 2019 09:24:43 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.107) with Microsoft SMTP Server (TLS) id 14.3.352.0; Wed, 27 Feb 2019 09:24:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f2LlApE9KLEwvJ1Xgh4TXz5Ls7//fcDvuKAIwlZx2AU=; b=W51+FEil8MeZFAnmu3A49xgTeULdwIRsFHPKknqgzzvjEIdE/Hopt9qVXmyy+U4PQjIu04Q4LcrkrwOJMBznNd6eSlprKVCiIjdY+692yp38mcAJEsmwb8A4cvNAXNXSymzIABkZAYjioXauP972Qd6LYI5VBz2ZVmuNNIiTi1I= Received: from MWHPR11MB1549.namprd11.prod.outlook.com (10.172.54.17) by MWHPR11MB1806.namprd11.prod.outlook.com (10.175.53.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.21; Wed, 27 Feb 2019 16:24:40 +0000 Received: from MWHPR11MB1549.namprd11.prod.outlook.com ([fe80::54fe:95ed:b0cf:55a6]) by MWHPR11MB1549.namprd11.prod.outlook.com ([fe80::54fe:95ed:b0cf:55a6%8]) with mapi id 15.20.1643.022; Wed, 27 Feb 2019 16:24:40 +0000 From: To: , , , , , , , , , CC: , , , , , , Subject: [PATCH 6/7] drm: atmel-hlcdc: enable sys_clk during initalization. Thread-Topic: [PATCH 6/7] drm: atmel-hlcdc: enable sys_clk during initalization. Thread-Index: AQHUzrjwAYRRhdyfPkqrFMqRJO5EaA== Date: Wed, 27 Feb 2019 16:24:40 +0000 Message-ID: <1551284609-14594-7-git-send-email-claudiu.beznea@microchip.com> References: <1551284609-14594-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1551284609-14594-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR08CA0112.eurprd08.prod.outlook.com (2603:10a6:800:d4::14) To MWHPR11MB1549.namprd11.prod.outlook.com (2603:10b6:301:c::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5153c137-2c2e-4142-5950-08d69cd012ce x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:MWHPR11MB1806; x-ms-traffictypediagnostic: MWHPR11MB1806: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;MWHPR11MB1806;23:wU4N65EdWtaeha6HAdZE4GkSWr67vyjIHRXluDQ?= =?iso-8859-1?Q?vBElUgZuwdd+nI48b3VtRR65PKp7YqNADPhVBEuKuQm+qW0R/ZZGwWEEiY?= =?iso-8859-1?Q?zkmM7pFJEa9hhjvqlQWze0kfCqTYkqFrCxYGeHZrFrvcoIEc14ZRTTYD/n?= =?iso-8859-1?Q?siZg53mi885VvGgnt5AVu4m5/EnLpQmzCoAYMChiHrhhNincZrfL5BEtRI?= =?iso-8859-1?Q?LNS1MjoUOzA0uFImznzKoIUP4bGRsfM/M+WAXrPDNizPj82FXCTPdGCdJ8?= =?iso-8859-1?Q?jwo9fI3sQJNwGqnddHC1KU5ogfYMPzRupEY+/0BE3dETqk6LhUfy1kSzey?= =?iso-8859-1?Q?+1XPenS61r9OGYmGs2bbQeiXPJ7HeOtHgco2/hOQ99zkSAMoaZG/pzWE7k?= =?iso-8859-1?Q?it9WOyUIQsuoCetbfWAFZvJ3xGjdUG0Pas0XtMFMUsZzDLiT+sizjY2E64?= =?iso-8859-1?Q?rv9Im8lf1dROU0U+lGVynf1UkBu0mFFaQYGq1gKsrf878PxFvVvHACx9J3?= =?iso-8859-1?Q?LQMjNwN+F4du8V01KUdf9f+seGIoyhF9e3h4HIDDFzxvHRM7Mr1GAusS3j?= =?iso-8859-1?Q?g8gH+5ODxQZoUSqpu9hyEpx1JnusiiOvs3XQQOZKAfgAhXFMFz31+/Bk6I?= =?iso-8859-1?Q?Q5t7rZtYF3zOi5O37I7IZhZ+kj8QX+Y43UM/tLTE1wBQBxDorXwV3EZP55?= =?iso-8859-1?Q?+TGL4pCk10FAXROR3YW9qsUva1nZlA7qcm6KZ7VN8ceUzM6xwGa7DGsiq3?= =?iso-8859-1?Q?KxBpn4jZrXxCpXSmwTZBPKGRBYdmAswu6RgO0bCVZuBDs/Simmv1gHuoub?= =?iso-8859-1?Q?yu8Nnbwxaf5E6uOtgtxJV2fFObquInQqKdH4oLRkxw2SctuhRdkAq3QGQk?= =?iso-8859-1?Q?dcN73xOoZEtO61b68cejrxFMjhF1H7sdyVwln8cmyCXB1JFDIHEheW4kZn?= =?iso-8859-1?Q?BuCIvM+XOWuWrOvdE97C57v+jjJIu2+Ebg8b/KWjzBg8gR5syWUM16gdpt?= =?iso-8859-1?Q?WTB5oCHaK2+aHu0ZA0mVVhkfrRx0ICYUQZBhKgV3wCk3PVGBuJ7kOQ//wF?= =?iso-8859-1?Q?bUvrmc51e7cPtVi8ss7ItY35X2qGNJiOC/8ny+74Oj8JuGvD8n2JqNKc5V?= =?iso-8859-1?Q?ypBmjhde/O0xDiVohSMZplXL1Z9ik6biuwGZ8pqjsmZMd4KfHFRj9qh4Or?= =?iso-8859-1?Q?MBUVwCDexsdnNARmtyyfyL6vTR2V/CvjhNC8m+B5YyLqBvhEzl4CXvpjXE?= =?iso-8859-1?Q?hY3ei7N6LhYw8gDt1iqPDaY0R7MkPWsSLzGup7AhsZdTDDadV+naIJAiHD?= =?iso-8859-1?Q?bQgOOJnGgV8yFqIuvzE5/gecEYyPafpJ7cAx0b4K4l/f7lvV5pfIY4Ez8Z?= =?iso-8859-1?Q?cgCxcuSQSM4c3pSY78U0v1oKkoFcQ?= x-microsoft-antispam-prvs: x-forefront-prvs: 0961DF5286 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(396003)(366004)(136003)(376002)(189003)(199004)(11346002)(105586002)(25786009)(6436002)(8936002)(36756003)(4326008)(66066001)(6486002)(486006)(476003)(76176011)(50226002)(52116002)(186003)(107886003)(72206003)(99286004)(478600001)(2616005)(7416002)(68736007)(110136005)(14454004)(2201001)(71190400001)(6116002)(6506007)(86362001)(446003)(71200400001)(386003)(97736004)(8676002)(3846002)(53936002)(81156014)(54906003)(14444005)(81166006)(256004)(2501003)(316002)(305945005)(6512007)(7736002)(26005)(102836004)(2906002)(106356001)(5660300002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR11MB1806;H:MWHPR11MB1549.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: xEo9pd9SV4OiaKgDnXpvzSdbDr7jWKC34+OGPJBB2w2mjVNt6c1QoAWoqUGlTJ8nBE9Z3FtKSZqQ9Cg37IDQy1EEXJsvMIJb585Tk1LY5+1WpsrYWUZKjJdcfWf3UXLquB2wxrR1702lXXjpb8ga18ZNMX4mIMAcIljQAikUdyrFxee+tvWlqW5LE7IshvZ2wWT+Eu9HqDs306b8F7jL0WhSV11qsUzNbink73rUXvm0GSczk6mAeeCztJVe8aItj3rnqd0EeKlQL2Xn78tG+1S/hc7/4aw0BsWgBL2OgROi5g+wOpS7Nc4dWFc9C/Set9C7FIyhI7hg75l3ExQVGkTmilUC9xrHS6iO8J6GdfkfphXJzDIjNi0HPC6C1bn8Gvdxbv6p2YrZMjbtnwQ/Zg7Cc2pSIW2z+pml2x+UrfE= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5153c137-2c2e-4142-5950-08d69cd012ce X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2019 16:24:35.4217 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1806 X-OriginatorOrg: microchip.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sandeep Sheriker Mallikarjun For SAM9X60 SoC, sys_clk is through lcd_gclk clock source and this needs to be enabled before enabling lcd_clk. Signed-off-by: Sandeep Sheriker Mallikarjun [claudiu.beznea@microchip.com: add fixed_clksrc checks] Signed-off-by: Claudiu Beznea --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm= /atmel-hlcdc/atmel_hlcdc_dc.c index 0be13eceedba..8bf51f853721 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -625,10 +625,18 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev= ) dc->hlcdc =3D dev_get_drvdata(dev->dev->parent); dev->dev_private =3D dc; =20 + if (dc->desc->fixed_clksrc) { + ret =3D clk_prepare_enable(dc->hlcdc->sys_clk); + if (ret) { + dev_err(dev->dev, "failed to enable sys_clk\n"); + goto err_destroy_wq; + } + } + ret =3D clk_prepare_enable(dc->hlcdc->periph_clk); if (ret) { dev_err(dev->dev, "failed to enable periph_clk\n"); - goto err_destroy_wq; + goto err_sys_clk_disable; } =20 pm_runtime_enable(dev->dev); @@ -664,6 +672,9 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) err_periph_clk_disable: pm_runtime_disable(dev->dev); clk_disable_unprepare(dc->hlcdc->periph_clk); +err_sys_clk_disable: + if (dc->desc->fixed_clksrc) + clk_disable_unprepare(dc->hlcdc->sys_clk); =20 err_destroy_wq: destroy_workqueue(dc->wq); @@ -688,6 +699,8 @@ static void atmel_hlcdc_dc_unload(struct drm_device *de= v) =20 pm_runtime_disable(dev->dev); clk_disable_unprepare(dc->hlcdc->periph_clk); + if (dc->desc->fixed_clksrc) + clk_disable_unprepare(dc->hlcdc->sys_clk); destroy_workqueue(dc->wq); } =20 @@ -805,6 +818,8 @@ static int atmel_hlcdc_dc_drm_suspend(struct device *de= v) regmap_read(regmap, ATMEL_HLCDC_IMR, &dc->suspend.imr); regmap_write(regmap, ATMEL_HLCDC_IDR, dc->suspend.imr); clk_disable_unprepare(dc->hlcdc->periph_clk); + if (dc->desc->fixed_clksrc) + clk_disable_unprepare(dc->hlcdc->sys_clk); =20 return 0; } @@ -814,6 +829,8 @@ static int atmel_hlcdc_dc_drm_resume(struct device *dev= ) struct drm_device *drm_dev =3D dev_get_drvdata(dev); struct atmel_hlcdc_dc *dc =3D drm_dev->dev_private; =20 + if (dc->desc->fixed_clksrc) + clk_prepare_enable(dc->hlcdc->sys_clk); clk_prepare_enable(dc->hlcdc->periph_clk); regmap_write(dc->hlcdc->regmap, ATMEL_HLCDC_IER, dc->suspend.imr); =20 --=20 2.7.4