Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3019287ybt; Mon, 29 Jun 2020 13:04:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2VofYca2hUqTcMiDKI9qD931cKfCNztD9zqyGRtXDrh0Loiju3cGJUtYq4NajiwcE9cux X-Received: by 2002:a17:906:d143:: with SMTP id br3mr14220670ejb.268.1593461057894; Mon, 29 Jun 2020 13:04:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461057; cv=none; d=google.com; s=arc-20160816; b=vMW9WGfQe7VAqZ8zpsMpXzwebplHDqLSLd5Z8MneElYJ3/NC3HjUUEYmcpoLMw2R+C qvBcEOE53ZVBvfU53YNRKATv/nrTfU3A/XLvuNOF8MIhiscFlZDFTmdjMa48LZmidgIF X7QPZ5s3cjz6xm50N23ZdKASO1yocnBDbI+S+qwxzCCqSen1EGBu48ARRi9mAfFfKEpU 4RQxHP6EC8MWC+CFFUzDbslh/XbSLc6xWckjNR9b9tp7PBBuv36rbJcze3OdjhoeKil+ hhmiG8NUyG5/RzWzJuKD+0bcI3nmKtfr7Z33FGb/DkDEtbUKxzVNgGkPSK8Q2lhHT4bT gfQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RRaGUljSVNo5KUnj1gECbMOuIygLYuGJBX39GJ+N1fY=; b=ZZwNzPGPw1NbHAsayu4tggi/g3LYJPJKr/BvupRtXKD4fTK3dp+a+AgEpVDJhmXy0p uhRZqDvY7gym4u3vIZvbU0O//rMtW/P9PUzOru/sYYyihRJ1gS01/HrYqeGcQvtIV9W6 HJKmUr7uq4aI7d+iz/gyzyFnQdG/v1TRWvDHlatHWUqhoWfOdn3sMkC1fFEf2IhVE2Ps HOKfk/FNfywzbnsW/PIDwXbx+9dKT9SDGadhMGIxaISul076rTnag5JVpXnACrQ5Gb8I fuVf4y6RqxyljYWd4EXv9vayBhLjhxXYjwi4Olf5HY43hbP3C6QyAA+8FkhGpyC1HEJ0 kTDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QJuDFe1K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t2si391345ejd.382.2020.06.29.13.03.54; Mon, 29 Jun 2020 13:04:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QJuDFe1K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732352AbgF2UBu (ORCPT + 99 others); Mon, 29 Jun 2020 16:01:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:47630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387495AbgF2TkP (ORCPT ); Mon, 29 Jun 2020 15:40:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 91E222488A; Mon, 29 Jun 2020 15:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444386; bh=ke+E4ACwtF8UcIi+lq2rwLffvdLaAJALS7zP8w5TH0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QJuDFe1KWYb4aKvcIgIrDT864y7laKSbQsTTFN015BBP6q+ZiUJ2dEcr3Pklvn6tc Y/oJiD5EZ2jdfIe0tFVooXJHPCtGj7xhsJhc7dOkeIlq9+u+GugjA1hNY+BK7O4SDq QCpx2th0poDq+Eyf8g0V9YEAu9gcCeSnSwdIHCIk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Lindgren , Laurent Pinchart , Tomi Valkeinen , Sasha Levin Subject: [PATCH 5.4 063/178] ARM: OMAP2+: Fix legacy mode dss_reset Date: Mon, 29 Jun 2020 11:23:28 -0400 Message-Id: <20200629152523.2494198-64-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629152523.2494198-1-sashal@kernel.org> References: <20200629152523.2494198-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.50-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.50-rc1 X-KernelTest-Deadline: 2020-07-01T15:25+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tony Lindgren [ Upstream commit 77cad9dbc957f23a73169e8a8971186744296614 ] We must check for "dss_core" instead of "dss" to avoid also matching also "dss_dispc". This only matters for the mixed case of data configured in device tree but with legacy booting ti,hwmods property still enabled. Fixes: 8b30919a4e3c ("ARM: OMAP2+: Handle reset quirks for dynamically allocated modules") Cc: Laurent Pinchart Cc: Tomi Valkeinen Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 203664c40d3d2..eb74aa1826614 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3535,7 +3535,7 @@ static const struct omap_hwmod_reset dra7_reset_quirks[] = { }; static const struct omap_hwmod_reset omap_reset_quirks[] = { - { .match = "dss", .len = 3, .reset = omap_dss_reset, }, + { .match = "dss_core", .len = 8, .reset = omap_dss_reset, }, { .match = "hdq1w", .len = 5, .reset = omap_hdq1w_reset, }, { .match = "i2c", .len = 3, .reset = omap_i2c_reset, }, { .match = "wd_timer", .len = 8, .reset = omap2_wd_timer_reset, }, -- 2.25.1