From patchwork Tue Mar 19 10:40:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 160543 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3711691jad; Tue, 19 Mar 2019 03:42:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjxAby8wJLWBOSN37GWjyISezEU2UzHTdqULkv/EQ8YuGaIwUUMF904t9LgIBteUPztU02 X-Received: by 2002:a63:4247:: with SMTP id p68mr1194228pga.30.1552992145228; Tue, 19 Mar 2019 03:42:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552992145; cv=none; d=google.com; s=arc-20160816; b=rcu+Cl9Ej+t5JTno+gwHJEKf+fdWiqfLFExdRKOWQ9/SsSfSo6HrKQ3QhThllIJFYf lwa4Y/fvztnJoftNcKGWy9/abeSPcRqfL5+P8lapArWdY3DAY07NzuVQgpar9aXZTsdB nJxx6dRzoaYyM3d90fZSPQpB0wD7/ZpI2lDjp3fU8gnolGDpabw85NW9JaRI5uDU4ezs HDvQn74yzmPsqnoub4RGqyCdWQopk3wF5Ssxegmjfvn2OBiFMFOwKyKAQLVikm9zaUSs Va0Hdb65xn054WuYPNPZ+UNl4id54sFEVNGT/+SqJ+RwZxnkd/LoX+Yzfl+qlqq+sPaL cVgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=GXmprNVfVUAFT95/VEseq5rxHD9LJRvw8LHZ9MwJpyE=; b=0hytgowcdwDi1V8zG6xPpSJidWH5uws8FlPAJ02ejLy762tssH0FD0kEkR4sKHogE+ u521wmTjW96RCI5T3cLNt/Maiv6rUJx3upj3xqY3/AyV/TYovDVQMD9EhLvZMAtvI8XO NxfuklQ3KpLixPRr4MzK1EBR6bLTksXSkc7HvP1M+nfai3+PqzGfEJ+KzJgkJV/NYo0g YSbygwlli8D1ymizi2qGeptgb80sZ/MCaZ0T1ry8+p+UmKFGlFCC4+aKJBHxzW9iaYwz Pqi4rENTTPjY1ZuDhQoJRCUBQqR0ImIq9Xku7k7RxbhqBRagj+gglbEv1RzB1Ue2tVHG aHMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id u2si11387104pgp.549.2019.03.19.03.42.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 03:42:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF63589A61; Tue, 19 Mar 2019 10:42:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E3678947A for ; Tue, 19 Mar 2019 10:42:19 +0000 (UTC) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2JAgGL2076697; Tue, 19 Mar 2019 05:42:16 -0500 Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2JAgGiP114177 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 19 Mar 2019 05:42:16 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 19 Mar 2019 05:42:15 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5 via Frontend Transport; Tue, 19 Mar 2019 05:42:15 -0500 Received: from deskari.lan (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2JAfxlP019091; Tue, 19 Mar 2019 05:42:13 -0500 From: Tomi Valkeinen To: Andrzej Hajda , Laurent Pinchart , , Lucas Stach , Andrey Gusakov , Philipp Zabel , Jyri Sarha , Peter Ujfalusi , Benoit Parrot Subject: [PATCH 06/21] drm/bridge: tc358767: cleanup aux_link_setup Date: Tue, 19 Mar 2019 12:40:59 +0200 Message-ID: <20190319104114.12077-7-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319104114.12077-1-tomi.valkeinen@ti.com> References: <20190319104114.12077-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1552992136; bh=2zo6Xp49jlHLD1KAJyE9hz3qgK2MS8vm3VL3LYnaSSo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=uhVIEodeQW+l1e0l7fxWPyZlcpJ7SRXpzAt/cQ9D7/OAUYcJola3Unzhm/3aOB+aB 0Ff7AUdqnkr0RU1bm14RmmMCCiPytDVhMwFhAiU+nIMJXE7zC1HJQUcSohIXCWLZwI bI+3+lGJj5929GGUzqAYmt7+3m9VQ1oAvupqwwPQ= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Modify aux_link_setup so that it does not use tc->link, and thus makes aux setup independent of the link probing. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/bridge/tc358767.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 7ef8d754b4ff..f5c232a9064e 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -542,7 +542,6 @@ static int tc_aux_link_setup(struct tc_data *tc) unsigned long rate; u32 value; int ret; - u32 dp_phy_ctrl; rate = clk_get_rate(tc->refclk); switch (rate) { @@ -567,10 +566,7 @@ static int tc_aux_link_setup(struct tc_data *tc) value |= SYSCLK_SEL_LSCLK | LSCLK_DIV_2; tc_write(SYS_PLLPARAM, value); - dp_phy_ctrl = BGREN | PWR_SW_EN | PHY_A0_EN; - if (tc->link.base.num_lanes == 2) - dp_phy_ctrl |= PHY_2LANE; - tc_write(DP_PHY_CTRL, dp_phy_ctrl); + tc_write(DP_PHY_CTRL, BGREN | PWR_SW_EN | PHY_A0_EN); /* * Initially PLLs are in bypass. Force PLL parameter update, @@ -587,8 +583,9 @@ static int tc_aux_link_setup(struct tc_data *tc) if (ret == -ETIMEDOUT) { dev_err(tc->dev, "Timeout waiting for PHY to become ready"); return ret; - } else if (ret) + } else if (ret) { goto err; + } /* Setup AUX link */ tc_write(DP0_AUXCFG1, AUX_RX_FILTER_EN |