usb: gadget: force rockchip vid and pid for rockusb

This change amend USB VID & PID to Rockchip for rockusb.

Change-Id: I3c94e442cc0190d2d3f13424470dd2d84af55eb0
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

drivers/usb/gadget/f_rockusb.c

@@ -48,9 +48,14 @@ struct rk_flash_info {
 
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
-	/* Enumerate as a loader device */
+	if (IS_RKUSB_UMS_DNL(name)) {
-	if (IS_RKUSB_UMS_DNL(name))
+		/* Fix to Rockchip VID and PID */
+		dev->idVendor  = __constant_cpu_to_le16(0x2207);
+		dev->idProduct = __constant_cpu_to_le16(CONFIG_ROCKUSB_G_DNL_PID);
+
+		/* Enumerate as a loader device */
 		dev->bcdUSB = cpu_to_le16(0x0201);
+	}
 
 	return 0;
 }

include/configs/rk3036_common.h

@@ -29,6 +29,7 @@
 
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(4 << 10)
 #define CONFIG_ROCKCHIP_CHIP_TAG	"RK30"
+#define CONFIG_ROCKUSB_G_DNL_PID	0x301A
 
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER

include/configs/rk3066_common.h

@@ -36,6 +36,8 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	8
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x300A
+
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_TEXT_BASE		0x10080C04
 #define CONFIG_SPL_STACK		0x1008FFFF

include/configs/rk3128_common.h

@@ -30,6 +30,9 @@
 
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* 64M */
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x310C
+#define TEST_NUM_G
+
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER
 

include/configs/rk3188_common.h

@@ -35,6 +35,7 @@
 
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(0x8000 - 0x800)
 #define CONFIG_ROCKCHIP_CHIP_TAG	"RK31"
+#define CONFIG_ROCKUSB_G_DNL_PID	0x310B
 
 #define CONFIG_SPL_TEXT_BASE		0x10080800
 /* spl size 32kb sram - 2kb bootrom */

include/configs/rk322x_common.h

@@ -33,6 +33,7 @@
 
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(28 << 10)
 #define CONFIG_ROCKCHIP_CHIP_TAG	"RK32"
+#define CONFIG_ROCKUSB_G_DNL_PID	0x320B
 
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER

include/configs/rk3288_common.h

@@ -36,6 +36,8 @@
 #define GICD_BASE			0xffc01000
 #define GICC_BASE			0xffc02000
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x320A
+
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER
 

include/configs/rk3328_common.h

@@ -30,6 +30,8 @@
 #define GICD_BASE			0xFF811000
 #define GICC_BASE			0xFF812000
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x320C
+
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER
 

include/configs/rk3368_common.h

@@ -37,6 +37,8 @@
 #define GICD_BASE			0xffB71000
 #define GICC_BASE			0xffB72000
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x330A
+
 #define CONFIG_BOUNCE_BUFFER
 
 #ifndef CONFIG_SPL_BUILD

include/configs/rk3399_common.h

@@ -38,6 +38,8 @@
 #define GICR_BASE			0xFEF00000
 #define GICC_BASE			0xFFF00000
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x330C
+
 /* MMC/SD IP block */
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ	200000000

include/configs/rv1108_common.h

@@ -27,6 +27,8 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + 0x100000)
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x2000000)
 
+#define CONFIG_ROCKUSB_G_DNL_PID	0x110A
+
 /* usb mass storage */
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 

scripts/config_whitelist.txt

@@ -1900,6 +1900,7 @@ CONFIG_ROCKCHIP_CHIP_TAG
 CONFIG_ROCKCHIP_MAX_INIT_SIZE
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROCKCHIP_USB2_PHY
+CONFIG_ROCKUSB_G_DNL_PID
 CONFIG_ROM_STUBS
 CONFIG_ROOTFS_OFFSET
 CONFIG_ROOTPATH