From nobody Sat Dec 6 09:59:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHz6727z6KS2m for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkHz3VvHz3GPj for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfELqmgmpbMiZ4J+yN1W0VEd185vrMRmbnGL+Za/tfY=; b=OnoViT0MzzvvqM6l823T515NB0/e4GqWYRbV0aLDbuDikfK3eaxw4wd4H62qYd0rYGLHVz nZhux1OnfUS+niwhdOTPhhl/cak6eclLUgG7brEYbCHrLBFOzvqE/HypzNceYuFuC7BZCY nzLmHvlPhO8ukich+RHriJODMAgZv+zWRoXkdgwzhIt/5rTxY7+YQ0SAlU+haqOjKQ5m63 p0uWdEDg16EORDW7DRYRm4Xnr3S8lr5ey1zEEGK6BfzmC7Vj35XCo9OoWBlB4U/ZepW8l6 0ttTNoOTX9JTFnOaukC/p/4nUE4pmLQzxDC3P7CUyRd+528QHCihNXaeBNU8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfELqmgmpbMiZ4J+yN1W0VEd185vrMRmbnGL+Za/tfY=; b=o6A7kEHjKf4dZDj3se4Y6z5tA8hR7iB6W//dI5aQ4j2y/St0rbI8JjEKIjWissA10/42UK gPO1cq23HnIiJhIWvWeenUQ69Wy5QgSv9SjdQ7HdpN+3enLNz+RC3zG+WF5HtBksrbjsgC jjEwa8aetr4zPTXPBOoflu/UTT3DPUIsvmK7yqxME5Kg2x9YgWCy+UhzSBnd7ewu5VZ+hT cfXSrElcniiXs8G6iW1SEhRzjHvJztm/YR0eNS9yc/G9yuUAOpa8fH1K35Vd1k+/9aeS4+ obfJFva1azCjLig7EHSXOoCpBUMNLwEltpuveaYrDkbLQZma/c6BrfDEjwkkVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765015199; a=rsa-sha256; cv=none; b=Bz8MMER94u8dkwG4QZaWJdWFHvVsJzS0tVP/p9z2ecAKa8dxj5waODjgHXl9TLwJYUm4Ux mFRpgCOHMnMTOtxb1SIfPMRE7+O4ntJYpjfvzelAduv13tcOWuMygvj0FxC07GTCLH2zC+ KhoK9rGcQJYpOv9BiV0SFaqLv0azdLdLtgmWyvXXwBG6yT+93kYBZgUJgtMi7abrYPSbSn g7581cCFKAiPx8LaNrKyfILfXZXZ1yi/X71Dv0AbWzQ9h+Uhq6mCGrbFUuEx0IBWkfEQ3S /kZ3X9YZsnmJfeb6yZzkkbBwbcMs5NPCt5Lz89/VqlAU9bGD0csPjWIvB8kfBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHz2YLxzrXX for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 361e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 09:59:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fe7b6fc32455 - main - LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 09:59:59 +0000 Message-Id: <6933fe9f.361e8.42a2de9e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc commit fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:57:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 09:59:11 +0000 LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling Add the conditional compile time option defaulting to off as we do not support leds in LinuxKPI to ath10k for the new file. Add empty struct gpio_led to LinuxKPI. MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/leds.h | 5 ++++- sys/modules/ath10k/Makefile | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/leds.h b/sys/compat/linuxkpi/common/include/linux/leds.h index 89f7286f6800..b9b694f6e304 100644 --- a/sys/compat/linuxkpi/common/include/linux/leds.h +++ b/sys/compat/linuxkpi/common/include/linux/leds.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2025 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -38,4 +38,7 @@ struct led_classdev { void (*led_set)(struct led_classdev *, enum led_brightness); }; +struct gpio_led { +}; + #endif /* _LINUXKPI_LINUX_LEDS_H */ diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index eb02bda1699f..98df270b6791 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -3,6 +3,7 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} WITH_CONFIG_FWLOG= 1 +WITH_LEDS= 0 KMOD= if_ath10k @@ -22,6 +23,11 @@ SRCS+= fwlog.c CFLAGS+= -DCONFIG_FWLOG=${WITH_CONFIG_FWLOG} .endif +.if defined(WITH_LEDS) && ${WITH_LEDS} > 0 +CFLAGS+= -DCONFIG_ATH10K_LEDS +SRCS+= leds.c +.endif + CFLAGS+= -DKBUILD_MODNAME='"ath10k"' CFLAGS+= -I${DEVATH10KDIR}