MIPS: Octeon: apply USB FDT fixups also when USB is modular
PATCH 1/1 MIPS: Octeon: apply USB FDT fixups also when USB is modular
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.
---
arch/mips/cavium-octeon/octeon-platform.c +2 -2
@@ -18,7 +18,7 @@#include <asm/octeon/octeon.h> #include <asm/octeon/cvmx-helper-board.h> -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )#include <linux/usb/ehci_def.h> #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h>
@@ -1080,7 +1080,7 @@ ; } -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )/* OHCI/UHCI USB */ alias_prop =fdt_getprop (initial_boot_params, aliases,"uctl" ,NULL );
Signature · 1 line
2.47.0
PATCH v2 1/1 MIPS: Octeon: apply USB FDT fixups also when USB is modular
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.
---
v2: no code change; added the Assisted-by tag for the AI assistance used
(Documentation/process/coding-assistants.rst).
arch/mips/cavium-octeon/octeon-platform.c +2 -2
@@ -18,7 +18,7 @@#include <asm/octeon/octeon.h> #include <asm/octeon/cvmx-helper-board.h> -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )#include <linux/usb/ehci_def.h> #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h>
@@ -1080,7 +1080,7 @@ ; } -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )/* OHCI/UHCI USB */ alias_prop =fdt_getprop (initial_boot_params, aliases,"uctl" ,NULL );
Signature · 1 line
2.47.0
Quoted 41 lines · Orgad Shaneh
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 "#ifdefCONFIG_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 inocteon_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-5Signed-off-by Orgad Shaneh <[email protected]>---
v2: no code change; added the Assisted-by tag for the AI assistance used
(Documentation/process/coding-assistants.rst).arch/mips/cavium-octeon/octeon-platform.c +2
-2@@ -18,7 +18,7 @@#include <asm/octeon/octeon.h> #include <asm/octeon/cvmx-helper-board.h> -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )#include <linux/usb/ehci_def.h> #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> @@ -1080,7 +1080,7 @@ ; } -#ifdef CONFIG_USB +#if IS_ENABLED (CONFIG_USB )/* OHCI/UHCI USB */ alias_prop =fdt_getprop (initial_boot_params, aliases,"uctl" ,NULL );Signature · 1 line
2.47.0
applied to mips-fixes
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]