From patchwork Fri Sep 8 17:34:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 112110 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp1956739ybm; Fri, 8 Sep 2017 10:41:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4FOHlK0THoo77F6uDFAeFnbnWjUa4YLRnlmvWrGagqnY1AtlY/4aPXX2yIxMZ5YzDcxNDz X-Received: by 10.80.182.53 with SMTP id b50mr2763936ede.15.1504892478955; Fri, 08 Sep 2017 10:41:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504892478; cv=none; d=google.com; s=arc-20160816; b=AI4wOxnT+YYliIsUWKDq5t65yRhy/wptkj97fSHxmqzjijivgYWaay/C8pqJo31U8d ZVZtIp+j14L6JlXuEO2KHehRPv1FIupFHv4kqhjeYcSF3bmnrNGYV2IFhVWW6wzB3uiE Hr56HJc2ZWaYiJAiT/SzcoECHLO6rvnk0DyV8G8c0ta5k6q6vdjlvrvHtu+rI5oP+PRu vvrPvCBap3MsJeFfMR7T6PlrFyKKgIlmSTJHAaaIeslOT3YJ1fT3CgUarKAWr+BSfE+g JS9KhXQ9UDYjnDaoTd3u3eSsEX3wezbCt2b6nbnHQ9vkdPtBLs9uKXOrw0KJBlOApATr XuPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=rlBMs2wWyzGss3ZVN3NNs3pZZ6N8Mty7torjPTiQYvI=; b=wmfXQpOgpAtcg1/lhZffGb29PWIH1ruxrCPlYnDO2nbNMyJrKr84mOkh+oQfod/H8H pzuJpC15DCJXcKb2Lqa229+02y9SReXeCP29jbtpvpF1T5LMmr2RYPuoVLijNOql0Hjg h5wBiAG/m0MQwRdtL21XYpzj8JDIWxC6Tc3Ai6OBEpWjo5gqP3eEJt6Qbc7BISLhGuxA rUHFW1Ojru5n5TZmM/dxreem4oa5n/iZxh9WqA0UyN0Ft9p7QCoBTtml1zlfxrFZyexP ZRANVHrseI7zhBXAGADV3vNMM38qSwglobOWtbPSxvX3MLywBsDVP57B+10s54/CFf9H cmvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l1si2345043ede.402.2017.09.08.10.41.18; Fri, 08 Sep 2017 10:41:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 8533CC21DEF; Fri, 8 Sep 2017 17:40:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 32E38C21F3C; Fri, 8 Sep 2017 17:34:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D62CFC21DC1; Fri, 8 Sep 2017 17:34:34 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id EFE3FC21C71 for ; Fri, 8 Sep 2017 17:34:33 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 7484A21D33; Fri, 8 Sep 2017 19:34:32 +0200 (CEST) Received: from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr [86.201.56.191]) by mail.free-electrons.com (Postfix) with ESMTPSA id 47EE720882; Fri, 8 Sep 2017 19:34:32 +0200 (CEST) From: Maxime Ripard To: Tom Rini , Jagan Teki Date: Fri, 8 Sep 2017 19:34:18 +0200 Message-Id: X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , marex@denx.de, u-boot@lists.denx.de, Maxime Ripard Subject: [U-Boot] [PATCH 07/13] sunxi: provide default USB gadget setup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" All the Allwinner boards use the same manufacturer, VID and PID for the gadgets. Make them the defaults to remove some boilerplate from our defconfigs. Signed-off-by: Maxime Ripard Reviewed-by: Simon Glass --- configs/A13-OLinuXino_defconfig | 3 --- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 3 --- configs/A20-OLinuXino-Lime2_defconfig | 3 --- configs/CHIP_defconfig | 3 --- configs/CHIP_pro_defconfig | 3 --- configs/Cubietruck_defconfig | 3 --- configs/Nintendo_NES_Classic_Edition_defconfig | 3 --- configs/Sinlinx_SinA33_defconfig | 3 --- configs/parrot_r16_defconfig | 3 --- drivers/usb/gadget/Kconfig | 3 +++ 10 files changed, 3 insertions(+), 27 deletions(-) diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 2574018d8213..ae790164dff7 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -32,7 +32,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index 5663a824e71b..b136af66b71f 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -34,7 +34,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 63d013293690..ebb435f30956 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 278039c05573..7d50d0533dcd 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -23,8 +23,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index edbdefc69ddf..76daf477ec87 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -28,8 +28,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 2d1753645b0f..1b2989d364f6 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index 99f7d30f150d..5986764a14b9 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -23,7 +23,4 @@ CONFIG_AXP_ELDO2_VOLT=1800 CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 8c5fc7587909..9299aedd6019 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -28,7 +28,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index 4b70fc5687eb..57db9587fe77 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -24,7 +24,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index e463d1dee0e7..b6aea03f3949 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -38,12 +38,15 @@ if USB_GADGET config USB_GADGET_MANUFACTURER string "Vendor name of USB device" + default "Allwinner Technology" if ARCH_SUNXI config USB_GADGET_VENDOR_NUM hex "Vendor ID of USB device" + default 0x1f3a if ARCH_SUNXI config USB_GADGET_PRODUCT_NUM hex "Product ID of USB device" + default 0x1010 if ARCH_SUNXI config USB_GADGET_ATMEL_USBA bool "Atmel USBA"