-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
overlays: Rename pi3- overlays to be less model-specific (#3052)
Rename the various pi3- overlays to be more generic, listing the devices they apply to in the README. The original names are retained for backwards compatibility as files that just include the new versions - the README marks them as being deprecated. See: raspberrypi/firmware#1174 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- Loading branch information
1 parent
c94a0c8
commit 8c1a7c9
Showing
10 changed files
with
246 additions
and
211 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| /* Pi3 uses a GPIO expander to drive the LEDs which can only be accessed | ||
| from the VPU. There is a special driver for this with a separate DT node, | ||
| which has the unfortunate consequence of breaking the act_led_gpio and | ||
| act_led_activelow dtparams. | ||
|
|
||
| This overlay changes the GPIO controller back to the standard one and | ||
| restores the dtparams. | ||
| */ | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&act_led>; | ||
| frag0: __overlay__ { | ||
| gpios = <&gpio 0 0>; | ||
| }; | ||
| }; | ||
|
|
||
| __overrides__ { | ||
| gpio = <&frag0>,"gpios:4"; | ||
| activelow = <&frag0>,"gpios:8"; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| /* Disable Bluetooth and restore UART0/ttyAMA0 over GPIOs 14 & 15. | ||
| To disable the systemd service that initialises the modem so it doesn't use | ||
| the UART: | ||
|
|
||
| sudo systemctl disable hciuart | ||
| */ | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&uart1>; | ||
| __overlay__ { | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@1 { | ||
| target = <&uart0>; | ||
| __overlay__ { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart0_pins>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@2 { | ||
| target = <&uart0_pins>; | ||
| __overlay__ { | ||
| brcm,pins; | ||
| brcm,function; | ||
| brcm,pull; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@3 { | ||
| target = <&bt_pins>; | ||
| __overlay__ { | ||
| brcm,pins; | ||
| brcm,function; | ||
| brcm,pull; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@4 { | ||
| target-path = "/aliases"; | ||
| __overlay__ { | ||
| serial0 = "/soc/serial@7e201000"; | ||
| serial1 = "/soc/serial@7e215040"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&mmc>; | ||
| __overlay__ { | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@1 { | ||
| target = <&mmcnr>; | ||
| __overlay__ { | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| /* Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore | ||
| UART0/ttyAMA0 over GPIOs 14 & 15. Note that this may reduce the maximum | ||
| usable baudrate. | ||
|
|
||
| It is also necessary to edit /lib/systemd/system/hciuart.service and | ||
| replace ttyAMA0 with ttyS0, unless you have a system with udev rules | ||
| that create /dev/serial0 and /dev/serial1, in which case use /dev/serial1 | ||
| instead because it will always be correct. | ||
|
|
||
| If cmdline.txt uses the alias serial0 to refer to the user-accessable port | ||
| then the firmware will replace with the appropriate port whether or not | ||
| this overlay is used. | ||
| */ | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&uart0>; | ||
| __overlay__ { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart0_pins>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@1 { | ||
| target = <&uart1>; | ||
| __overlay__ { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart1_pins &bt_pins &fake_bt_cts>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@2 { | ||
| target = <&uart0_pins>; | ||
| __overlay__ { | ||
| brcm,pins; | ||
| brcm,function; | ||
| brcm,pull; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@3 { | ||
| target = <&uart1_pins>; | ||
| __overlay__ { | ||
| brcm,pins = <32 33>; | ||
| brcm,function = <2>; /* alt5=UART1 */ | ||
| brcm,pull = <0 2>; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@4 { | ||
| target = <&gpio>; | ||
| __overlay__ { | ||
| fake_bt_cts: fake_bt_cts { | ||
| brcm,pins = <31>; | ||
| brcm,function = <1>; /* output */ | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@5 { | ||
| target-path = "/aliases"; | ||
| __overlay__ { | ||
| serial0 = "/soc/serial@7e201000"; | ||
| serial1 = "/soc/serial@7e215040"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1 @@ | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| /* Pi3 uses a GPIO expander to drive the LEDs which can only be accessed | ||
| from the VPU. There is a special driver for this with a separate DT node, | ||
| which has the unfortunate consequence of breaking the act_led_gpio and | ||
| act_led_activelow dtparams. | ||
|
|
||
| This overlay changes the GPIO controller back to the standard one and | ||
| restores the dtparams. | ||
| */ | ||
|
|
||
| /{ | ||
| compatible = "brcm,bcm2835"; | ||
|
|
||
| fragment@0 { | ||
| target = <&act_led>; | ||
| frag0: __overlay__ { | ||
| gpios = <&gpio 0 0>; | ||
| }; | ||
| }; | ||
|
|
||
| __overrides__ { | ||
| gpio = <&frag0>,"gpios:4"; | ||
| activelow = <&frag0>,"gpios:8"; | ||
| }; | ||
| }; | ||
| #include "act-led-overlay.dts" |
Oops, something went wrong.