From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 458D42222CB; Mon, 29 Dec 2025 16:22:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767025344; cv=none; b=rvzUQBeZJk88kAGhofz0WPMFmEU7j4/RbiBYDz2lrQ2v57FGuvdY+FhVhHnJKaXRK1yEpTgI5b+7a9ibVu/fl0OxLPgx93YsBE0/EfZuD43QlhzyDwQblHDm+gbQosyyQHIme3JhoZ9yEUf9zF0pbym4h4sKNgygeKq6iEOfYYY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767025344; c=relaxed/simple; bh=Upnk8t7wnKPIn9E7DFbZPV3Q/XjDhRowvof6SBdsh00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tWAfZHwtMOT3cqPvprj2CFOMVxWYAtooawfS3zRklfhP+CgJnMqwK868aPDk7NOuOalLXnzD5g7kmD2yajv1gGOlBf2oTm8E76o3K4wX+vcVrIpVKKggNmMeti/gAB4sgCPTL/TfB7G6CnEW1a9TnLCpzXiPMNUU2c9UVuUHGn0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pwLCSOhD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pwLCSOhD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9729C4CEF7; Mon, 29 Dec 2025 16:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767025344; bh=Upnk8t7wnKPIn9E7DFbZPV3Q/XjDhRowvof6SBdsh00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pwLCSOhD4ndGjJgFJeCBCW0qruyLNm6z0Hunr2+t0vgQg/MXs6NOOy9XVKF68TPXL gtJEyhN/Rinl6Ny/obTn7rHRY2B0m9cJXKgPklNQ09KltbEwLXKocApRdu7J4KB/8r lNnHGzX8B9Hf6QhQTzDE3EMKu6oWvgokhAZgOQHQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matthias Schiffer , Alexander Stein , Kevin Hilman , Sasha Levin Subject: [PATCH 6.18 181/430] ti-sysc: allow OMAP2 and OMAP4 timers to be reserved on AM33xx Date: Mon, 29 Dec 2025 17:09:43 +0100 Message-ID: <20251229160731.019755468@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251229160724.139406961@linuxfoundation.org> References: <20251229160724.139406961@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthias Schiffer [ Upstream commit 3f61783920504b2cf99330b372d82914bb004d8e ] am33xx.dtsi has the same clock setup as am35xx.dtsi, setting ti,no-reset-on-init and ti,no-idle on timer1_target and timer2_target, so AM33 needs the same workaround as AM35 to avoid ti-sysc probe failing on certain target modules. Signed-off-by: Matthias Schiffer Signed-off-by: Alexander Stein Link: https://lore.kernel.org/r/20250825131114.2206804-1-alexander.stein@ew.tq-group.com Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- drivers/bus/ti-sysc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 5566ad11399e..610354ce7f8f 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -48,6 +48,7 @@ enum sysc_soc { SOC_UNKNOWN, SOC_2420, SOC_2430, + SOC_AM33, SOC_3430, SOC_AM35, SOC_3630, @@ -2912,6 +2913,7 @@ static void ti_sysc_idle(struct work_struct *work) static const struct soc_device_attribute sysc_soc_match[] = { SOC_FLAG("OMAP242*", SOC_2420), SOC_FLAG("OMAP243*", SOC_2430), + SOC_FLAG("AM33*", SOC_AM33), SOC_FLAG("AM35*", SOC_AM35), SOC_FLAG("OMAP3[45]*", SOC_3430), SOC_FLAG("OMAP3[67]*", SOC_3630), @@ -3117,10 +3119,15 @@ static int sysc_check_active_timer(struct sysc *ddata) * can be dropped if we stop supporting old beagleboard revisions * A to B4 at some point. */ - if (sysc_soc->soc == SOC_3430 || sysc_soc->soc == SOC_AM35) + switch (sysc_soc->soc) { + case SOC_AM33: + case SOC_3430: + case SOC_AM35: error = -ENXIO; - else + break; + default: error = -EBUSY; + } if ((ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT) && (ddata->cfg.quirks & SYSC_QUIRK_NO_IDLE)) -- 2.51.0