Unverified Commit 8332ad71 authored by Phil Elwell's avatar Phil Elwell Committed by GitHub
Browse files

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: https://github.com/raspberrypi/firmware/issues/1174



Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
parent 18acdefe

arch/arm/boot/dts/overlays/Makefile

+4 −0
Original line number Diff line number Diff line 
# Overlays for the Raspberry Pi platform



dtbo-$(CONFIG_ARCH_BCM2835) += \

	act-led.dtbo \

	adau1977-adc.dtbo \

	adau7002-simple.dtbo \

	ads1015.dtbo \
@@ -26,6 +27,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ 
	dht11.dtbo \

	dionaudio-loco.dtbo \

	dionaudio-loco-v2.dtbo \

	disable-bt.dtbo \

	disable-wifi.dtbo \

	dpi18.dtbo \

	dpi24.dtbo \

	draws.dtbo \
@@ -91,6 +94,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ 
	media-center.dtbo \

	midi-uart0.dtbo \

	midi-uart1.dtbo \

	miniuart-bt.dtbo \

	mmc.dtbo \

	mpu6050.dtbo \

	mz61581.dtbo \

arch/arm/boot/dts/overlays/README

+62 −35
Original line number Diff line number Diff line
@@ -180,14 +180,16 @@ Params: 


        act_led_activelow       Set to "on" to invert the sense of the LED

                                (default "off")

                                N.B. For Pi3 see pi3-act-led overlay.

                                N.B. For Pi 3B, 3B+, 3A+ and 4B, use the act-led

                                overlay.



        act_led_gpio            Set which GPIO to use for the activity LED

                                (in case you want to connect it to an external

                                device)

                                (default "16" on a non-Plus board, "47" on a

                                Plus or Pi 2)

                                N.B. For Pi3 see pi3-act-led overlay.

                                N.B. For Pi 3B, 3B+, 3A+ and 4B, use the act-led

                                overlay.



        pwr_led_trigger

        pwr_led_activelow
@@ -205,6 +207,23 @@ Params: 
        and the other i2c baudrate parameters.





Name:   act-led

Info:   Pi 3B, 3B+, 3A+ and 4B use 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.

Load:   dtoverlay=act-led,<param>=<val>

Params: activelow               Set to "on" to invert the sense of the LED

                                (default "off")



        gpio                    Set which GPIO to use for the activity LED

                                (in case you want to connect it to an external

                                device)

                                REQUIRED





Name:   adau1977-adc

Info:   Overlay for activation of ADAU1977 ADC codec over I2C for control

        and I2S for data.
@@ -509,6 +528,21 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec 
                                that does not result in clipping/distortion!)





Name:   disable-bt

Info:   Disable onboard Bluetooth on Pi 3B, 3B+, 3A+, 4B and Zero W, restoring

        UART0/ttyAMA0 over GPIOs 14 & 15.

        N.B. To disable the systemd service that initialises the modem so it

        doesn't use the UART, use 'sudo systemctl disable hciuart'.

Load:   dtoverlay=disable-bt

Params: <None>





Name:   disable-wifi

Info:   Disable onboard WiFi on Pi 3B, 3B+, 3A+, 4B and Zero W.

Load:   dtoverlay=disable-wifi

Params: <None>





Name:   dpi18

Info:   Overlay for a generic 18-bit DPI display

        This uses GPIOs 0-21 (so no I2C, uart etc.), and activates the output
@@ -1447,6 +1481,20 @@ Load: dtoverlay=midi-uart1 
Params: <None>





Name:   miniuart-bt

Info:   Switch the onboard Bluetooth function on Pi 3B, 3B+, 3A+, 4B and Zero W

        to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 &

        15. Note that this may reduce the maximum usable baudrate.

        N.B. It is also necessary to edit /lib/systemd/system/hciuart.service

        and replace ttyAMA0 with ttyS0, unless using Raspbian or another

        distribution with udev rules that create /dev/serial0 and /dev/serial1,

        in which case use /dev/serial1 instead because it will always be

        correct. Furthermore, you must also set core_freq and core_freq_min to

        the same value in config.txt or the miniuart will not work.

Load:   dtoverlay=miniuart-bt

Params: <None>





Name:   mmc

Info:   Selects the bcm2835-mmc SD/MMC driver, optionally with overclock

Load:   dtoverlay=mmc,<param>=<val>
@@ -1509,48 +1557,27 @@ Params: panel Display panel (required): 




Name:   pi3-act-led

Info:   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.

Load:   dtoverlay=pi3-act-led,<param>=<val>

Params: activelow               Set to "on" to invert the sense of the LED

                                (default "off")



        gpio                    Set which GPIO to use for the activity LED

                                (in case you want to connect it to an external

                                device)

                                REQUIRED

Info:   This overlay has been renamed act-led, keeping pi3-act-led as an alias

        for backwards compatibility.

Load:   <Deprecated>





Name:   pi3-disable-bt

Info:   Disable Pi3 Bluetooth and restore UART0/ttyAMA0 over GPIOs 14 & 15

        N.B. To disable the systemd service that initialises the modem so it

        doesn't use the UART, use 'sudo systemctl disable hciuart'.

Load:   dtoverlay=pi3-disable-bt

Params: <None>

Info:   This overlay has been renamed disable-bt, keeping pi3-disable-bt as an

        alias for backwards compatibility.

Load:   <Deprecated>





Name:   pi3-disable-wifi

Info:   Disable Pi3 onboard WiFi

Load:   dtoverlay=pi3-disable-wifi

Params: <None>

Info:   This overlay has been renamed disable-wifi, keeping pi3-disable-wifi as

        an alias for backwards compatibility.

Load:   <Deprecated>





Name:   pi3-miniuart-bt

Info:   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.

        N.B. 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. Furthermore,

        you must also set core_freq=250 in config.txt or the miniuart will not

        work.

Load:   dtoverlay=pi3-miniuart-bt

Params: <None>

Info:   This overlay has been renamed miniuart-bt, keeping pi3-miniuart-bt as

        an alias for backwards compatibility.

Load:   <Deprecated>





Name:   pibell

arch/arm/boot/dts/overlays/act-led-overlay.dts

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/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";

	};

};

arch/arm/boot/dts/overlays/disable-bt-overlay.dts

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/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";

		};

	};

};

arch/arm/boot/dts/overlays/disable-wifi-overlay.dts

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



/{

	compatible = "brcm,bcm2835";



	fragment@0 {

		target = <&mmc>;

		__overlay__ {

			status = "disabled";

		};

	};



	fragment@1 {

		target = <&mmcnr>;

		__overlay__ {

			status = "disabled";

		};

	};

};