From patchwork Tue Nov 19 08:26:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 891 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2A10B3F1EC for ; Tue, 19 Nov 2019 09:26:45 +0100 (CET) Received: by mail-pg1-f197.google.com with SMTP id t11sf15119110pgm.2 for ; Tue, 19 Nov 2019 00:26:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1574152003; cv=pass; d=google.com; s=arc-20160816; b=LYLIdZqHjXT/0vOEbIGun0dShqSIxEGdsIkJImK3NkSApbR658gufDQB4el44Z0FJR udZNHPuSCdOecQUO49ksH2hLsQNGnqwJW7GN1M5N5fgqtIbFZIlnaxVSBs3kj7vcAKg/ /Ry0JcCY+vdYpwXo1OIFYHYGDTcD9pSeTLWBBzBkYNmrsUfUY3YYw65KRsk7OSkqXQLq dQDJFszauN8r6qssv4gCiJj3NfjdPNTqLvc2dIoHULogJ8oDfAc6g1Uhy1esfWQtmo/0 XlrZHya4T9hPI0TCNEdQiqCJDk/LOBGu/qJAUQQjRaRixQolbwM+nciODYhHpe61mZRp /V/w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=kg+koa1rtq6JhlQP/k+714x6UIbTNyVXEZPcCVUVWQs=; b=tJ3vpAVfIUB2iE9kH+nsng28QzazscKtAiB/7X/S2fHAlhx6ryPmK0zJfmH3w1oXGK yixCk4M4d16DdZjRYIqKx8q6w1LGGX9AGH9enRhY4JJ9Iq8f4jBqQLmhYhWuWmamOYr/ sWsJUL7II3mxLuEVHmpwQixdrbf0emReeib3hIyGiKWEE1dB+KHi2nLVaNAJV2xTsn8K 9qZqqohKISHZ+QoUKxw4UNTGmh/i1zw3gfw8c2zr1aF2XdAmeBkOvrpeZ4SU3d23jTZj d/YpKzvn7Ygmrzp4mDCTwfOr7qbABM6PC2JomhliYrgskrOPeHH1o1ub/u3yDds4uFtt 9Aqg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=r0LT9XUu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=kg+koa1rtq6JhlQP/k+714x6UIbTNyVXEZPcCVUVWQs=; b=WrXRpwN6tDBM6gl0eqrglKVx5yUTQRsuFMV6HVTzAH3SFqfuJj5n74NpvSbE7tWiMC m3lZxzQUuIb28kLGDQsikQx4tKDPl7z0CwvuiV1p2unlmXW0Qv2vY/7KNlUrUKjPoqQc loxxVJqwNPtZBNsvMndMpjL0yOs1Mkyy8kvoY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=kg+koa1rtq6JhlQP/k+714x6UIbTNyVXEZPcCVUVWQs=; b=g3wZETLoqugt5mFAcfA1CxvJo+oZdnjH/ku3YnNqDSjQLlBqPAXPWSGFGPYOz8h8Uw 5BW1L1nppAp+cTmmWyihN8jEov7Zw3Ax9Obwqr6+7PBH8qSOH2J23nZLJxPuUYLqyGnb S802Yumi+ICKnRjLTyO7KFoMn9aHWlxrZ/qnLPbZgz04sNHOBrGhiUtneiDO+Mxt79Mw Ntt04xyn/gsOLteXaWkyKEEW6CKPqINGxxy/ET0SBi3gXMlpk8QTgJn1i+gpPQC6TP4O 6MEbP92Dm7gma9AitjnpfUIGiSqFqqA3E420KDx0+7Tg/+mViaaxfgh8E6tpDRJykzR+ 6cwQ== X-Gm-Message-State: APjAAAUU1r6CfYDXZsWKytLhPmJV7waduHs280Fk6TESVEGs1VP0ZWvD b2+o2KK29G6YG+SKERziyPdQmqT+ X-Google-Smtp-Source: APXvYqxUiIzzOzr9/LWhtIGbSG2xmjSjv1zsy78hzyCV1Bya4cQKO6mCYWNLZXkKp9qcYoQ627+CTg== X-Received: by 2002:a63:445c:: with SMTP id t28mr1953698pgk.348.1574152002319; Tue, 19 Nov 2019 00:26:42 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:b30b:: with SMTP id d11ls820305pjr.1.gmail; Tue, 19 Nov 2019 00:26:42 -0800 (PST) X-Received: by 2002:a17:90b:30cc:: with SMTP id hi12mr4705301pjb.80.1574152001842; Tue, 19 Nov 2019 00:26:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574152001; cv=none; d=google.com; s=arc-20160816; b=QtxBjmCqR8kVb6JAQZVYuOyunZc4m23qRwmmHG0/2D4GF9Xpg3F4CEx7BnPGwoa5fW nbeVk/JqcQWKy2AdZKGi0tRO5RYpwWImHtqojtSUksN5UR6sNviCIxVV3OGxSnFQpamX Wl/UyfdI39uNNUi0tv+TCYhjYXTKHh+Hy0mFi8JJAEl7rreMB6trSRhe1rHaHKOnlAsS GIlC+uIXTSmWOmqj/bFJ+kj2es9eMLpuxyMtpjqZkTdaPPzx6PX841FDtZTCjd+R9N8O OlMIzederNSVQucBmBw70mb73HDb26fJ9dBFMdLm/0i6DXsIv5ucPkA5WuaPSat3VFQO QYvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=+sOKpbGGDX9ppnghR7ZITJFjQMSASVJcPIq+9OwxT7U=; b=laG1gl83IT7BojU0YYTedwFcX05Pw/OOubBViohXJFqKl0KzDmG3VKelW3vxUQ3csM +Tm81toGbeQ5p4WaB8ygEHf3He12E0fnxVerzl7wuXWKwU3RITDTeh5jIsZKgXf3hlPJ OP+deUK94vg+xVpgDUo20YJ02t5XYJWJuygxH526L9Srw8C5GOlX0+T69UICvOyTuG57 8E2gnM/AK4G7NsPd9LWGd61M4AFBY8IPjHO9ybkXvH2mrjbRWFusKAn+DdkMHxVETUoT sLYUZJmrQcT+M0adgoL1lVs8M8/d0jAmb7J5WO7C8hKagvDHWMhY+qNw672+YJBoSivf z//g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=r0LT9XUu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a7sor2466721pju.25.2019.11.19.00.26.39 for (Google Transport Security); Tue, 19 Nov 2019 00:26:39 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:d352:: with SMTP id i18mr4886823pjx.42.1574151999618; Tue, 19 Nov 2019 00:26:39 -0800 (PST) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id u7sm2312221pjx.19.2019.11.19.00.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 00:26:39 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Levin Du , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 02/10] gadget: Select USB_GADGET_VENDOR_NUM for rockchip Date: Tue, 19 Nov 2019 13:56:15 +0530 Message-Id: <20191119082623.6165-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191119082623.6165-1-jagan@amarulasolutions.com> References: <20191119082623.6165-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=r0LT9XUu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Gadget vendor number, 0x2207 is common across all platfroms supported in Rockchip SoC. So, select the same number globally, if ARCH_ROCKCHIP. This eventually drop the explicit configs defined in supported board defconfig files. Tested-by: Levin Du Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3036_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/rock2_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/usb/gadget/Kconfig | 1 + 17 files changed, 1 insertion(+), 16 deletions(-) diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig index c9d703a0f5..48351bb1dd 100644 --- a/configs/elgin-rv1108_defconfig +++ b/configs/elgin-rv1108_defconfig @@ -49,7 +49,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_ERRNO_STR=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index c9882ded98..bb3e2c8f7d 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -52,7 +52,6 @@ CONFIG_SYSRESET=y # CONFIG_SPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 38b2660fb3..7bf26f7497 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_TPL_TINY_MEMSET=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 12d454b410..8f2f13adae 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -71,7 +71,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 8f97ef2c34..747089435d 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -86,7 +86,6 @@ CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig index 18bc6529ac..c9cad2bb4a 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -44,7 +44,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_ERRNO_STR=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index fa3715cf7e..92eeffda01 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -75,7 +75,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 4fc0c3e491..08b47c84ef 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -56,7 +56,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index c007c90a90..b06175958e 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -71,7 +71,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 0329a8aa55..a86f689858 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -75,7 +75,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 95a0a4b4d1..0cb67f33fe 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -71,7 +71,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index b7f6646381..1afb12d015 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -72,7 +72,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index d9a170ba26..ec13a7710a 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -87,7 +87,6 @@ CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index bb561fac23..e46eb1cd91 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -77,7 +77,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig index 38cb1984d8..3acb2ac5f5 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -83,7 +83,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index 081e32d67d..997d9a3877 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -69,7 +69,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_MASS_STORAGE=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 1959a390f3..844c3be16f 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -48,6 +48,7 @@ config USB_GADGET_MANUFACTURER config USB_GADGET_VENDOR_NUM hex "Vendor ID of the USB device" default 0x1f3a if ARCH_SUNXI + default 0x2207 if ARCH_ROCKCHIP default 0x0 help Vendor ID of the USB device emulated, reported to the host device.