Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d6eae7b0b172b3ef31a3f816ce946857f382ac4e

Authored by Lukasz Majewski
Committed by Marek Vasut
1 parent 7b412ab31f
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

usb:g_dnl: Add name parameter to g_dnl_bind_fixup function 

New parameter, namely *name has been added to g_dnl_bind_fixup().
It is necessary (for compatibility reasons) to assign new USB idProduct
and idVendor for different usb functions.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

board/siemens/common/factoryset.c
Diff comments   View file @ d6eae7b
... ... @@ -275,7 +275,7 @@
275 275 return ret;
276 276 }
277 277  
278   -int g_dnl_bind_fixup(struct usb_device_descriptor *dev)
  278 +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
279 279 {
280 280 put_unaligned(factory_dat.usb_vendor_id, &dev->idVendor);
281 281 put_unaligned(factory_dat.usb_product_id, &dev->idProduct);
drivers/usb/gadget/g_dnl.c
Diff comments   View file @ d6eae7b
... ... @@ -126,7 +126,7 @@
126 126 }
127 127  
128 128 __weak
129   -int g_dnl_bind_fixup(struct usb_device_descriptor *dev)
  129 +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
130 130 {
131 131 return 0;
132 132 }
... ... @@ -153,7 +153,7 @@
153 153 g_dnl_string_defs[1].id = id;
154 154 device_desc.iProduct = id;
155 155  
156   - g_dnl_bind_fixup(&device_desc);
  156 + g_dnl_bind_fixup(&device_desc, cdev->driver->name);
157 157 ret = g_dnl_config_register(cdev);
158 158 if (ret)
159 159 goto error;
... ... @@ -10,7 +10,7 @@
10 10  
11 11 #include <linux/usb/ch9.h>
12 12 #include <linux/usb/gadget.h>
13   -int g_dnl_bind_fixup(struct usb_device_descriptor *);
  13 +int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *);
14 14 int g_dnl_register(const char *s);
15 15 void g_dnl_unregister(void);
16 16