From f3ffdd3ac06567500fbe6937755b61b501242ac6 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 10 May 2022 16:40:16 +0200 Subject: udev-toradex-rules: update udev rules for kernels after 5.4 ``` commit a6d094403cd6 ("ARM: dts: imx: Change usdhc node name on i.MX6/i.MX7 SoCs") commit bffe02ccca5b ("ARM: dts: imx: make wdog node name generic") ``` in kernel source has changed the `usdhc`, `watchdog` node names, adapt the udev rules to match both the old and new naming scheme. Related-to: ELB-4373 Signed-off-by: Ming Liu --- recipes-core/udev/files/apalis-imx6/99-toradex.rules | 8 ++++++++ recipes-core/udev/files/apalis-tk1/99-toradex.rules | 7 +++++++ recipes-core/udev/files/colibri-imx6/99-toradex.rules | 6 ++++++ recipes-core/udev/files/colibri-imx6ull-emmc/99-toradex.rules | 6 ++++++ recipes-core/udev/files/colibri-imx6ull/99-toradex.rules | 6 ++++++ recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules | 5 +++++ recipes-core/udev/files/colibri-imx7/99-toradex.rules | 5 +++++ recipes-core/udev/udev-toradex-rules.bb | 1 + 8 files changed, 44 insertions(+) (limited to 'recipes-core') diff --git a/recipes-core/udev/files/apalis-imx6/99-toradex.rules b/recipes-core/udev/files/apalis-imx6/99-toradex.rules index e65ad07..5adc0d4 100644 --- a/recipes-core/udev/files/apalis-imx6/99-toradex.rules +++ b/recipes-core/udev/files/apalis-imx6/99-toradex.rules @@ -8,13 +8,21 @@ ACTION=="add", ATTRS{iomem_base}=="0x21E8000", SYMLINK+="apalis-uart2" ACTION=="add", ATTRS{iomem_base}=="0x21F0000", SYMLINK+="apalis-uart3" ACTION=="add", ATTRS{iomem_base}=="0x21F4000", SYMLINK+="apalis-uart4" ACTION=="add", KERNELS=="20bc000.wdog", SYMLINK+="apalis-watchdog" +ACTION=="add", KERNELS=="20bc000.watchdog", SYMLINK+="apalis-watchdog" ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="2008000.*spi", SYMLINK+="apalis-spi1-cs%n" ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="200c000.*spi", SYMLINK+="apalis-spi2-cs%n" KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc" +KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.mmc", SYMLINK+="emmc" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2194000.usdhc", SYMLINK+="apalis-sd4bit" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2194000.mmc", SYMLINK+="apalis-sd4bit" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2194000.usdhc", SYMLINK+="apalis-sd4bit-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2194000.mmc", SYMLINK+="apalis-sd4bit-part%n" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.mmc", SYMLINK+="apalis-mmc8bit" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.mmc", SYMLINK+="apalis-mmc8bit-part%n" diff --git a/recipes-core/udev/files/apalis-tk1/99-toradex.rules b/recipes-core/udev/files/apalis-tk1/99-toradex.rules index 9f399d7..d74c13b 100644 --- a/recipes-core/udev/files/apalis-tk1/99-toradex.rules +++ b/recipes-core/udev/files/apalis-tk1/99-toradex.rules @@ -1,7 +1,14 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.sdhci", SYMLINK+="emmc" +KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.mmc", SYMLINK+="emmc" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.sdhci", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="700b0600.sdhci", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="700b0600.mmc", SYMLINK+="emmc-part%n" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0400.mmc", SYMLINK+="apalis-sd4bit" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0400.mmc", SYMLINK+="apalis-sd4bit-part%n" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0000.sdhci", SYMLINK+="apalis-mmc8bit" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0000.mmc", SYMLINK+="apalis-mmc8bit" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0000.sdhci", SYMLINK+="apalis-mmc8bit-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0000.mmc", SYMLINK+="apalis-mmc8bit-part%n" diff --git a/recipes-core/udev/files/colibri-imx6/99-toradex.rules b/recipes-core/udev/files/colibri-imx6/99-toradex.rules index fb5ffaa..e1d5f1b 100644 --- a/recipes-core/udev/files/colibri-imx6/99-toradex.rules +++ b/recipes-core/udev/files/colibri-imx6/99-toradex.rules @@ -6,10 +6,16 @@ ACTION=="add", ATTRS{iomem_base}=="0x2020000", SYMLINK+="colibri-uarta" ACTION=="add", ATTRS{iomem_base}=="0x21E8000", SYMLINK+="colibri-uartb" ACTION=="add", ATTRS{iomem_base}=="0x21EC000", SYMLINK+="colibri-uartc" ACTION=="add", KERNELS=="20bc000.wdog", SYMLINK+="colibri-watchdog" +ACTION=="add", KERNELS=="20bc000.watchdog", SYMLINK+="colibri-watchdog" ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="2014000.*spi", SYMLINK+="colibri-spi-cs%n" KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc" +KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.mmc", SYMLINK+="emmc" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd-part%n" diff --git a/recipes-core/udev/files/colibri-imx6ull-emmc/99-toradex.rules b/recipes-core/udev/files/colibri-imx6ull-emmc/99-toradex.rules index 651050a..40f9444 100644 --- a/recipes-core/udev/files/colibri-imx6ull-emmc/99-toradex.rules +++ b/recipes-core/udev/files/colibri-imx6ull-emmc/99-toradex.rules @@ -4,10 +4,16 @@ ACTION=="add", ATTRS{iomem_base}=="0x2020000", SYMLINK+="colibri-uarta" ACTION=="add", ATTRS{iomem_base}=="0x21E8000", SYMLINK+="colibri-uartb" ACTION=="add", ATTRS{iomem_base}=="0x21F4000", SYMLINK+="colibri-uartc" ACTION=="add", KERNELS=="20bc000.wdog", SYMLINK+="colibri-watchdog" +ACTION=="add", KERNELS=="20bc000.watchdog", SYMLINK+="colibri-watchdog" ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="2008000.*spi", SYMLINK+="colibri-spi-cs%n" KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.usdhc", SYMLINK+="emmc" +KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.mmc", SYMLINK+="emmc" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2194000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2194000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd-part%n" diff --git a/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules b/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules index 651050a..40f9444 100644 --- a/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules +++ b/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules @@ -4,10 +4,16 @@ ACTION=="add", ATTRS{iomem_base}=="0x2020000", SYMLINK+="colibri-uarta" ACTION=="add", ATTRS{iomem_base}=="0x21E8000", SYMLINK+="colibri-uartb" ACTION=="add", ATTRS{iomem_base}=="0x21F4000", SYMLINK+="colibri-uartc" ACTION=="add", KERNELS=="20bc000.wdog", SYMLINK+="colibri-watchdog" +ACTION=="add", KERNELS=="20bc000.watchdog", SYMLINK+="colibri-watchdog" ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="2008000.*spi", SYMLINK+="colibri-spi-cs%n" KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.usdhc", SYMLINK+="emmc" +KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.mmc", SYMLINK+="emmc" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2194000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2194000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.mmc", SYMLINK+="colibri-sd-part%n" 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 cdb2feb..5284db0 100644 --- a/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules +++ b/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules @@ -6,8 +6,13 @@ ACTION=="add", ATTRS{iomem_base}=="0x30880000", SYMLINK+="colibri-uartc" ACTION=="add", KERNEL=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog" ACTION=="add", 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" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b60000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b60000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="30b40000.mmc", SYMLINK+="colibri-sd" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b40000.mmc", SYMLINK+="colibri-sd-part%n" diff --git a/recipes-core/udev/files/colibri-imx7/99-toradex.rules b/recipes-core/udev/files/colibri-imx7/99-toradex.rules index cdb2feb..5284db0 100644 --- a/recipes-core/udev/files/colibri-imx7/99-toradex.rules +++ b/recipes-core/udev/files/colibri-imx7/99-toradex.rules @@ -6,8 +6,13 @@ ACTION=="add", ATTRS{iomem_base}=="0x30880000", SYMLINK+="colibri-uartc" ACTION=="add", KERNEL=="watchdog", DRIVERS=="rn5t618-wdt", SYMLINK+="colibri-watchdog" ACTION=="add", 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" KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+="emmc-boot%n" +KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.mmc", SYMLINK+="emmc-boot%n" KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b60000.usdhc", SYMLINK+="emmc-part%n" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b60000.mmc", SYMLINK+="emmc-part%n" SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh" ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd" +ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="30b40000.mmc", SYMLINK+="colibri-sd" ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd-part%n" +ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b40000.mmc", SYMLINK+="colibri-sd-part%n" diff --git a/recipes-core/udev/udev-toradex-rules.bb b/recipes-core/udev/udev-toradex-rules.bb index a4833ca..a94da96 100644 --- a/recipes-core/udev/udev-toradex-rules.bb +++ b/recipes-core/udev/udev-toradex-rules.bb @@ -1,3 +1,4 @@ +DESCRIPTION = "udev rules for Toradex SOCs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -- cgit v1.2.3