Skip to content

Fix build issues for ADSP boards after kernel bump from 6.12 to 6.18 #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ozan956 wants to merge 6 commits into from
Closed

Fix build issues for ADSP boards after kernel bump from 6.12 to 6.18 #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c0762e
gpio: adi-adsp-port: make set callback return int
ozan956 May 25, 2026
dcde170
usb: musb: adi: replace from_timer() with timer_container_of()
ozan956 May 25, 2026
c45006a
usb: musb: adi: allow compile testing
ozan956 May 25, 2026
f9cd301
soc: adi: provide a stub for set_spu_securep_msec()
ozan956 May 25, 2026
6d6bd00
gpio: adi-adsp-port: allow compile testing
ozan956 May 25, 2026
cb5a300
irqchip: adi-adsp: allow compile testing
ozan956 May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/gpio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ config GPIO_74XX_MMIO

config GPIO_ADI_ADSP_PORT
bool "ADI ADSP PORT GPIO driver"
depends on OF_GPIO
depends on OF_GPIO && (ARCH_SC59X_64 || ARCH_SC59X || ARCH_SC58X || ARCH_SC57X || COMPILE_TEST)
select GPIO_GENERIC
select ADI_ADSP_IRQ
help
Expand Down
4 changes: 3 additions & 1 deletion drivers/gpio/gpio-adi-adsp-port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static int adsp_gpio_direction_output(struct gpio_chip *chip, unsigned int offse
return 0;
}

static void adsp_gpio_set_value(struct gpio_chip *chip, unsigned int offset, int value)
static int adsp_gpio_set_value(struct gpio_chip *chip, unsigned int offset, int value)
{
struct adsp_gpio_port *port = to_adsp_gpio_port(chip);

Expand All @@ -73,6 +73,8 @@ static void adsp_gpio_set_value(struct gpio_chip *chip, unsigned int offset, int
else
__adsp_gpio_writew(port, BIT(offset), ADSP_PORT_REG_DATA_CLEAR);
}

return 0;
}

static int adsp_gpio_get_value(struct gpio_chip *chip, unsigned int offset)
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ config ALPINE_MSI
config ADI_ADSP_IRQ
bool "ADI PORT PINT Driver"
depends on OF
depends on (ARCH_SC59X_64 || ARCH_SC59X || ARCH_SC58X || ARCH_SC57X)
depends on (ARCH_SC59X_64 || ARCH_SC59X || ARCH_SC58X || ARCH_SC57X || COMPILE_TEST)
select IRQ_DOMAIN
help
Say Y to enable the PORT-based PINT interrupt controller for
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/musb/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ config USB_MUSB_JZ4740

config USB_MUSB_ADI
tristate "ADI"
depends on ARCH_SC59X || ARCH_SC58X || ARCH_SC57X
depends on ARCH_SC59X || ARCH_SC58X || ARCH_SC57X || COMPILE_TEST
help
Enable usb on ADI platforms.

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/musb/adi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct adi_musb_glue {

static void musb_conn_timer_handler(struct timer_list *t)
{
struct musb *musb = from_timer(musb, t, dev_timer);
struct musb *musb = timer_container_of(musb, t, dev_timer);
unsigned long flags;
u16 val;
static u8 toggle;
Expand Down
8 changes: 8 additions & 0 deletions include/linux/soc/adi/cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,15 @@ void disable_gptimers(u16 mask);
void map_gptimers(void);
u16 get_gptimer_status(void);
void set_gptimer_status(u16 value);
#if defined(CONFIG_ARCH_SC57X) || defined(CONFIG_ARCH_SC58X) || \
defined(CONFIG_ARCH_SC59X) || defined(CONFIG_ARCH_SC59X_64)
void set_spu_securep_msec(u16 n, bool msec);
#elif defined(CONFIG_COMPILE_TEST)
static inline void set_spu_securep_msec(u16 n, bool msec)
{
}
#endif

void platform_ipi_init(void);

#endif /* __MACH_CPU_H */