Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3079775ybt; Mon, 29 Jun 2020 14:48:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhxeGs6mtlH7qKR8YqhSLFnFCBTzzJ2LdR7ORAYVLKbA3i3G0/FzZP92xDQ0b+0KJMlVB5 X-Received: by 2002:a50:eb06:: with SMTP id y6mr19410556edp.143.1593467317902; Mon, 29 Jun 2020 14:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467317; cv=none; d=google.com; s=arc-20160816; b=fwPReQVgqv5ZSKIc0Fp8xJiEFiIk1wIP2dX9V2vAeP5K1DClf1icxOaroT1B1MKNcl ptmnqGV6VHneglnoa0iUj2hXaaTraRUNGP3t2ORdK9TA0PjOtFdVH6kykBELgUjdiTXB oLJ/lz9WnOnh/LzF2RnQanswHL1E1lbBiDQzRPmxh6rf5AouLaR07oDV5DejyTpe6Jve 4Xw6OctBqCvUkZmLIluSePwr2KQ9vByHFn0sWN1EMbf0z+GHUipbf7co7eZG8WmEz4xg tlZHvX7/Zt219lwmXvQPaaEepWvAK8lgYrnSB6K7HADKn8Y1OCVxEu/RmyCbJnUWeLBk Vq4w== 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=vlMiSm0r7K0sat6m7DBr8tcQ7b/3jqhHatxzis1H8LE=; b=1EJre31sleIr8Ph9spN5YT2bMucX6MML4X1cTj+mUiu8wIk+rFyntLEyay6/frMrkA Ic1dCSWm2ZkSr3Oc13fGRrXnWFd5MIhN6XYKs3D1qYataFAwHR9mfgGvBdyVqqKlaUrd shkDMl+y0tH35DtvFPEI5jUwHnL6Wdg2If8PlRRVVdKPewL1rd2WAAaIJ6E97iei/tW5 BdJbGzb3vuQbNLarpVDs4XRBIfsum1ruVsbUtE3G+EZRIxDLYapk5xMCp5SkNp9dJPHR VmPUsVWpL6QyoKkzDPERuQBwvGrgwp+OGt4e74dUyiFvOdFuEVk2OsVeeFlvLm70UNSY cVXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0EKnlx6N; 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 g21si451618edm.199.2020.06.29.14.48.15; Mon, 29 Jun 2020 14:48:37 -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=0EKnlx6N; 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 S2404027AbgF2VrS (ORCPT + 99 others); Mon, 29 Jun 2020 17:47:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:56910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726740AbgF2Sfo (ORCPT ); Mon, 29 Jun 2020 14:35:44 -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 4421424699; Mon, 29 Jun 2020 15:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443992; bh=7+ckgGs+391OquPJTLjfCaTeAqMTU6Gyltn8EGzmfDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0EKnlx6NOnMUdkVvaTSOSmXqVh/Gg1z94Stsdx5hBt++vXfTeIqZ5lhrWAHy8d2HW VgVmEn5SjuVqQ/Aqg7ZiWyoZn9Meg9vy6H+JHxvM9f+ZRYyZz4LDCtGrtwsP7XYIxE T2msGaUE/6q2PEuT4lHSn47ziMnXgiOIZVZUtot4= 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.7 097/265] ARM: OMAP2+: Fix legacy mode dss_reset Date: Mon, 29 Jun 2020 11:15:30 -0400 Message-Id: <20200629151818.2493727-98-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+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 82706af307dee..c630457bb228e 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3489,7 +3489,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