From nobody Thu Oct 27 16:31:47 2022 X-Original-To: dev-commits-src-all@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 4MyrmM4GRVz4gS3w; Thu, 27 Oct 2022 16:31:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MyrmM3m6zz3qlJ; Thu, 27 Oct 2022 16:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666888307; 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=/uc/R0MPhnxF/0Xs/cr/5wkhwtP8YUYKh9A36OQjxzU=; b=sq7Mt3gopPAomUcUBV3lvAxxOGohSozH3uSI1EzQVeZvsSI0mr3t1OaRQd0J5vTUGEGKUV LXpyFSV0+ftKKGYqA4h8dLTipx67zxpNFm/aAaH0A99geHwFafAkJGqkNGtFEJFdObZfJK kW5nJtdqfePWNfIDzJ6egVt5CR0qpMzJrg9MkuxIEtJdTEvZbAzsqUwfLQgc4z4MMMoaFF cslr3dw+scHd55x+gLAsoRcho3mKGFGDmZz56ca10Xao+YNOf/uyMuk+Asg0aPyJlHbDZJ Q0pGGFXeasiV+kxDZys2ekm4k7ELkAnBG3EFSEz4yYgivDVrXcCZ77QxCMELtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MyrmM2rMVz14cs; Thu, 27 Oct 2022 16:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29RGVlAa002104; Thu, 27 Oct 2022 16:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RGVlLK002103; Thu, 27 Oct 2022 16:31:47 GMT (envelope-from git) Date: Thu, 27 Oct 2022 16:31:47 GMT Message-Id: <202210271631.29RGVlLK002103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 64c3edc237a5 - main - Allow the extres regulator code to build without FDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64c3edc237a5281e2210b3dd27868175f87b3973 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666888307; 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=/uc/R0MPhnxF/0Xs/cr/5wkhwtP8YUYKh9A36OQjxzU=; b=Mo9yg4sP0veebFXA0zOURfkxpHkwJDgwb/mH9AY/VV6+H3h1e1ETJgK/Ibu1nt55OIklS4 I3KAuR3fyLkmaioo2nTRvyvpLo1WVCiWzgEW402UMgfDLG6iYibe9NCQn02WxD8qbf0+20 wZSUBT3SQdf4rchAC1iD1T9fr/XEg/n8nKHPzFkrzpgsRm79dVLW1NtUj09ToTzCuy0TKf mKC3FkdabWqT/wJirMi7ExW5+SBRif1tc6j/vPUhKQ101ZDLOljOVqTHLIVdJkhwD3xc5U iFHGieMdSHlzlJvQ/jK1m8QhHq3dx3orvnu0TflgU8C0umac264iu5olqGNUdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666888307; a=rsa-sha256; cv=none; b=trW/ounlrvV5ICLFcgVdnZP6JfUgHvHCrlRQdUgrJ+Idq75t55HDz6NyIBsDqiCivVnwEQ WgzOrIbCSdLUE2n6ezzohmuPtU486FI4v4bPDB/v1iKJiTVvxHhOgpAgswAEaz8brVX8Fn gnvvc1jYhldPKg6kBNlOovDzYpAVJWUyqokW6vs/cdIpv+9uFUEmwDJ8Aws6AEXDLHCEQp SrPAbjvvR8+tf1vvt7M5ZSIxZdAg/vOlbVj2tVb7CSZBUKaYqVXVidyNqVOFbVVU1H8YjO AgwfYQbvBYNdg9SHoazs9jGeVgSATK2fW/YCjFagJtoSRg9CXUivepWNWOz9GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=64c3edc237a5281e2210b3dd27868175f87b3973 commit 64c3edc237a5281e2210b3dd27868175f87b3973 Author: Andrew Turner AuthorDate: 2022-10-27 16:28:56 +0000 Commit: Andrew Turner CommitDate: 2022-10-27 16:28:56 +0000 Allow the extres regulator code to build without FDT This allows drivers that use this to build in an ACPI only kernel. Sponsored by: The FreeBSD Foundation --- sys/conf/files | 4 ++-- sys/dev/extres/regulator/regulator.c | 2 ++ sys/dev/extres/regulator/regulator.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 5a74f1b1f1bb..b77fd3139544 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1741,8 +1741,8 @@ dev/extres/hwreset/hwreset_if.m optional hwreset fdt dev/extres/nvmem/nvmem.c optional nvmem fdt dev/extres/nvmem/nvmem_if.m optional nvmem fdt dev/extres/regulator/regdev_if.m optional regulator fdt -dev/extres/regulator/regnode_if.m optional regulator fdt -dev/extres/regulator/regulator.c optional regulator fdt +dev/extres/regulator/regnode_if.m optional regulator +dev/extres/regulator/regulator.c optional regulator dev/extres/regulator/regulator_bus.c optional regulator fdt dev/extres/regulator/regulator_fixed.c optional regulator fdt dev/extres/syscon/syscon.c optional syscon diff --git a/sys/dev/extres/regulator/regulator.c b/sys/dev/extres/regulator/regulator.c index eab79e9dfbc3..f87dec3fafb5 100644 --- a/sys/dev/extres/regulator/regulator.c +++ b/sys/dev/extres/regulator/regulator.c @@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$"); #endif #include +#ifdef FDT #include "regdev_if.h" +#endif SYSCTL_NODE(_hw, OID_AUTO, regulator, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Regulators"); diff --git a/sys/dev/extres/regulator/regulator.h b/sys/dev/extres/regulator/regulator.h index 03a8fbe1f534..587d788d3608 100644 --- a/sys/dev/extres/regulator/regulator.h +++ b/sys/dev/extres/regulator/regulator.h @@ -34,8 +34,8 @@ #include #ifdef FDT #include -#include "regnode_if.h" #endif +#include "regnode_if.h" SYSCTL_DECL(_hw_regulator);