From patchwork Fri Mar 4 10:54:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinliang Liu X-Patchwork-Id: 8502541 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90F9FC0553 for ; Fri, 4 Mar 2016 11:03:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9CED201FE for ; Fri, 4 Mar 2016 11:03:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DD853201F2 for ; Fri, 4 Mar 2016 11:03:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2BC756E198; Fri, 4 Mar 2016 11:03:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [IPv6:2607:f8b0:400e:c03::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 857206E07B for ; Fri, 4 Mar 2016 10:56:39 +0000 (UTC) Received: by mail-pa0-x230.google.com with SMTP id fy10so33167408pac.1 for ; Fri, 04 Mar 2016 02:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0hGVj0mUcyVWf+rLYVpxABlfyV3aYllfk8175lszkvg=; b=WliarIsJ6nG8qA79VMQ5xG3hZBEMKlVc50t715eSMUJ/tRcJFdxvjm9lNarlobipL2 btyzcScKA/Xz9cJQkMrXV0nkBjtJV3qbvwprTzRRYKdb9/0cug6ICd4omB4/SFBdlxDU JAjr9r+/TjuBajpY6+5nIdUezLrnq7DM9QBk0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0hGVj0mUcyVWf+rLYVpxABlfyV3aYllfk8175lszkvg=; b=j6Xb+geUEBo3iI5WB3VJ91EsoglXuej1EbDrCOGWDWYsV1PJyIaGEIGLKXsJAV31sH 6WKRZVS44Q4AxSRD7yq+/jmRxNcBlzD1X/MF+WtfGx49m+0y00p8BWyDVoW98dPFGz5g PNQ8n+E+5nGPVSJ9U2xm/fUfarIgVR9H8923KTMtYhNF+aqDqC+lAd6B/TsAFPv853Hw FflUOv83cFvAffvHulpyP12DqpuHnBoPmUk6YdLYdkaA9H/qx+aVXTyKvJr+JEuBIBX9 6J+KLCrYYJKto5A/qMkZTrOZbZv3gl3CNOHqzjcV1jOZWfxQMGK0pR4rbpRtDo5g0CKG M62g== X-Gm-Message-State: AD7BkJLNOdBbqxq+E73F92pLzW16gllWjzGYXYmrzbWe2a19LstKsOdfEPvBBljDCWJRFVWI X-Received: by 10.66.193.131 with SMTP id ho3mr10942569pac.154.1457088998966; Fri, 04 Mar 2016 02:56:38 -0800 (PST) Received: from localhost.localdomain ([116.25.57.242]) by smtp.gmail.com with ESMTPSA id c68sm4668805pfj.41.2016.03.04.02.56.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 02:56:38 -0800 (PST) From: Xinliang Liu To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, daniel@ffwll.ch, robh@kernel.org, daniel@fooishbar.org, architt@codeaurora.org, airlied@linux.ie, corbet@lwn.net, catalin.marinas@arm.com, will.deacon@arm.com, emil.l.velikov@gmail.com, mark.rutland@arm.com Subject: [PATCH v7 08/11] drm/hisilicon: Add designware dsi host driver Date: Fri, 4 Mar 2016 18:54:34 +0800 Message-Id: <1457088877-131022-9-git-send-email-xinliang.liu@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1457088877-131022-1-git-send-email-xinliang.liu@linaro.org> References: <1457088877-131022-1-git-send-email-xinliang.liu@linaro.org> X-Mailman-Approved-At: Fri, 04 Mar 2016 11:03:23 +0000 Cc: andy.green@linaro.org, xuyiping@hisilicon.com, guodong.xu@linaro.org, linux-doc@vger.kernel.org, w.f@huawei.com, zourongrong@huawei.com, linuxarm@huawei.com, xuwei5@hisilicon.com, bintian.wang@huawei.com, haojian.zhuang@linaro.org, benjamin.gaignard@linaro.org, puck.chen@hisilicon.com, liguozhu@hisilicon.com, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add DesignWare dsi host driver for hi6220 SoC. v7: None. v6: None. v5: None. v4: None. v3: None. v2: - Remove abtraction layer. Signed-off-by: Xinliang Liu Signed-off-by: Xinwei Kong Reviewed-by: Archit Taneja --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 1a930b77ec53..ea7711832959 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -80,6 +80,7 @@ struct dsi_hw_ctx { struct dw_dsi { struct drm_encoder encoder; + struct mipi_dsi_host host; struct drm_display_mode cur_mode; struct dsi_hw_ctx *ctx; struct mipi_phy_params phy; @@ -654,6 +655,51 @@ static int dw_drm_encoder_init(struct device *dev, return 0; } +static int dsi_host_attach(struct mipi_dsi_host *host, + struct mipi_dsi_device *mdsi) +{ + struct dw_dsi *dsi = host_to_dsi(host); + + if (mdsi->lanes < 1 || mdsi->lanes > 4) { + DRM_ERROR("dsi device params invalid\n"); + return -EINVAL; + } + + dsi->lanes = mdsi->lanes; + dsi->format = mdsi->format; + dsi->mode_flags = mdsi->mode_flags; + + return 0; +} + +static int dsi_host_detach(struct mipi_dsi_host *host, + struct mipi_dsi_device *mdsi) +{ + /* do nothing */ + return 0; +} + +static const struct mipi_dsi_host_ops dsi_host_ops = { + .attach = dsi_host_attach, + .detach = dsi_host_detach, +}; + +static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) +{ + struct mipi_dsi_host *host = &dsi->host; + int ret; + + host->dev = dev; + host->ops = &dsi_host_ops; + ret = mipi_dsi_host_register(host); + if (ret) { + DRM_ERROR("failed to register dsi host\n"); + return ret; + } + + return 0; +} + static int dsi_bind(struct device *dev, struct device *master, void *data) { struct dsi_data *ddata = dev_get_drvdata(dev); @@ -665,6 +711,10 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; + ret = dsi_host_init(dev, dsi); + if (ret) + return ret; + return 0; }