recipes-core: udev: change sd-card symlinks to style of emmc rules

This commit does three things:
- Use "-part<number>" instead of "-p" as it is with /dev/emmc symlinks
- Use ENV{DEVTYPE} as it is used with /dev/emmc symlinks to for sure
  be able to distinguish partitions vs. disks
- Use %n in stead of $attr{partition} as it is already used for emmc
  symlink rules

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

11 files changed, 28 insertions, 28 deletions

diff --git a/recipes-core/udev/files/apalis-imx6/99-toradex.rules b/recipes-core/udev/files/apalis-imx6/99-toradex.rules
index 49225f5..07f1661 100644
--- a/recipes-core/udev/files/apalis-imx6/99-toradex.rules
+++ b/recipes-core/udev/files/apalis-imx6/99-toradex.rules
@@ -14,7 +14,7 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+=
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.usdhc", 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]p[0-9]*", KERNELS=="2194000.usdhc", SYMLINK+="apalis-sd4bit-p$attr{partition}"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2194000.usdhc", SYMLINK+="apalis-sd4bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="2194000.usdhc", SYMLINK+="apalis-sd4bit-part%n"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="2190000.usdhc", SYMLINK+="apalis-mmc8bit-part%n"
diff --git a/recipes-core/udev/files/apalis-imx8/99-toradex.rules b/recipes-core/udev/files/apalis-imx8/99-toradex.rules
index 9af65d1..ef9d40e 100644
--- a/recipes-core/udev/files/apalis-imx8/99-toradex.rules
+++ b/recipes-core/udev/files/apalis-imx8/99-toradex.rules
@@ -12,7 +12,7 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="5b010000.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=="5b030000.mmc", SYMLINK+="apalis-sd4bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="5b030000.mmc", SYMLINK+="apalis-sd4bit-p$attr{partition}"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b030000.mmc", SYMLINK+="apalis-sd4bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="5b030000.mmc", SYMLINK+="apalis-sd4bit-part%n"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit-part%n"
diff --git a/recipes-core/udev/files/apalis-imx8x/99-toradex.rules b/recipes-core/udev/files/apalis-imx8x/99-toradex.rules
index 30dbbec..a5fc57b 100644
--- a/recipes-core/udev/files/apalis-imx8x/99-toradex.rules
+++ b/recipes-core/udev/files/apalis-imx8x/99-toradex.rules
@@ -13,5 +13,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="5b010000.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=="5b020000.mmc", SYMLINK+="apalis-mmc8bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b020000.mmc", SYMLINK+="apalis-mmc8bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="5b020000.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 988cb6d..0a8e45f 100644
--- a/recipes-core/udev/files/apalis-tk1/99-toradex.rules
+++ b/recipes-core/udev/files/apalis-tk1/99-toradex.rules
@@ -1,7 +1,7 @@
 KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.sdhci", SYMLINK+="emmc"
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0600.sdhci", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="700b0600.sdhci", SYMLINK+="emmc-part%n"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit-p$attr{partition}"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="700b0000.sdhci", SYMLINK+="apalis-mmc8bit"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="700b0000.sdhci", SYMLINK+="apalis-mmc8bit-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="700b0400.sdhci", SYMLINK+="apalis-sd4bit-part%n"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="700b0000.sdhci", SYMLINK+="apalis-mmc8bit"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="700b0000.sdhci", 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 133c813..161f83f 100644
--- a/recipes-core/udev/files/colibri-imx6/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx6/99-toradex.rules
@@ -11,5 +11,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+=
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2198000.usdhc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="2198000.usdhc", 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]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="2190000.usdhc", 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 8ce0fd6..80ef25b 100644
--- a/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx6ull/99-toradex.rules
@@ -6,5 +6,5 @@ ACTION=="add", ATTRS{iomem_base}=="0x21F4000", SYMLINK+="colibri-uartc"
 ACTION=="add", KERNELS=="20bc000.wdog", SYMLINK+="colibri-watchdog"
 ACTION=="add", SUBSYSTEM=="spidev", KERNELS=="2008000.*spi", SYMLINK+="colibri-spi-cs%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]p[0-9]*", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="2190000.usdhc", SYMLINK+="colibri-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="2190000.usdhc", 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 2d1d675..ae80f8b 100644
--- a/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx7-emmc/99-toradex.rules
@@ -9,5 +9,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.usdhc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b60000.usdhc", 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]p[0-9]*", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="30b40000.usdhc", 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 2371a91..56f454f 100644
--- a/recipes-core/udev/files/colibri-imx7/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx7/99-toradex.rules
@@ -6,5 +6,5 @@ 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"
 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]p[0-9]*", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="30b40000.usdhc", SYMLINK+="colibri-sd-part%n"
diff --git a/recipes-core/udev/files/colibri-imx8x/99-toradex.rules b/recipes-core/udev/files/colibri-imx8x/99-toradex.rules
index 2d5c010..9f9a63a 100644
--- a/recipes-core/udev/files/colibri-imx8x/99-toradex.rules
+++ b/recipes-core/udev/files/colibri-imx8x/99-toradex.rules
@@ -9,5 +9,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b010000.mmc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="5b010000.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=="5b020000.mmc", SYMLINK+="colibri-sd"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="5b020000.mmc", SYMLINK+="colibri-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="5b020000.mmc", SYMLINK+="colibri-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="5b020000.mmc", SYMLINK+="colibri-sd-part%n"
diff --git a/recipes-core/udev/files/verdin-imx8mm/99-toradex.rules b/recipes-core/udev/files/verdin-imx8mm/99-toradex.rules
index 66f54c4..5ae5e61 100644
--- a/recipes-core/udev/files/verdin-imx8mm/99-toradex.rules
+++ b/recipes-core/udev/files/verdin-imx8mm/99-toradex.rules
@@ -11,5 +11,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b40000.mmc", SYMLINK+="
 KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b40000.mmc", SYMLINK+="emmc-boot%n"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="30b40000.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=="30b50000.mmc", SYMLINK+="verdin-sd"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd-part%n"
diff --git a/recipes-core/udev/files/verdin-imx8mp/99-toradex.rules b/recipes-core/udev/files/verdin-imx8mp/99-toradex.rules
index 8eedaf2..98054a6 100644
--- a/recipes-core/udev/files/verdin-imx8mp/99-toradex.rules
+++ b/recipes-core/udev/files/verdin-imx8mp/99-toradex.rules
@@ -12,5 +12,5 @@ KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b60000.mmc", SYMLINK+="
 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.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=="30b50000.mmc", SYMLINK+="verdin-sd"
-ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd-p$attr{partition}"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", ENV{DEVTYPE}=="partition", KERNELS=="30b50000.mmc", SYMLINK+="verdin-sd-part%n"