nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1633 from NixOS/pi4-rendering
Some checks failed
Test / nixfmt (push) Has been cancelled
Details
Test / tests (push) Has been cancelled
Details

Browse source 
raspberrypi/4: fix many option rendering
This commit is contained in:
Sandro 2025-10-10 14:30:35 +00:00 • committed by GitHub
commit 9ed85f8afe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
raspberry-pi/4/audio.nix
View file

@ -11,9 +11,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".audio = { raspberry-pi."4".audio = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "configuration for audio";
configuration for audio
'';
}; };
}; };

4
raspberry-pi/4/backlight.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".backlight = { raspberry-pi."4".backlight = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "the backlight support for the Raspberry Pi official Touch Display";
Enable the backlight support for the Raspberry Pi official Touch Display
'';
}; };
}; };

4
raspberry-pi/4/bluetooth.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".bluetooth = { raspberry-pi."4".bluetooth = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "configuration for bluetooth";
configuration for bluetooth
'';
}; };
}; };

6
raspberry-pi/4/digi-amp-plus.nix
View file

@ -6,15 +6,13 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".digi-amp-plus = { raspberry-pi."4".digi-amp-plus = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "support for the IQaudIO DigiAMP+ Hat";
support for the IQaudIO DigiAMP+ Hat.
'';
unmuteAmp = lib.mkOption { unmuteAmp = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
"one-shot" unmute when kernel module first loads. Whether to "one-shot" unmute when kernel module first loads.
''; '';
}; };

33
raspberry-pi/4/dwc2.nix
View file

@ -6,24 +6,29 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".dwc2 = { raspberry-pi."4".dwc2 = {
enable = lib.mkEnableOption '' enable = lib.mkOption {
Enable the UDC controller to support USB OTG gadget functions. type = lib.types.bool;
default = false;
example = true;
description = ''
Enable the UDC controller to support USB OTG gadget functions.
In order to verify that this works, connect the Raspberry Pi with In order to verify that this works, connect the Raspberry Pi with
another computer via the USB C cable, and then do one of: another computer via the USB C cable, and then do one of:
- `modprobe g_serial` - `modprobe g_serial`
- `modprobe g_mass_storage file=/path/to/some/iso-file.iso` - `modprobe g_mass_storage file=/path/to/some/iso-file.iso`
On the Raspberry Pi, `dmesg` should then show success-indicating output On the Raspberry Pi, `dmesg` should then show success-indicating output
that is related to the dwc2 and g_serial/g_mass_storage modules. that is related to the dwc2 and g_serial/g_mass_storage modules.
On the other computer, a serial/mass-storage device should pop up in On the other computer, a serial/mass-storage device should pop up in
the system logs. the system logs.
For more information about what gadget functions exist along with handy For more information about what gadget functions exist along with handy
guides on how to test them, please refer to: guides on how to test them, please refer to:
https://www.kernel.org/doc/Documentation/usb/gadget-testing.txt https://www.kernel.org/doc/Documentation/usb/gadget-testing.txt
''; '';
};
dr_mode = lib.mkOption { dr_mode = lib.mkOption {
type = lib.types.enum [ type = lib.types.enum [
"host" "host"

24
raspberry-pi/4/i2c.nix
View file

@ -31,28 +31,32 @@ in
{ {
options.hardware.raspberry-pi."4" = { options.hardware.raspberry-pi."4" = {
i2c0 = { i2c0 = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "" // {
Turn on the VideoCore I2C bus (maps to /dev/i2c-22) and enable access from the i2c group. description = ''
After a reboot, i2c-tools (e.g. i2cdetect -F 22) should work for root or any user in i2c. Turn on the VideoCore I2C bus (maps to /dev/i2c-22) and enable access from the i2c group.
''; After a reboot, i2c-tools (e.g. i2cdetect -F 22) should work for root or any user in i2c.
'';
};
frequency = lib.mkOption { frequency = lib.mkOption {
type = lib.types.nullOr lib.types.int; type = lib.types.nullOr lib.types.int;
default = null; default = null;
description = '' description = ''
interface clock-frequency The interface clock-frequency to configure.
''; '';
}; };
}; };
i2c1 = { i2c1 = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "" // {
Turn on the ARM I2C bus (/dev/i2c-1 on GPIO pins 3 and 5) and enable access from the i2c group. description = ''
After a reboot, i2c-tools (e.g. i2cdetect -F 1) should work for root or any user in i2c. Turn on the ARM I2C bus (/dev/i2c-1 on GPIO pins 3 and 5) and enable access from the i2c group.
''; After a reboot, i2c-tools (e.g. i2cdetect -F 1) should work for root or any user in i2c.
'';
};
frequency = lib.mkOption { frequency = lib.mkOption {
type = lib.types.nullOr lib.types.int; type = lib.types.nullOr lib.types.int;
default = null; default = null;
description = '' description = ''
interface clock-frequency The interface clock-frequency to configure.
''; '';
}; };
}; };

10
raspberry-pi/4/pkgs-overlays.nix
View file

@ -10,10 +10,12 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".apply-overlays-dtmerge = { raspberry-pi."4".apply-overlays-dtmerge = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "" // {
replace deviceTree.applyOverlays implementation to use dtmerge from libraspberrypi. description = ''
this can resolve issues with applying dtbs for the pi. Whether replace deviceTree.applyOverlays implementation to use dtmerge from libraspberrypi.
''; This can resolve issues with applying dtbs for the pi.
'';
};
}; };
}; };

4
raspberry-pi/4/poe-hat.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".poe-hat = { raspberry-pi."4".poe-hat = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "support for the Raspberry Pi POE Hat";
support for the Raspberry Pi POE Hat.
'';
}; };
}; };

4
raspberry-pi/4/poe-plus-hat.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".poe-plus-hat = { raspberry-pi."4".poe-plus-hat = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "support for the Raspberry Pi PoE+ HAT";
support for the Raspberry Pi PoE+ HAT.
'';
}; };
}; };

4
raspberry-pi/4/pwm0.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".pwm0 = { raspberry-pi."4".pwm0 = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "support for the hardware pwm0 channel on GPIO_18";
Enable support for the hardware pwm0 channel on GPIO_18
'';
}; };
}; };

24
raspberry-pi/4/tc358743.nix
View file

@ -6,13 +6,15 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".tc358743 = { raspberry-pi."4".tc358743 = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "" // {
Enable support for the Toshiba TC358743 HDMI-to-CSI-2 converter. description = ''
Enable support for the Toshiba TC358743 HDMI-to-CSI-2 converter.
This can be tested with a plugged in converter device and for example This can be tested with a plugged in converter device and for example
running ustreamer (which starts webservice providing a camera stream): running ustreamer (which starts webservice providing a camera stream):
''${pkgs.ustreamer}/bin/ustreamer --persistent --dv-timings ''${pkgs.ustreamer}/bin/ustreamer --persistent --dv-timings
''; '';
};
lanes = lib.mkOption { lanes = lib.mkOption {
type = lib.types.enum [ type = lib.types.enum [
2 2
@ -23,11 +25,13 @@ in
Number of CSI lanes available Number of CSI lanes available
''; '';
}; };
media-controller = lib.mkEnableOption '' media-controller = lib.mkEnableOption "" // {
Enable support for the Media Controller API. description = ''
Enable support for the Media Controller API.
See https://forums.raspberrypi.com/viewtopic.php?t=322076 for details See https://forums.raspberrypi.com/viewtopic.php?t=322076 for details
''; '';
};
}; };
}; };

18
raspberry-pi/4/touch-ft5406.nix
View file

@ -6,16 +6,18 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".touch-ft5406 = { raspberry-pi."4".touch-ft5406 = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "" // {
Enable the touch controller of the official Raspberry Pi touch diplay. description = ''
Enable the touch controller of the official Raspberry Pi touch diplay.
The overlay is taken from the official Raspberry Pi Linux fork, and The overlay is taken from the official Raspberry Pi Linux fork, and
the `compatible` field is updated to match the target device tree. the `compatible` field is updated to match the target device tree.
https://github.com/raspberrypi/linux/blob/14b35093ca68bf2c81bbc90aace5007142b40b40/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts https://github.com/raspberrypi/linux/blob/14b35093ca68bf2c81bbc90aace5007142b40b40/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
For more information about the touch display, please refer to: For more information about the touch display, please refer to:
https://www.raspberrypi.com/documentation/accessories/display.html https://www.raspberrypi.com/documentation/accessories/display.html
''; '';
};
}; };
}; };

6
raspberry-pi/4/tv-hat.nix
View file

@ -6,9 +6,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".tv-hat = { raspberry-pi."4".tv-hat = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "support for the Raspberry Pi TV Hat";
support for the Raspberry Pi TV Hat.
'';
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -22,7 +20,7 @@ in
dtsText = " dtsText = "
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/{ /{
compatible = \"brcm,bcm2711\"; compatible = \"brcm,bcm2711\";
fragment@0 { fragment@0 {

4
raspberry-pi/4/xhci.nix
View file

@ -9,9 +9,7 @@ in
{ {
options.hardware = { options.hardware = {
raspberry-pi."4".xhci = { raspberry-pi."4".xhci = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption "builtin XHCI controller for USB with otg_mode=1 in config.txt";
Enable builtin XHCI controller for USB with otg_mode=1 in config.txt
'';
}; };
}; };