From patchwork Fri May 3 12:29:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 163305 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp546398ill; Fri, 3 May 2019 05:31:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMF2G1r8dftOVel9/6w/k0e5/E6d4osYUcRoQHulX1hroS73YYX+BnnN0J4eN/5ncHptZ9 X-Received: by 2002:a17:902:9a0c:: with SMTP id v12mr10039472plp.184.1556886660252; Fri, 03 May 2019 05:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556886660; cv=none; d=google.com; s=arc-20160816; b=BpLmktF1Qurr3KUkj4qm+eCYy19mIMFpoaEsYHvtWVs+boFBM7JNG9c6KWGZqm+8sD QqSSTTkUzb+7mlcdzkr+IG2J9rrV96besNueazBAea0RQrsMlHcPaxEXxcRV1Yk8moVu SVrfWxLN46o58J/asHH5aaCYbeWGnskKiM40lIYhSBFxJwhJz/d5kRA50bL936pXiYmr KfombwEy1YHgybqh9yXTM3kBeGKVo88wrlJ4rUeCmegYBZLi9B2co+MlcAmBlEilJdRn RPqOlqGLwcOc1JBF1zqpDjVTrmEKypbFPbqq9FW5/wtqq7DS8+JCbdvpIZQ3KyoiV1vM 5qUg== 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=q2S9tDVRztT92ftMn944OGP2Y6FNw7L/8CR824DSqbM=; b=iVXruThjR7lbDFqK+Xu4p3QyKpc+pq/na7b1cmIb8NSa4tF8R+PiX7MXLRnXue/bCj wZow0NTR4K/jfDnAJ6H7559+u7vZoYh7IfyRz7DhaRri0bP6JhEDeiUspZ/q6YekHyLj sqD8ARdspW4RnrMm443hi9JwvfWqy0DERaoG6QjCyWZDkCARvmkz33EINzQnEqlW4BgD E4JjRVZ5H3EXiW3fIosuLuw1wVLf0d6sWaR0g9W064NAGF1ylZ/BDqPJ2AA2IFz5btHe lIRvHoiZOGFA2ti0bg89UFH8BcL79bU1hsnhVzF1BR0VDyH/Ei1B9ptxyPsUAVm+2+Kr mk1w== 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 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id a8si2262529ple.344.2019.05.03.05.31.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2019 05:31:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 BB74289E7B; Fri, 3 May 2019 12:30:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B0E08920E for ; Fri, 3 May 2019 12:30:57 +0000 (UTC) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x43CUsab097966; Fri, 3 May 2019 07:30:54 -0500 Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x43CUsfJ128201 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 3 May 2019 07:30:54 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 3 May 2019 07:30:52 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 3 May 2019 07:30:52 -0500 Received: from deskari.lan (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x43CUYto002029; Fri, 3 May 2019 07:30:50 -0500 From: Tomi Valkeinen To: Andrzej Hajda , Laurent Pinchart , Lucas Stach , Andrey Gusakov , Philipp Zabel , Andrey Smirnov , Peter Ujfalusi , Jyri Sarha , Benoit Parrot , Subject: [PATCHv3 06/23] drm/bridge: tc358767: cleanup aux_link_setup Date: Fri, 3 May 2019 15:29:32 +0300 Message-ID: <20190503122949.12266-7-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503122949.12266-1-tomi.valkeinen@ti.com> References: <20190503122949.12266-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=1556886654; bh=fQsmmtM5MpRYWPrPM4z5XLDBrl2HrOSXP7IvYRrRnZI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=BDrwWKGCIzwMC3Vb5ZDJja0MO9h+LmrHfpAqOBe+OWyqxiAJuM8UG9jrJYngM1bQu qAEM+E/YUQFOvt0bV0qMVhX46PodB7wy1fAIiIPjATy4vNHTxAl23ZeQi/7Ic0D0No 7C+ep4rmu7UVeDopaXK0CZtHxyN4t6pCx0aJrjJE= 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" The driver sets up AUX link at probe time, but, for some reason, also sets the main link's number of lanes using tc->link.base.num_lanes. This is not needed nor correct, as the number of lanes has not been decided yet. The number of lanes will be set later during main link setup. 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 Reviewed-by: Andrzej Hajda Reviewed-by: Laurent Pinchart --- 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 f54918b0594c..f125727ac98e 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 |