diff --git a/hosts/modules/hal/pine64-pinephone-pro/default.nix b/hosts/modules/hal/pine64-pinephone-pro/default.nix index 8b346c346..11999943d 100644 --- a/hosts/modules/hal/pine64-pinephone-pro/default.nix +++ b/hosts/modules/hal/pine64-pinephone-pro/default.nix @@ -196,12 +196,12 @@ in config.boot.kernelPackages.rk818-charger #< rk818 battery/charger isn't mainline as of 2024-10-01 #v XXX(???? - 2025-07-18): mainline imx258 camera driver has some power-on issues on PPP (imx258 1-001a: Error reading reg 0x0016: -6) #v XXX(2025-07-18): megi's imx258 breaks mainline audio, though - # config.boot.kernelPackages.imx258 + # config.boot.kernelPackages.megi-imx258 #v optionally use megi's rt5640 sound driver; #v XXX(2025-07-18): when using megi's imx258, the mainline rt5640 driver errors: `rt5640: 1-001c: ASoC error (-22): at snd_soc_dai_set_sysclk() on rt5640-aif1` #v prior to this mainline driver was working fine, alongside camera/imx258, for half a year. #v although this fixes the dmesg errors, it causes pipewire/wireplumber to crash-loop. - # config.boot.kernelPackages.rt5640 + # config.boot.kernelPackages.megi-rt5640 ]; # default nixos behavior is to error if a kernel module is provided by more than one package. diff --git a/pkgs/linux-packages/imx258/Makefile b/pkgs/linux-packages/megi-imx258/Makefile similarity index 100% rename from pkgs/linux-packages/imx258/Makefile rename to pkgs/linux-packages/megi-imx258/Makefile diff --git a/pkgs/linux-packages/imx258/imx258.c b/pkgs/linux-packages/megi-imx258/imx258.c similarity index 100% rename from pkgs/linux-packages/imx258/imx258.c rename to pkgs/linux-packages/megi-imx258/imx258.c diff --git a/pkgs/linux-packages/imx258/package.nix b/pkgs/linux-packages/megi-imx258/package.nix similarity index 98% rename from pkgs/linux-packages/imx258/package.nix rename to pkgs/linux-packages/megi-imx258/package.nix index 7914cebc8..7a9a828d6 100644 --- a/pkgs/linux-packages/imx258/package.nix +++ b/pkgs/linux-packages/megi-imx258/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation { - pname = "imx258"; + pname = "megi-imx258"; version = "0-unstable-2024-09-15"; src = ./.; diff --git a/pkgs/linux-packages/rt5640/Makefile b/pkgs/linux-packages/megi-rt5640/Makefile similarity index 100% rename from pkgs/linux-packages/rt5640/Makefile rename to pkgs/linux-packages/megi-rt5640/Makefile diff --git a/pkgs/linux-packages/rt5640/package.nix b/pkgs/linux-packages/megi-rt5640/package.nix similarity index 98% rename from pkgs/linux-packages/rt5640/package.nix rename to pkgs/linux-packages/megi-rt5640/package.nix index e46215e9e..2fa4ce737 100644 --- a/pkgs/linux-packages/rt5640/package.nix +++ b/pkgs/linux-packages/megi-rt5640/package.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation { - pname = "rt5640"; + pname = "megi-rt5640"; version = "0-unstable-2024-02-21"; src = ./.; diff --git a/pkgs/linux-packages/rt5640/rl6231.h b/pkgs/linux-packages/megi-rt5640/rl6231.h similarity index 100% rename from pkgs/linux-packages/rt5640/rl6231.h rename to pkgs/linux-packages/megi-rt5640/rl6231.h diff --git a/pkgs/linux-packages/rt5640/rt5640.h b/pkgs/linux-packages/megi-rt5640/rt5640.h similarity index 100% rename from pkgs/linux-packages/rt5640/rt5640.h rename to pkgs/linux-packages/megi-rt5640/rt5640.h diff --git a/pkgs/linux-packages/rt5640/snd-soc-rt5640.c b/pkgs/linux-packages/megi-rt5640/snd-soc-rt5640.c similarity index 100% rename from pkgs/linux-packages/rt5640/snd-soc-rt5640.c rename to pkgs/linux-packages/megi-rt5640/snd-soc-rt5640.c