udev-toradex-rules: colibri-imx7: Fix watchdog symlinks creation

Fix these unwanted behaviors:
- With kernel >= v6.3 /dev/colibri-watchdog-som and /dev/colibri-watchdog
  are missing. Driver init sequence changes, the KERNEL label changes
  from watchdog to watchdog1 and relevant rule that create the symlinks
  stops matching.
- With kernel < v6.3 /dev/colibri-watchdog-som and /dev/colibri-watchdog-soc
  are pointing to the same device, respectively /dev/watchdog0 (miscdev)
  and /dev/watchdog (cdev) using the same watchdog device
  (the SoM rn5t618 watchdog). Instead, it is expected that
  /dev/colibri-watchdog-soc links to the SoC imx2-wdt watchdog device.

These are the current two configurations:
< v6.3:
  /dev/colibri-watchdog -> watchdog0 (rn5t618)
  /dev/colibri-watchdog-soc -> watchdog1 (imx2-wdt)
  /dev/colibri-watchdog-som -> watchdog0 (rn5t618)
>= v6.3:
  /dev/colibri-watchdog -> watchdog1 (rn5t618)
  /dev/colibri-watchdog-soc -> watchdog0 (imx2-wdt)
  /dev/colibri-watchdog-som -> watchdog1 (rn5t618)

Related-to: ELB-5315
Fixes: 9f9fa5d6c8ed ("udev-toradex-rules: Add additional watchdog symlink")
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
(cherry picked from commit 73e42815204f68ac520037afe7046f6022d7bb55)

2 files changed, 4 insertions, 4 deletions

diff --git a/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules b/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules
index dd59db5..2d8aff4 100644
--- a/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules
@@ -3,8 +3,8 @@ ACTION=="add|change", KERNEL=="i2c-[0-9]*", ATTRS{name}=="30a20000.i2c", SYMLINK
 ACTION=="add|change", ATTRS{iomem_base}=="0x30860000", SYMLINK+="colibri-uarta"
 ACTION=="add|change", ATTRS{iomem_base}=="0x30890000", SYMLINK+="colibri-uartb"
 ACTION=="add|change", ATTRS{iomem_base}=="0x30880000", SYMLINK+="colibri-uartc"
-ACTION=="add|change", KERNEL=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog", SYMLINK+="colibri-watchdog-som"
-ACTION=="add|change", SUBSYSTEM=="watchdog", KERNELS=="soc*", SYMLINK+="colibri-watchdog-soc"
+ACTION=="add|change", SUBSYSTEM=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog", SYMLINK+="colibri-watchdog-som"
+ACTION=="add|change", SUBSYSTEM=="watchdog", DRIVERS=="imx2-wdt", SYMLINK+="colibri-watchdog-soc"
 ACTION=="add|change", SUBSYSTEM=="spidev", KERNELS=="30840000.*spi", SYMLINK+="colibri-spi-cs%n"
 KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+="emmc"
 KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.mmc", SYMLINK+="emmc"
diff --git a/recipes-core/udev/files/colibri-imx7/99-toradex.rules b/recipes-core/udev/files/colibri-imx7/99-toradex.rules
index dd59db5..2d8aff4 100644
--- a/recipes-core/udev/files/colibri-imx7/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx7/99-toradex.rules
@@ -3,8 +3,8 @@ ACTION=="add|change", KERNEL=="i2c-[0-9]*", ATTRS{name}=="30a20000.i2c", SYMLINK
 ACTION=="add|change", ATTRS{iomem_base}=="0x30860000", SYMLINK+="colibri-uarta"
 ACTION=="add|change", ATTRS{iomem_base}=="0x30890000", SYMLINK+="colibri-uartb"
 ACTION=="add|change", ATTRS{iomem_base}=="0x30880000", SYMLINK+="colibri-uartc"
-ACTION=="add|change", KERNEL=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog", SYMLINK+="colibri-watchdog-som"
-ACTION=="add|change", SUBSYSTEM=="watchdog", KERNELS=="soc*", SYMLINK+="colibri-watchdog-soc"
+ACTION=="add|change", SUBSYSTEM=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog", SYMLINK+="colibri-watchdog-som"
+ACTION=="add|change", SUBSYSTEM=="watchdog", DRIVERS=="imx2-wdt", SYMLINK+="colibri-watchdog-soc"
 ACTION=="add|change", SUBSYSTEM=="spidev", KERNELS=="30840000.*spi", SYMLINK+="colibri-spi-cs%n"
 KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+="emmc"
 KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.mmc", SYMLINK+="emmc"