From patchwork Mon Sep 15 13:13:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4905221 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99C2EBEEA5 for ; Mon, 15 Sep 2014 13:14:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED50020149 for ; Mon, 15 Sep 2014 13:14:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A57C520274 for ; Mon, 15 Sep 2014 13:14:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753500AbaIONNb (ORCPT ); Mon, 15 Sep 2014 09:13:31 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34983 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753349AbaIONNa (ORCPT ); Mon, 15 Sep 2014 09:13:30 -0400 Received: by mail-pa0-f46.google.com with SMTP id kq14so6344842pab.19 for ; Mon, 15 Sep 2014 06:13:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=trBGLjXwDP0Q6CvJStQOBKNpWBdMHnO7pzDp6DBj8qQ=; b=sk80wn8JzfwezMJPnvGwm9If6h9sKM62QbIYRaWFrDsuxQnkBWbbVaZVjLkAKVm4Oz kMp8b5N5IvtMSl8F8xIWKPWNAS8KC7xCb1co/fba7Ou9z6gcvtt64xkRKyzgn42wuVmX uyVHl2QEe2VsF6i7LLJKTB2VNSIaGC/QBWvSVt1cO3tkyDe0Q2Zc2sOtzij9Mr9IcaXL EC16hhI3j8MrqowE+AYmE2gXuteHeE0Zc+7PoILNW7TIval1oJ5jMUuIbEWgWWof+Ej1 lhbmO0n7Wl2/LrZTWML2PlV5OfGPvEe+iIzhOG2MEKAYh49NKP7bmdrn7zJQMu+lrqJo igbQ== X-Received: by 10.66.244.132 with SMTP id xg4mr35269290pac.64.1410786809774; Mon, 15 Sep 2014 06:13:29 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id yh3sm11451581pbb.38.2014.09.15.06.13.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Sep 2014 06:13:28 -0700 (PDT) From: Vivek Gautam To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: inki.dae@samsung.com, seanpaul@google.com, kishon@ti.com, ajaykumar.rs@samsung.com, Vivek Gautam , Jingoo Han Subject: [PATCH 2/3] drm/exynos: dp: Remove support for unused dptx-phy Date: Mon, 15 Sep 2014 18:43:04 +0530 Message-Id: <1410786785-9838-3-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410786785-9838-1-git-send-email-gautam.vivek@samsung.com> References: <1410786785-9838-1-git-send-email-gautam.vivek@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Now that we have moved to generic phy based bindings, we don't need to have any code related to older dptx-phy. Nobody is using this dptx-phy anymore, so removing the same. Signed-off-by: Vivek Gautam Cc: Jingoo Han --- drivers/gpu/drm/exynos/exynos_dp_core.c | 58 +++++++------------------------ drivers/gpu/drm/exynos/exynos_dp_core.h | 2 -- 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c index 4f3c7eb..5ffc1b2 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.c +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c @@ -1050,28 +1050,14 @@ static int exynos_dp_create_connector(struct exynos_drm_display *display, static void exynos_dp_phy_init(struct exynos_dp_device *dp) { - if (dp->phy) { + if (dp->phy) phy_power_on(dp->phy); - } else if (dp->phy_addr) { - u32 reg; - - reg = __raw_readl(dp->phy_addr); - reg |= dp->enable_mask; - __raw_writel(reg, dp->phy_addr); - } } static void exynos_dp_phy_exit(struct exynos_dp_device *dp) { - if (dp->phy) { + if (dp->phy) phy_power_off(dp->phy); - } else if (dp->phy_addr) { - u32 reg; - - reg = __raw_readl(dp->phy_addr); - reg &= ~(dp->enable_mask); - __raw_writel(reg, dp->phy_addr); - } } static void exynos_dp_poweron(struct exynos_drm_display *display) @@ -1210,39 +1196,21 @@ static struct video_info *exynos_dp_dt_parse_pdata(struct device *dev) static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) { - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node); - u32 phy_base; int ret = 0; - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy"); - if (!dp_phy_node) { - dp->phy = devm_phy_get(dp->dev, "dp"); - return PTR_ERR_OR_ZERO(dp->phy); - } - - if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { - dev_err(dp->dev, "failed to get reg for dptx-phy\n"); - ret = -EINVAL; - goto err; - } - - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask", - &dp->enable_mask)) { - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n"); - ret = -EINVAL; - goto err; - } - - dp->phy_addr = ioremap(phy_base, SZ_4); - if (!dp->phy_addr) { - dev_err(dp->dev, "failed to ioremap dp-phy\n"); - ret = -ENOMEM; - goto err; + dp->phy = devm_phy_get(dp->dev, "dp"); + if (IS_ERR(dp->phy)) { + ret = PTR_ERR(dp->phy); + if (ret == -ENOSYS || ret == -ENODEV) { + dp->phy = NULL; + } else if (ret == -EPROBE_DEFER) { + return ret; + } else { + dev_err(dp->dev, "no DP phy configured\n"); + return ret; + } } -err: - of_node_put(dp_phy_node); - return ret; } diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.h b/drivers/gpu/drm/exynos/exynos_dp_core.h index a1aee69..6426201 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.h +++ b/drivers/gpu/drm/exynos/exynos_dp_core.h @@ -153,8 +153,6 @@ struct exynos_dp_device { struct clk *clock; unsigned int irq; void __iomem *reg_base; - void __iomem *phy_addr; - unsigned int enable_mask; struct video_info *video_info; struct link_train link_train;