From patchwork Wed Aug 19 11:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11723657 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26F1E618 for ; Wed, 19 Aug 2020 11:47:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 058732078D for ; Wed, 19 Aug 2020 11:47:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="iMe/JyEH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 058732078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DA336E2BE; Wed, 19 Aug 2020 11:47:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1AD586E249 for ; Wed, 19 Aug 2020 11:46:24 +0000 (UTC) Received: from mail.kernel.org (ip5f5ad5a3.dynamic.kabel-deutschland.de [95.90.213.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BED3A22E01; Wed, 19 Aug 2020 11:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597837582; bh=/MsFR5yo97fbYiaXe78ATOp4uwBvaZayZe6OISEBmvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iMe/JyEHABNJs5BK5WR1YdbBbJBRLkbUKn8W83UpWRHD8sP4WHbny2L3bW6bJvry6 EwScYlyHiJxNqDp2BRyz5+w/GLXAQf7FNjFAPBbIsA3EOPtq/54KLNZTZt9MqAL0CY HCRs504EnPbVxJqkXKrqmFm6zOjsFV/+2tSVRsU0= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k8MXs-00EubS-MD; Wed, 19 Aug 2020 13:46:20 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Subject: [PATCH 34/49] staging: hikey9xx/gpu: add support for enable/disable ldo3 regulator Date: Wed, 19 Aug 2020 13:46:02 +0200 Message-Id: <625c83a9df80e4ee3df88e920aa7636cc037fbac.1597833138.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Liwei Cai , Manivannan Sadhasivam , Mauro Carvalho Chehab , Chen Feng , Wanchun Zheng , linuxarm@huawei.com, dri-devel , Xiubin Zhang , Liuyao An , mauro.chehab@huawei.com, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is needed for the DRM to work. Ok, right now, this is enabled on default fastboot logic, but, as soon as we enable the proper SPMI driver, such code is needed. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 4 +--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 6 +++--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 8 -------- drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 4 +--- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h index 9c1b62831733..0c6b6eb9dcab 100644 --- a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +++ b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h @@ -41,9 +41,7 @@ #define FB_ACCEL_PLATFORM_TYPE_ASIC 0x20000000 //ASIC /* vcc name */ -#define REGULATOR_PDP_NAME "regulator_dsssubsys" -#define REGULATOR_MMBUF "regulator_mmbuf" -#define REGULATOR_MEDIA_NAME "regulator_media_subsys" +#define REGULATOR_PDP_NAME "ldo3" /******************************************************************************* ** diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c index a15c335da026..3b8ff0bdd359 100644 --- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c @@ -967,13 +967,13 @@ int dpe_regulator_enable(struct dss_hw_ctx *ctx) { int ret = 0; - DRM_INFO("+. \n"); + DRM_INFO("enabling DPE regulator\n"); if (NULL == ctx) { DRM_ERROR("NULL ptr.\n"); return -EINVAL; } - //ret = regulator_enable(ctx->dpe_regulator); + ret = regulator_enable(ctx->dpe_regulator); if (ret) { DRM_ERROR(" dpe regulator_enable failed, error=%d!\n", ret); return -EINVAL; @@ -998,7 +998,7 @@ int dpe_regulator_disable(struct dss_hw_ctx *ctx) dpe_set_common_clk_rate_on_pll0(ctx); #endif - //ret = regulator_disable(ctx->dpe_regulator); + ret = regulator_disable(ctx->dpe_regulator); if (ret != 0) { DRM_ERROR("dpe regulator_disable failed, error=%d!\n", ret); return -EINVAL; diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c index 0844bf372ca8..fe5b371734fe 100644 --- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c @@ -873,20 +873,12 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx) DRM_INFO("dss irq = %d. \n", ctx->irq); -#ifndef DSS_POWER_UP_ON_UEFI #if defined (CONFIG_DRM_HISI_KIRIN970) ctx->dpe_regulator = devm_regulator_get(dev, REGULATOR_PDP_NAME); if (!ctx->dpe_regulator) { DRM_ERROR("failed to get dpe_regulator resource! ret=%d.\n", ret); return -ENXIO; } - - ctx->mediacrg_regulator = devm_regulator_get(dev, REGULATOR_MEDIA_NAME); - if (!ctx->mediacrg_regulator) { - DRM_ERROR("failed to get mediacrg_regulator resource! ret=%d.\n", ret); - return -ENXIO; - } -#endif #endif ctx->dss_mmbuf_clk = devm_clk_get(dev, "clk_dss_axi_mm"); diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h b/drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h index 0f69af49a355..83e79a4350c1 100644 --- a/drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h +++ b/drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h @@ -38,9 +38,7 @@ #define DEV_NAME_LCD_BKL "lcd_backlight0" /* vcc name */ -#define REGULATOR_PDP_NAME "regulator_dsssubsys" -#define REGULATOR_MMBUF "regulator_mmbuf" -#define REGULATOR_MEDIA_NAME "regulator_media_subsys" +#define REGULATOR_PDP_NAME "ldo3" /* irq name */