diff -Nru ubuntu-settings-21.10.4/data/raspberrypi/10-raspi-eth0.link ubuntu-settings-22.04.1/data/raspberrypi/10-raspi-eth0.link
--- ubuntu-settings-21.10.4/data/raspberrypi/10-raspi-eth0.link	1970-01-01 01:00:00.000000000 +0100
+++ ubuntu-settings-22.04.1/data/raspberrypi/10-raspi-eth0.link	2021-12-06 17:54:55.000000000 +0000
@@ -0,0 +1,6 @@
+[Match]
+Driver=bcmgenet smsc95xx lan78xx
+OriginalName=en*
+
+[Link]
+Name=eth0
diff -Nru ubuntu-settings-21.10.4/data/raspberrypi/10-rpi-ethernet-eth0.yaml ubuntu-settings-22.04.1/data/raspberrypi/10-rpi-ethernet-eth0.yaml
--- ubuntu-settings-21.10.4/data/raspberrypi/10-rpi-ethernet-eth0.yaml	2021-09-22 10:39:23.000000000 +0100
+++ ubuntu-settings-22.04.1/data/raspberrypi/10-rpi-ethernet-eth0.yaml	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-network:
-  ethernets:
-    eth0:
-      # Rename the built-in ethernet device to "eth0"
-      match:
-        driver: bcmgenet smsc95xx lan78xx
-      set-name: eth0
-      dhcp4: true
-      optional: true
diff -Nru ubuntu-settings-21.10.4/data/raspberrypi/99-gpio.rules ubuntu-settings-22.04.1/data/raspberrypi/99-gpio.rules
--- ubuntu-settings-21.10.4/data/raspberrypi/99-gpio.rules	1970-01-01 01:00:00.000000000 +0100
+++ ubuntu-settings-22.04.1/data/raspberrypi/99-gpio.rules	2021-12-06 17:54:55.000000000 +0000
@@ -0,0 +1,4 @@
+SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="i2c-dev", KERNEL=="i2c*", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="gpio", KERNEL=="gpiochip*", GROUP="dialout", MODE="0660"
diff -Nru ubuntu-settings-21.10.4/data/raspberrypi/meson.build ubuntu-settings-22.04.1/data/raspberrypi/meson.build
--- ubuntu-settings-21.10.4/data/raspberrypi/meson.build	2021-09-22 10:39:23.000000000 +0100
+++ ubuntu-settings-22.04.1/data/raspberrypi/meson.build	2021-12-06 17:54:55.000000000 +0000
@@ -1,9 +1,13 @@
 etc = get_option('sysconfdir')
 var_lib = get_option('sharedstatedir')
 
-install_data('10-rpi-ethernet-eth0.yaml',
-             install_dir: etc / 'netplan')
+install_data('10-raspi-eth0.link',
+             install_dir: 'lib/systemd/network')
 install_data('ZZraspi-wifi-powersave-off.conf',
              install_dir: 'lib/NetworkManager/conf.d')
 install_data('disable-suspend.pkla',
              install_dir: var_lib / 'polkit-1/localauthority/10-vendor.d')
+install_data('99-gpio.rules',
+             install_dir: 'lib/udev/rules.d')
+install_data('raspi-lz4.conf',
+             install_dir: etc / 'initramfs-tools/conf.d')
diff -Nru ubuntu-settings-21.10.4/data/raspberrypi/raspi-lz4.conf ubuntu-settings-22.04.1/data/raspberrypi/raspi-lz4.conf
--- ubuntu-settings-21.10.4/data/raspberrypi/raspi-lz4.conf	1970-01-01 01:00:00.000000000 +0100
+++ ubuntu-settings-22.04.1/data/raspberrypi/raspi-lz4.conf	2021-12-06 17:54:55.000000000 +0000
@@ -0,0 +1,5 @@
+# zstd compression is extremely slow on the Pi, but also takes up far
+# too much memory, resulting in OOM on the 512MB platforms (Pi Zero 2,
+# and the 3A+). Use the old lz4 default on the Pi (LP: #1950214)
+
+COMPRESS=lz4
diff -Nru ubuntu-settings-21.10.4/debian/changelog ubuntu-settings-22.04.1/debian/changelog
--- ubuntu-settings-21.10.4/debian/changelog	2021-09-22 10:39:23.000000000 +0100
+++ ubuntu-settings-22.04.1/debian/changelog	2021-12-06 17:54:55.000000000 +0000
@@ -1,3 +1,16 @@
+ubuntu-settings (22.04.1) jammy; urgency=medium
+
+  * Reinstate changes from 21.04.3:
+    - Adding 99-gpio.rules udev rules for Raspberry Pi GPIO functionality
+      (LP: #1923672)
+    - Replace netplan eth0 renaming rules for raspi with networkd link unit
+      (LP: #1922266)
+  * Override initramfs compression to lz4 to prevent OOM on 512MB platforms,
+    and add a dependency on lz4 to d/control (LP: #1950214)
+  * d/control: Correct spelling of raspberry
+
+ -- Dave Jones <dave.jones@canonical.com>  Mon, 06 Dec 2021 17:54:55 +0000
+
 ubuntu-settings (21.10.4) impish; urgency=medium
 
   [ Olivier Tilloy ]
diff -Nru ubuntu-settings-21.10.4/debian/control ubuntu-settings-22.04.1/debian/control
--- ubuntu-settings-21.10.4/debian/control	2021-09-22 10:39:23.000000000 +0100
+++ ubuntu-settings-22.04.1/debian/control	2021-12-06 17:54:55.000000000 +0000
@@ -24,7 +24,7 @@
 
 Package: ubuntu-raspi-settings
 Architecture: all
-Depends: ${misc:Depends}
-Description: default settings for Rasperry Pi devices
-  This package contains some default settings that are specific to Rasperry Pi
-  devices.
+Depends: ${misc:Depends}, lz4
+Description: default settings for Raspberry Pi devices
+ This package contains some default settings that are specific to Raspberry Pi
+ devices.
diff -Nru ubuntu-settings-21.10.4/debian/ubuntu-raspi-settings.install ubuntu-settings-22.04.1/debian/ubuntu-raspi-settings.install
--- ubuntu-settings-21.10.4/debian/ubuntu-raspi-settings.install	2021-09-22 10:39:23.000000000 +0100
+++ ubuntu-settings-22.04.1/debian/ubuntu-raspi-settings.install	2021-12-06 17:54:55.000000000 +0000
@@ -1,3 +1,5 @@
-etc/netplan/10-rpi-ethernet-eth0.yaml
+usr/lib/systemd/network/10-raspi-eth0.link
 usr/lib/NetworkManager/conf.d/ZZraspi-wifi-powersave-off.conf
 var/lib/polkit-1/localauthority/10-vendor.d/disable-suspend.pkla
+usr/lib/udev/rules.d/99-gpio.rules
+etc/initramfs-tools/conf.d/raspi-lz4.conf