From patchwork Tue Oct 22 17:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 864 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 736433F047 for ; Tue, 22 Oct 2019 19:55:29 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id s137sf13927820pfs.18 for ; Tue, 22 Oct 2019 10:55:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571766928; cv=pass; d=google.com; s=arc-20160816; b=jQuPsltpPFvg5gtl1w+h8YtSDtlzoGl8zKSB5NAtH+mvEcqKzOIiIzVv2Gctba9oQS jhYGTwV3+R8Nx+0sNDONwrHd3NoUbauFCnB3UnmXFs5j6cQA7OKkQkS/iLfF1bmaFDGz xal8Sg0qMiYtlRFNP0Bdx2WgNhMHv063Yj5FO33aSPC6aYj7iBysEoPMhlmHRvYj6RHc HHI3qaO7vBplS6oSfGAV6tkqyAjeOF+dYYP88mVNtU/RV/DfOBeEImoRDbqrjpvwPXDi pgulrps8mzCMCciK9Rf4stPF4QqonLuqs76PvgrGgVVaG+pYMDiauY9wu9/JyzFAjv75 RyTg== 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=HBbfmmCgerxPtFZu69nLZe09L+A7RAoAQs2OmZpQDMI=; b=aLUQUtMX5dClZbZ+FzkJ3sd2LnGz4CBTh4uiLaogoVJhGEarUhz8hvq3xsVzg5Dado hwF2QUgJIF5QqwIyL59hXMbgvcaoJB9a4hTE4I++FTg+x22Ba2Slyt2Hj9AM+L3tInJA skYpN+KhUrPd61Gyfrc+zyswwlf+whClvVQsuowM7G+tpjp1QsEuhcC9UUZPCVVB9Sxi FyboIgOfopkqurR/5yBlk0NWAeg6qPuKotN2yw1FaIeGCQt8Mt3G6qTRTJaJTRzqhCd9 j+l6NAT2dgKWSMgueFnfbO2R/gU87K+rJ7NoDBh3blsT9GMto57cbky3/Fw5AOpOah5z vKIw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="FYoCO42/"; 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=HBbfmmCgerxPtFZu69nLZe09L+A7RAoAQs2OmZpQDMI=; b=aydZFM60pLw8C0l6hlLRCvcNVrFDrQrTnyixV7qvaXq74RsZkqhyXxIVX+QK0vrl/x SP59ssxTUQletodGONLNhvQnsttpXfIZ5VMXnaVaK4ZF5vpBgM31n14KHSUEMCZGGf5j xCls+5p+vFEHzAvsPpuMlh0ooBjctN1H83Oes= 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=HBbfmmCgerxPtFZu69nLZe09L+A7RAoAQs2OmZpQDMI=; b=Z8DsXi/ss5XD4/LzzPEvy/XAxdEepv95sHZSFFKRmEBoIrg0PPBijIXaxF0DT70QJE 9dDjLLUYNea2L7DZBn5G/AmEA+Pv0Ef7wOmN/4a9WkOMOCFv51n7dvmuECRBDGdBNC5h XqnD34B45TIBPk+B6VLsNl2r1+/Y3P0NCcH3FsI+DhWh6ZYaeHzz4FK0m8zwdwRf8mxO QZ5oZdrJ/As6w8qFku3BQVUh9CKbRKgwrqFU9/RPnabvkeSmtZ+2L75atk8/tWTuqmqr wCTaCMzWQx56bRPSBAvQYa9Uo+qssbSeJE9ZJn2fDmSgS+WvVdvQxt8jtWrippfiGRia Il8w== X-Gm-Message-State: APjAAAX2/85Kelvgj0Z5804ziCX/tByim9VFt+6sU++DFj7ZNCvxdezB R1Zc9IjTtEWcpwAQ4CiRX3mpwdGQ X-Google-Smtp-Source: APXvYqwVRKkpR8iEV5/raTBPF6DVbFmD84j5MnpYPd3qJuyUNmQdzRufRUgFOIJMO1aBGiD9GQWGLQ== X-Received: by 2002:a17:902:b495:: with SMTP id y21mr4833520plr.119.1571766928239; Tue, 22 Oct 2019 10:55:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:1103:: with SMTP id g3ls4658978pgl.11.gmail; Tue, 22 Oct 2019 10:55:27 -0700 (PDT) X-Received: by 2002:a62:7d57:: with SMTP id y84mr5905932pfc.90.1571766927756; Tue, 22 Oct 2019 10:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571766927; cv=none; d=google.com; s=arc-20160816; b=lFFz4Uj37PjmyyjLpkIMp8IIOsP+4NIiJkunNm+03VMsr4+a6PvlEJrFPiZSV8dWVh eOz5KIXppcttMbEwTbazg+be1q79DR0m532ny7iRINKkyHwg8M8VqeAlq22Hon+1ij1N 5QAIwbAoZe65zwsDcO+X9BT1jM3JZ5BBKQbrqFr2TdxYvpnrueQT2QOVbbk+SyV6RtLu 0XQI/4JklGQ3cJS2IB9vnhxmvnzsQC59VHH5zyQxwEwhFMT5k9g7uwNJFh75ICdz7oXm Jy7wHtJpAxctswsvQUVkIOmYII7KYHEYiJsy9jr7SKSuorpWJUdYzqBe8Y12JkPTnBtY 9kVQ== 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=8XAFpPBlZ2p44rI9zoyW5SxbNh5PFCfyvuWBoC2mquM=; b=FlDEMANByIZZcT38w+BhKBAYWXJwyzGzn736frTXiT6wi4lKNH+Zx7TIuBE+GUlp/I a6Not6KMTp824qY8CArFtyd7mUpaYwA4BrPfleCBOul2b+7GSgWPzM2o/M415WJhjnyl HfhWZB+A9b71VEZJXD9sAJ4FTc/s99rKfBnlQeasqmsO3tfazxXOJmzZFMFyVusIj+G8 t8pSyEnh0cdH440dAJCORFvhFwdmyK0Nwse9kbK42T3aN0nxd9pVL6bgKSc77GMOMRLu NR1pYi//O9jEL1ApQ2ew/ImNZ1yYWntzP84yuO/lp0B635mZ2mUSMLjHrEIVyvFWvJVQ RTWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="FYoCO42/"; 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 e23sor22290095pjr.19.2019.10.22.10.55.27 for (Google Transport Security); Tue, 22 Oct 2019 10:55:27 -0700 (PDT) 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:8d13:: with SMTP id c19mr6205913pjo.63.1571766927110; Tue, 22 Oct 2019 10:55:27 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id b3sm20454775pfd.125.2019.10.22.10.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 10:55:26 -0700 (PDT) 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 2/9] gadget: Select USB_GADGET_VENDOR_NUM for rockchip Date: Tue, 22 Oct 2019 23:24:51 +0530 Message-Id: <20191022175458.22604-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191022175458.22604-1-jagan@amarulasolutions.com> References: <20191022175458.22604-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="FYoCO42/"; 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. Signed-off-by: Jagan Teki --- 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/vyasa-rk3288_defconfig | 1 - drivers/usb/gadget/Kconfig | 1 + 16 files changed, 1 insertion(+), 15 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 4df2a90b92..a3720e6423 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -54,7 +54,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 be91ba1e0c..593d7559c7 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 a52e0af79d..99d97de770 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -73,7 +73,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 6f9a3a3e72..3d9db4b8f5 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -87,7 +87,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y 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 36bd7eb0f1..0b4e391111 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -46,7 +46,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 4a1d7a6648..ea0bf9402c 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -78,7 +78,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 41ad46f12a..2393b8cf77 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -58,7 +58,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 3e761e9983..a0b82376c6 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -73,7 +73,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 ce8a0e5268..b892e65c0a 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-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/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 89400dd5de..45b48f64f3 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -73,7 +73,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 953d760155..71342540de 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -74,7 +74,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 d86456e363..bf2c52ae20 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -89,7 +89,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y 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 aa9f86d6f8..03a36c1d24 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -79,7 +79,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 3a8cc9e722..d5ac57be0a 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -71,7 +71,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.