From patchwork Tue Oct 1 23:40:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 2972681 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 672B5BFF0B for ; Tue, 1 Oct 2013 23:42:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97927203AE for ; Tue, 1 Oct 2013 23:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC017203AD for ; Tue, 1 Oct 2013 23:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753288Ab3JAXla (ORCPT ); Tue, 1 Oct 2013 19:41:30 -0400 Received: from mail-qc0-f176.google.com ([209.85.216.176]:62130 "EHLO mail-qc0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992Ab3JAXlS (ORCPT ); Tue, 1 Oct 2013 19:41:18 -0400 Received: by mail-qc0-f176.google.com with SMTP id t7so33627qcv.35 for ; Tue, 01 Oct 2013 16:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Kx6rNYfVzkmO1J6mEb6a16/2CLqv5+7qGto3x3YC6Sg=; b=O9Wdyze+/ELwwUUxCx+Ceqp9NupYaFKZDRCQ1IUUX1cKKOBrcZgNOnVnIkjbYyq5x8 t8VC4DOjpu9O+DSsEE1fVTfgHGqVYmSXNx2CktgkTgv+6eMqiHvNjvwxBJ36Zg7Ot0DD xgDJfMej5f+4jxSjuENtqO/Y3kX/OUHdjK0DE= 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=Kx6rNYfVzkmO1J6mEb6a16/2CLqv5+7qGto3x3YC6Sg=; b=is3rCMplSdqik+Tm7tUCJmZAifjskkBaN96vP90vSV6DRo8b3PAXFhG+rvDRBnmvtW qBBAjtz8IWITSdkIr9+6MzN79+KWnxpbJuYlz27kTj0ETLS1x+ZrAoUWlpB7m5CGtyay PifVJ7E0mSAohU0TvPCgHF5IlUOAoLTwKaxY7924Npubmjfgwn2Bs54UQYI0pgClZfaX yQJw/1b7+MR5ztv2DMTj0g0ZZjTViWIi6bw+L4EdlllpA37BDJT3dUVDuqX0tL61xPd5 eZLquG7pcbwFcC6DAhcaGlHuX90AfPXGQsG4cRQsnFWiV0oHOWlo7ANjd2h2wHJtXh47 WLRA== X-Gm-Message-State: ALoCoQnWAZdEoeXnrL3QCKeuOu/tKGNAdusMucut6E61oKBJohe+gx7jkQaVwyWABAn2j8XDiPV5 X-Received: by 10.224.92.81 with SMTP id q17mr19012651qam.92.1380670877490; Tue, 01 Oct 2013 16:41:17 -0700 (PDT) Received: from seanpaul-glaptop.roam.corp.google.com (cpe-173-095-180-236.nc.res.rr.com. [173.95.180.236]) by mx.google.com with ESMTPSA id x8sm19199109qam.2.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 16:41:16 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, devicetree@vger.kernel.org, inki.dae@samsung.com Cc: airlied@linux.ie, Sean Paul Subject: [PATCH 4/5] drm/exynos: Initialize ptn3460 if present Date: Tue, 1 Oct 2013 19:40:59 -0400 Message-Id: <1380670860-17621-5-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1380670860-17621-1-git-send-email-seanpaul@chromium.org> References: <1380670860-17621-1-git-send-email-seanpaul@chromium.org> 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 This patch adds code to look for the ptn3460 in the device tree file on exynos initialization. If ptn node is found, the driver will initialize the ptn3460 driver and skip creating a DP connector (since the bridge driver will register its own connector). Signed-off-by: Sean Paul --- drivers/gpu/drm/exynos/exynos_drm_core.c | 44 +++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c index 1bef6dc..9cf4476 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_core.c +++ b/drivers/gpu/drm/exynos/exynos_drm_core.c @@ -12,7 +12,9 @@ * option) any later version. */ +#include #include +#include #include "exynos_drm_drv.h" #include "exynos_drm_encoder.h" #include "exynos_drm_connector.h" @@ -20,6 +22,40 @@ static LIST_HEAD(exynos_drm_subdrv_list); +struct bridge_init { + struct i2c_client *client; + struct device_node *node; +}; + +static bool find_bridge(const char *name, struct bridge_init *bridge) +{ + bridge->client = NULL; + bridge->node = of_find_node_by_name(NULL, name); + if (!bridge->node) + return false; + + bridge->client = of_find_i2c_device_by_node(bridge->node); + if (!bridge->client) + return false; + + return true; +} + +/* returns the number of bridges attached */ +static int exynos_drm_attach_lcd_bridge(struct drm_device *dev, + struct drm_encoder *encoder) +{ + struct bridge_init bridge; + int ret; + + if (find_bridge("ptn3460-bridge", &bridge)) { + ret = ptn3460_init(dev, encoder, bridge.client, bridge.node); + if (!ret) + return 1; + } + return 0; +} + static int exynos_drm_create_enc_conn(struct drm_device *dev, struct exynos_drm_subdrv *subdrv) { @@ -36,6 +72,13 @@ static int exynos_drm_create_enc_conn(struct drm_device *dev, DRM_ERROR("failed to create encoder\n"); return -EFAULT; } + subdrv->encoder = encoder; + + if (subdrv->manager->display_ops->type == EXYNOS_DISPLAY_TYPE_LCD) { + ret = exynos_drm_attach_lcd_bridge(dev, encoder); + if (ret) + return 0; + } /* * create and initialize a connector for this sub driver and @@ -48,7 +91,6 @@ static int exynos_drm_create_enc_conn(struct drm_device *dev, goto err_destroy_encoder; } - subdrv->encoder = encoder; subdrv->connector = connector; return 0;