toradex apalis/colibri: use common USB product id fallback

All modules use the common g_dnl_bind_fixup implementaton which
calculates the PID according to product id (read from the config
block) plus offset of 0x4000. In case there is no config block
support (e.g. SPL) or in case the config block is not readable,
fall back to a generic product id (product id 0, which can be
interpreted as "Unknown Module").

Signed-off-by: Stefan Agner <[email protected]>
Acked-by: Max Krummenacher <[email protected]>

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index c0cd79af78ac64035ff50fa00bf5407db8d5ac72..dc10e413339080d78f3c514be5f526b258c20fa4 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -46,6 +46,6 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
+CONFIG_G_DNL_PRODUCT_NUM=0x4000
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index d5ea1c24ef669a79e92d64e9899bd4aeade2867a..5f8912b160f99d16623309bd5b024755d1c88323 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -41,6 +41,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_G_DNL_MANUFACTURER="Toradex"
+CONFIG_G_DNL_VENDOR_NUM=0x1b67
+CONFIG_G_DNL_PRODUCT_NUM=0x4000

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index ac16a7d13776d1bfdd45b5b5695a5a3b3eb07f54..b7f6f4c760f1c8252d87816c93a3c8dd6700caac 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -46,6 +46,6 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
+CONFIG_G_DNL_PRODUCT_NUM=0x4000
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
index c75f7d45fd9d60144f1afa7c06c3d54c3824c663..4a8beaf2e52d26d2096132718582f4bd0e3d32a3 100644 (file)
--- a/configs/colibri_imx6_nospl_defconfig
+++ b/configs/colibri_imx6_nospl_defconfig
@@ -38,6 +38,6 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
+CONFIG_G_DNL_PRODUCT_NUM=0x4000
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 341c99d0df18471a36c04ec34695f373fee5173a..f4b84405b0763c5f1a04974db57103cc3faffe43 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -53,4 +53,4 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
+CONFIG_G_DNL_PRODUCT_NUM=0x4000

diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 499f464435da767bc4ab9a65fa50ea73f6dc744c..6ac29d79b551d7c932542eec2c7a871598d66e1c 100644 (file)
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -46,9 +46,9 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_G_DNL_MANUFACTURER="Toradex"
+CONFIG_G_DNL_VENDOR_NUM=0x1b67
+CONFIG_G_DNL_PRODUCT_NUM=0x4000
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_CONSOLE_SCROLL_LINES=10

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 6db99067315aafa4fc9f126d438632a006c2c00e..21dec11ffa885cb3a324f2091e7f88c48d8bb50b 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -36,6 +36,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_G_DNL_MANUFACTURER="Toradex"
+CONFIG_G_DNL_VENDOR_NUM=0x1b67
+CONFIG_G_DNL_PRODUCT_NUM=0x4000

diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 0a12e1a5215b06f68fccb8ca3599cc085ba26e97..0b55f198fafff1af88b85146f462138c34888337 100644 (file)
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -48,4 +48,4 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x0016
+CONFIG_G_DNL_PRODUCT_NUM=0x4000