From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 86E0C3AE198; Wed, 23 Sep 2026 14:37:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790174248; cv=none; b=KzJFwUEZhanEQ4lpvFaWIxacVvG9vJQjHLKVRzwkEE/VIOuy1iBwTB/8ElqjNHbZl1DxFE2HHlqY84MRRmks/uy8LivFF3XRWtNr8JsTVS7DNpiwB4k/xtSs+L0ctqARkyEty1Glg1ZizNCcYqHOtVFMy/PHigG0vBUSAvEK/4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790174248; c=relaxed/simple; bh=RlTAUoCu0QKfrlD4MJ6vv7llse9PjILN7j5mbhOvdh0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c/riJEG4h7MgGbQEuKZiGPOGvYTnR6pA6sMCfzNClGEOF6JE2JnHeeXud6qvg+7D4QHURNiHOuktn43EOi3JXOhy2F7rGY0Igwtw450vWAfM8SuDXMqhjwtqWnDCvrBy9NTnEEew6AyL0MsRev0JScD7PoXW53ayCviXwgZu61U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ze+2Ep6v; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ze+2Ep6v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D62EF1F000FF; Wed, 23 Sep 2026 14:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790174247; bh=LV/VVyFIMfjDSJUZv4G+O/XjI/cYB6r/Dahjy9Kqh3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ze+2Ep6vfnAtljG8MQOb59jeyOt0KXEIDGkEecF5z8oh1D0d+TK53qpvbEZTefc5V UDYoDyOb7vhWTK40c1iXmmZOrNZofdRi5Szw0wSMjvZRKAAUofwfTQC7GjISMviKl2 J3JRLXaxTY1rz3UDbbG4exDKVoTYu5AdYzG33TWg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Orgad Shaneh , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 6.18 054/398] MIPS: Octeon: apply USB FDT fixups also when USB is modular Date: Wed, 23 Sep 2026 16:02:08 +0200 Message-ID: <20260923140644.824542016@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140643.441954610@linuxfoundation.org> References: <20260923140643.441954610@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: Orgad Shaneh [ Upstream commit 126f16e0a1b353c2ba5c7e2c8626cfa865934f9f ] The uctl/usbn device-tree fixups in octeon_prune_device_tree() - which set the board's USB reference-clock frequency and type from __cvmx_helper_board_usb_get_clock_type() - are guarded by "#ifdef CONFIG_USB", which is false when USB is built as a module. The fixups then silently disappear and octeon-hcd sees whatever default the DTS carries (12MHz crystal in octeon_3xxx.dts), leaving the PHY dead or the bus erroring on boards with a different reference clock. Use IS_ENABLED() so USB=m gets the same fixups as USB=y. Fixes: 7fd57ab9d9cf ("MIPS: Octeon: Fix compile error when USB is not enabled.") Assisted-by: Claude:claude-opus-5 Signed-off-by: Orgad Shaneh Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/cavium-octeon/octeon-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index 47677b5d7ed00..f53c98372e0be 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -18,7 +18,7 @@ #include #include -#ifdef CONFIG_USB +#if IS_ENABLED(CONFIG_USB) #include #include #include @@ -1080,7 +1080,7 @@ int __init octeon_prune_device_tree(void) ; } -#ifdef CONFIG_USB +#if IS_ENABLED(CONFIG_USB) /* OHCI/UHCI USB */ alias_prop = fdt_getprop(initial_boot_params, aliases, "uctl", NULL); -- 2.53.0