From patchwork Thu Oct 24 16:45:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11210301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4C5C14ED for ; Thu, 24 Oct 2019 16:46:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C82121906 for ; Thu, 24 Oct 2019 16:46:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C82121906 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3BC86E505; Thu, 24 Oct 2019 16:46:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DFE76E4D4 for ; Thu, 24 Oct 2019 16:46:29 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id n15so16072634wrw.13 for ; Thu, 24 Oct 2019 09:46:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NT91ixyOydK7qB96GIPJOfEspuJPPBJ5IFvHC12wAR8=; b=kTA6tlOTcIP8zsj+2xSt1mkXBcxo8LMHuZ7IeI/6DrMVR9XbFXRNksZlfn1dVnXqW7 YOPkwoRAuaQ+XkqMJK4KHZWpu6t3sTdv+tv0kxmDLSy2iuh+BeQsLZhgd3+T5ezGT5pF kHpw+eMW+iU3ut5PFwUvwl2P7wqqDQydY4a/xOYfwO658r0El3COYJ7PCy/pFRA4NwY+ eMkjWz0pvK+ehqtupIO3dOb+zsFIJ8VTttt3mJA6joBvaHY4dvINbFWEUeNZEkWCcvHS N0q9C5tgghwlyKqfxSV9ZC7vvJ/D/kK+NPN+G6K8e1lJqWTcss6MKskFcGfA5fkhDzbJ TyJw== X-Gm-Message-State: APjAAAUMgRWx05riSM7a1h8YOSTPn7mzES5XCGtkTCyFT61Lx/1Bsx5f nvfsXEY2TfdXqw9YIgbAT5k= X-Google-Smtp-Source: APXvYqxXZcg2upg7fjAz2/y500pwHBj5qwugs8fAt0m2iRpSER2xWrE2PrSTsevL9U61oGwvwU3V0Q== X-Received: by 2002:a05:6000:11c4:: with SMTP id i4mr4638067wrx.277.1571935586785; Thu, 24 Oct 2019 09:46:26 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id g5sm3596115wmg.12.2019.10.24.09.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:46:25 -0700 (PDT) From: Thierry Reding To: Thierry Reding Subject: [PATCH 22/32] drm/tegra: sor: Remove tegra186-sor1 support Date: Thu, 24 Oct 2019 18:45:24 +0200 Message-Id: <20191024164534.132764-23-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024164534.132764-1-thierry.reding@gmail.com> References: <20191024164534.132764-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NT91ixyOydK7qB96GIPJOfEspuJPPBJ5IFvHC12wAR8=; b=i5ZvW56P9o2vrG223SkKlNPdXMG9zWHHbDYW525HN4gnSUp0eii74knnQ2y/Pm+vGT 4Le1b81W8dEXQl4E8+TYHNX6b+/jQJcc6EQso72skJUHSTd8s4e2mR5ioivA38VVN0nQ WStZKlHF3emj0pIvcqcdlGUA+et2LkbMzZYH2oI191s1rVrapoAc42nApWQ7CeJrQb7K ZxRewovB7f6BzxsRViin2EGNObaxcucUfjbaMeOmOBHuFThI3efhWDBA+s/v/n6Nb/XX 09J8+/lorpSSgqVjboGTqb08EIAUxw98mjBTZB52b4GywsFSJ/9A4MSndZi6MYvclr0L K8Ng== 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: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding It turns out that SOR1 is just another instance of the same block as the SOR0, so there is no need to distinguish them. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/sor.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 9cf008d7c67b..4e46524f22e3 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3680,23 +3680,6 @@ static const u8 tegra186_sor_pre_emphasis[4][4][4] = { }; static const struct tegra_sor_soc tegra186_sor = { - .supports_edp = false, - .supports_lvds = false, - .supports_hdmi = false, - .supports_dp = true, - - .regs = &tegra186_sor_regs, - .has_nvdisplay = true, - - .xbar_cfg = tegra124_sor_xbar_cfg, - .lane_map = tegra124_sor_lane_map, - .voltage_swing = tegra186_sor_voltage_swing, - .pre_emphasis = tegra186_sor_pre_emphasis, - .post_cursor = tegra124_sor_post_cursor, - .tx_pu = tegra124_sor_tx_pu, -}; - -static const struct tegra_sor_soc tegra186_sor1 = { .supports_edp = false, .supports_lvds = false, .supports_hdmi = true, @@ -3747,7 +3730,6 @@ static const struct tegra_sor_soc tegra194_sor = { static const struct of_device_id tegra_sor_of_match[] = { { .compatible = "nvidia,tegra194-sor", .data = &tegra194_sor }, - { .compatible = "nvidia,tegra186-sor1", .data = &tegra186_sor1 }, { .compatible = "nvidia,tegra186-sor", .data = &tegra186_sor }, { .compatible = "nvidia,tegra210-sor1", .data = &tegra210_sor1 }, { .compatible = "nvidia,tegra210-sor", .data = &tegra210_sor },