Skip to content

Commit 18beaa9

Browse files
Implement andrew feedback improvements, THANK YOU these comments were extremely helpful
1 parent 2ae6492 commit 18beaa9

File tree

21 files changed

+90
-94
lines changed

21 files changed

+90
-94
lines changed

documentation/asciidoc/accessories/display/display_intro.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The https://www.raspberrypi.com/products/raspberry-pi-touch-display/[Raspberry P
55
.The Raspberry Pi 7-inch Touch Display
66
image::images/display.png[The Raspberry Pi 7-inch Touch Display, width="70%"]
77

8-
The Touch Display is compatible with all models of Raspberry Pi, except the Zero series, which lack a DSI connector. The earliest Raspberry Pi models lack appropriate mounting holes, requiring additional mounting hardware to fit the stand-offs on the display PCB.
8+
The Touch Display is compatible with all models of Raspberry Pi, except the Zero series and Keyboard series, which lack a DSI connector. The earliest Raspberry Pi models lack appropriate mounting holes, requiring additional mounting hardware to fit the stand-offs on the display PCB.
99

1010
The display has the following key features:
1111

documentation/asciidoc/accessories/monitor/monitor_intro.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ image::images/drill-hole-template.png[Drill hole template, width="40%"]
5555

5656
=== Power the Monitor
5757

58-
The Raspberry Pi Monitor draws power from a 5V https://en.wikipedia.org/wiki/USB_hardware#USB_Power_Delivery[USB Power Delivery] (USB-PD) power source. Many USB-C-to-USB-C cables, including the official power supplies for the Raspberry Pi 4 and Raspberry Pi 5, support this standard.
58+
The Raspberry Pi Monitor draws power from a 5V https://en.wikipedia.org/wiki/USB_hardware#USB_Power_Delivery[USB Power Delivery] (USB-PD) power source. Many USB-C power supplies, including the official power supplies for the Raspberry Pi 4 and Raspberry Pi 5, support this standard.
5959

6060
When using a power source that provides at least 1.5A of current over USB-PD, the Monitor operates in **Full Power mode**. In Full Power mode, you can use the full range (0%-100%) of display brightness and speaker volume.
6161

62-
When using a power source that does _not_ supply at least 1.5A of current over USB-PD (including all USB-A power sources), the Monitor operates in **Power Saving mode**. Power Saving mode limits the maximum display brightness and the maximum speaker volume to ensure reliable operation. In Power Saving mode, you can use a limited range (0-50%) of display brightness and a limited range (0-60%) of speaker volume. When powered from a Raspberry Pi, the Monitor operates in Power Saving Mode, since Raspberry Pi devices cannot provide 1.5A of current over a USB-A connection.
62+
When using a power source that does _not_ supply at least 1.5A of current over USB-PD (including all USB-A power sources), the Monitor operates in **Power Saving mode**. Power Saving mode limits the maximum display brightness and the maximum speaker volume to ensure reliable operation. In Power Saving mode, you can use a limited range (0-50%) of display brightness and a limited range (0-60%) of speaker volume. When powered from a Raspberry Pi, the Monitor operates in Power Saving mode, since Raspberry Pi devices cannot provide 1.5A of current over a USB-A connection.
6363

64-
To switch from Power Saving mode to Full Power mode, press and hold the *increase brightness* button for 3 seconds. Alternatively, use the power button to turn the display off, then on again. When the Monitor reboots, it will automatically switch to Full Power mode if you use an adequate power source.
64+
To switch from Power Saving mode to Full Power mode, press and hold the *increase brightness* button for 3 seconds.
6565

6666
[TIP]
6767
====
68-
If the screen image cuts in and out, your USB power supply is not capable of providing sufficient current to power the monitor. This can happen if you power the Monitor from a Raspberry Pi 5 or Pi 500 with a 5V/3A power supply. Try the following fixes to stop the image from cutting in and out:
68+
If the Monitor flashes on and off, your USB power supply is not capable of providing sufficient current to power the monitor. This can happen if you power the Monitor from a Raspberry Pi 5 or Pi 500 which is itself powered by a 5V/3A power supply. Try the following fixes to stop the Monitor from flashing on and off:
6969
7070
* reduce the display brightness and volume (you may have to connect your monitor to another power supply to access the settings)
7171
* switch to a different power source or cable
@@ -88,7 +88,7 @@ Brightness: 250cd/m^2^
8888

8989
Screen coating: Anti-glare 3H hardness
9090

91-
Display area: 344mm × 193mm
91+
Display area: 344 × 193mm
9292

9393
Dimensions: 237 × 360 × 20mm
9494

@@ -110,7 +110,7 @@ Power consumption: 4.5-6.5W during use; < 0.1W at idle
110110

111111
Speakers: 2 × 1.2W (stereo)
112112

113-
Ports: 3.5mm AV jack
113+
Ports: 3.5mm audio jack
114114

115115

116116
=== Mechanical drawing

documentation/asciidoc/accessories/touch-display-2/about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The Touch Display 2 connects to a Raspberry Pi using a DSI connector and GPIO co
1515
* powered directly by the host Raspberry Pi, requiring no separate power supply
1616
* supports up to five points of simultaneous multi-touch
1717

18-
The Touch Display 2 is compatible with all models of Raspberry Pi from Raspberry Pi 1B+ onwards, except Raspberry Pi Zero and Zero 2 W, which lack a DSI connector.
18+
The Touch Display 2 is compatible with all models of Raspberry Pi from Raspberry Pi 1B+ onwards, except the Zero series and Keyboard series, which lack a DSI connector.
1919

2020
The Touch Display 2 box contains the following parts (in left to right, top to bottom order in the image below):
2121

documentation/asciidoc/computers/config_txt/boot.adoc

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The `start_file` and the `fixup_file` are a matched pair - using unmatched files
1111

1212
NOTE: Cut-down firmware (`start*cd.elf` and `fixup*cd.dat`) cannot be selected this way - the system will fail to boot. The only way to enable the cut-down firmware is to specify `gpu_mem=16`. The cut-down firmware removes support for codecs, 3D and debug logging as well as limiting the initial early-boot framebuffer to 1080p @16bpp - although KMS can replace this with up to 32bpp 4K framebuffer(s) at a later stage as with any firmware.
1313

14-
NOTE: The Raspberry Pi 5, Compute Module 500, and Raspberry Pi 500 firmware is self-contained in the bootloader EEPROM.
14+
NOTE: The Raspberry Pi 5, Compute Module 5, and Raspberry Pi 500 firmware is self-contained in the bootloader EEPROM.
1515

1616
=== `cmdline`
1717

@@ -41,17 +41,18 @@ Both forms may use the `img` file extension; the bootloader recognizes archives
4141
The following Raspberry Pi models support this flag:
4242

4343
* 2B rev 1.2
44-
* 3
45-
* 3+
46-
* 4
44+
* 3B
45+
* 3A+
46+
* 3B+
47+
* 4B
4748
* 400
4849
* Zero 2 W
4950
* Compute Module 3
5051
* Compute Module 3+
5152
* Compute Module 4
5253
* Compute Module 4S
5354

54-
Flagship models since Raspberry Pi 5, Compute Modules since CM5, and Keyboard models since Pi 500 _only_ support the 64-bit kernel. Models that do not support the 32-bit kernel do not support this flag.
55+
Flagship models since Raspberry Pi 5, Compute Modules since CM5, and Keyboard models since Pi 500 _only_ support the 64-bit kernel. Models that only support a 64-bit kernel ignore this flag.
5556

5657
=== `ramfsfile`
5758

@@ -108,11 +109,12 @@ See also <<overlay_prefix,`overlay_prefix`>> and xref:legacy_config_txt.adoc#ups
108109

109110
USB On-The-Go (often abbreviated to OTG) is a feature that allows supporting USB devices with an appropriate OTG cable to configure themselves as USB hosts. On older Raspberry Pis, a single USB 2 controller was used in both USB host and device mode.
110111

111-
Flagship models since Raspberry Pi 4 and Keyboard models since Pi 400 add a high-performance USB 3 controller, attached via PCIe, to drive the main USB ports. The legacy USB 2 controller is still available on the USB-C power connector for use as a device (`otg_mode=0`, the default). Compute Modules and IO Boards do not include this high-performance USB 3 controller.
112+
Flagship models since Raspberry Pi 4B and Keyboard models since Pi 400 add a high-performance USB 3 controller, attached via PCIe, to drive the main USB ports. The legacy USB 2 controller is still available on the USB-C power connector for use as a device (`otg_mode=0`, the default). Compute Modules before CM5 do not include this high-performance USB 3 controller.
112113

113-
`otg_mode=1` requests that a more capable XHCI USB 2 controller is used as another host controller on that USB-C connector.
114+
`otg_mode=1` requests that a more capable XHCI USB 2 controller is used as an alternative host controller on that USB-C connector.
115+
116+
NOTE: By default, Raspberry Pi OS includes a line in `/boot/firmware/config.txt` that enables this setting on Compute Module 4.
114117

115-
NOTE: Because Compute Modules don't include the external USB 3 controller, Raspberry Pi OS images set `otg_mode=1` on Compute Modules for better performance.
116118

117119
[[overlay_prefix]]
118120
=== `overlay_prefix`
@@ -270,7 +272,9 @@ Compute Modules have a dedicated `nRPIBOOT` jumper to select `RPIBOOT` mode. Fla
270272

271273
This property does not depend on `secure-boot`. However, you should verify that this GPIO configuration does not conflict with any HATs which might pull the GPIO low during boot.
272274

273-
For safety, this property can _only_ be programmed via `RPIBOOT`. As a result, you must first clear the bootloader EEPROM using `erase_eeprom`. This causes the CPU ROM to failover to `RPIBOOT` mode, which then allows this option to be set.
275+
For safety, this property can _only_ be programmed via `RPIBOOT`. As a result, you must first clear the bootloader EEPROM using `erase_eeprom`. This causes the ROM to failover to `RPIBOOT` mode, which then allows this option to be set.
276+
277+
On BCM2712, you can alternatively force `RPIBOOT` mode by holding down the power button while simultaneously connecting a USB-C power supply.
274278

275279
Default: `{nbsp}`
276280

documentation/asciidoc/computers/config_txt/common.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
==== `hdmi_enable_4kp60`
66

7-
NOTE: This option applies only to Raspberry Pi 4, Compute Module 4, and Pi 400.
7+
NOTE: This option applies only to Raspberry Pi 4, Compute Module 4, Compute Module 4S, and Pi 400.
88

9-
By default, when connected to a 4K monitor, the Raspberry Pi 4B, 400 and CM4 will select a 30Hz refresh rate. Use this option to allow selection of 60Hz refresh rates. Raspberry Pi 4 does not support 4Kp60 output on both micro HDMI ports simultaneously. Setting `hdmi_enable_4kp60` increases power consumption and temperature.
9+
By default, when connected to a 4K monitor, certain models select a 30Hz refresh rate. Use this option to allow selection of 60Hz refresh rates. Models impacted by this setting do _not_ support 4Kp60 output on both micro HDMI ports simultaneously. Enabling this setting increases power consumption and temperature.
1010

1111
=== Common hardware configuration options
1212

1313
==== `camera_auto_detect`
1414

15-
Enabled by default.
15+
By default, Raspberry Pi OS includes a line in `/boot/firmware/config.txt` that enables this setting.
1616

1717
When enabled, the firmware will automatically load overlays for recognised CSI cameras.
1818

@@ -42,9 +42,9 @@ For more details, see xref:configuration.adoc#part3.1[DTBs, overlays and config.
4242

4343
==== `arm_boost`
4444

45-
NOTE: This option applies only to Raspberry Pi 4 models with two-phase power delivery, and Pi 400.
45+
NOTE: This option applies only to later Raspberry Pi 4B revisions which include two-phase power delivery, and all revisions of Pi 400.
4646

47-
Enabled by default in supported devices.
47+
By default, Raspberry Pi OS includes a line in `/boot/firmware/config.txt` that enables this setting on supported devices.
4848

4949
Some Raspberry Pi devices have a second switch-mode power supply for the SoC voltage rail. When enabled, increases the default turbo-mode clock from 1.5GHz to 1.8GHz.
5050

@@ -54,6 +54,6 @@ To disable, set `arm_boost=0`.
5454

5555
NOTE: This option applies only to Raspberry Pi 5, Compute Module 5, and Pi 500.
5656

57-
Forces PWM when using a 3V3 power supply.
57+
Forces PWM on 3.3V output from the GPIO header or CSI connector.
5858

5959
To disable, set `power_force_3v3_pwm=0`.

documentation/asciidoc/computers/config_txt/conditional.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The conditional model filters apply according to the following table.
4141
| Pi 500 (also sees `[pi5]` contents)
4242

4343
| `[cm1]`
44-
| Compute Module 4 (also sees `[pi1]` contents)
44+
| Compute Module 1 (also sees `[pi1]` contents)
4545

4646
| `[cm3]`
4747
| Compute Module 3 (also sees `[pi3]` contents)

documentation/asciidoc/computers/config_txt/video.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Set to `1` to enable composite video output and `0` to disable. On Flagship mode
5555
|Model
5656
|Default
5757

58-
|Flagship models since Raspberry Pi 4, Compute Modules since CM4, Keyboard models
58+
|Flagship models since Raspberry Pi 4B, Compute Modules since CM4, Keyboard models
5959
|0
6060

6161
|All other models

documentation/asciidoc/computers/configuration/boot_folder.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Various xref:linux_kernel.adoc#kernel[kernel] image files that correspond to Ras
7676
| `kernel7.img`
7777
| BCM2836, BCM2837
7878
| Pi Zero 2 W, Pi 2, Pi 3
79-
| later revisions of Pi 2 uses the BCM2837
79+
| Later revisions of Pi 2 use BCM2837
8080

8181
| `kernel7l.img`
8282
| BCM2711

documentation/asciidoc/computers/configuration/configuring-networking.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: Starting with Raspberry Pi OS _Bookworm_, Network Manager is the default n
1010

1111
Access Network Manager via the network icon at the right-hand end of the menu bar. If you are using a Raspberry Pi with built-in wireless connectivity, or if a wireless dongle is plugged in, click this icon to bring up a list of available wireless networks. If you see the message 'No APs found - scanning...', wait a few seconds, and Network Manager should find your network.
1212

13-
NOTE: Devices with dual-band wireless automatically disable networking until a you assign a wireless LAN country. Flagship models since Raspberry Pi 3B+, Compute Modules since CM4, and Keyboard models support dual-band wireless. To set a wireless LAN country, open the Raspberry Pi Configuration application from the Preferences menu, select *Localisation* and select your country from the menu.
13+
NOTE: Devices with dual-band wireless automatically disable networking until you assign a wireless LAN country. Flagship models since Raspberry Pi 3B+, Compute Modules since CM4, and Keyboard models support dual-band wireless. To set a wireless LAN country, open the Raspberry Pi Configuration application from the Preferences menu, select *Localisation* and select your country from the menu.
1414

1515
image::images/wifi2.png[wifi2]
1616

documentation/asciidoc/computers/configuration/device-tree.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ This is an extract from the current map file (see the https://github.com/raspber
526526

527527
Each node has the name of an overlay that requires special handling. The properties of each node are either platform names or one of a small number of special directives. The overlay map supports the following platform names:
528528

529-
* `bcm2835` for all Raspberry Pis built around the BCM2835, BCM2836 and BCM2837 SoCs
530-
* `bcm2711` for Raspberry Pi 4B, CM4, and Pi 400
529+
* `bcm2835` for all Raspberry Pis built around the BCM2835, BCM2836, BCM2837, and RP3A0 SoCs
530+
* `bcm2711` for Raspberry Pi 4B, CM4, CM4S, and Pi 400
531531
* `bcm2712` for Raspberry Pi 5, CM5, and Pi 500
532532

533533
A platform name with no value (an empty property) indicates that the current overlay is compatible with the platform; for example, `uart5` is compatible with the `bcm2711` platform. A non-empty value for a platform is the name of an alternative overlay to use in place of the requested one; asking for `disable-bt` on BCM2712 results in `disable-bt-pi5` being loaded instead. Any platform not included in an overlay's node is not compatible with that overlay. Any overlay not mentioned in the map is assumed to be compatible with all platforms.

0 commit comments

Comments
 (0)