Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbdHBUdL (ORCPT ); Wed, 2 Aug 2017 16:33:11 -0400 Received: from anholt.net ([50.246.234.109]:52196 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005AbdHBUcq (ORCPT ); Wed, 2 Aug 2017 16:32:46 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, noralf@tronnes.org, Eric Anholt Subject: [PATCH 2/3] drm/vc4: Don't disable DSI clocks on component unload. Date: Wed, 2 Aug 2017 13:32:41 -0700 Message-Id: <20170802203242.12815-2-eric@anholt.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170802203242.12815-1-eric@anholt.net> References: <20170802203242.12815-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 780 Lines: 25 The clocks are enabled/disabled at encoder enable/disable time, not at component load. Fixes a WARN_ON at boot if V3D fails to probe. Fixes: 4078f5757144 ("drm/vc4: Add DSI driver") Signed-off-by: Eric Anholt --- drivers/gpu/drm/vc4/vc4_dsi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 629d372633e6..13481bb6322f 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1641,9 +1641,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master, mipi_dsi_host_unregister(&dsi->dsi_host); - clk_disable_unprepare(dsi->pll_phy_clock); - clk_disable_unprepare(dsi->escape_clock); - if (dsi->port == 1) vc4->dsi1 = NULL; } -- 2.13.3