From patchwork Thu Nov 16 15:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1864811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SWPjq6qzCz1yRV for ; Fri, 17 Nov 2023 02:54:39 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r3ehJ-0004ND-Pz; Thu, 16 Nov 2023 15:54:29 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r3ehF-0004Mz-IW for kernel-team@lists.ubuntu.com; Thu, 16 Nov 2023 15:54:25 +0000 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 627BD3F6ED for ; Thu, 16 Nov 2023 15:54:25 +0000 (UTC) Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9e15f05c3ceso70453066b.3 for ; Thu, 16 Nov 2023 07:54:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700150065; x=1700754865; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3Qegwu5FnQBUNdi3xbLkd8lLR974yb4fsEcNSOPLMRs=; b=b3mUg7OxXUZsxT5X5oxcq9hMGwZbJkuOmFIALp+CkOcI0CBA2tHL4cn397lSU8j5x7 +hb7C3xqyVxg1Z3aPT1yC09gi5ZUOlVHVmSbjlep5Jv4aS2Z8fM9nRR2XIwjtKtGtW7w TqQ9A0FKSIvqIt1XNEYLBzfbdbgjbCF2srqyceizRrz8wazMqBtjYL1F2L4vSj2FrRro IuPO3to+Dk8C6MO08TDGnzJNGuukNvz3deIsAoIBRhJmsbUScCbfYSaIe/KOsfPxIQ7z jlSqba6P2kDBixpW4lTObU9x2+5HSv/IEQFoL7eID6BDiMhFUzOC2jQ2w/LWCMUMZfVw jTTA== X-Gm-Message-State: AOJu0Ywsv8tnUFh8gXWU0yH/E+aipMiS2hD84/bvwzQdW/1wpn87odyO MAPCwjOUCyaYx10Ne3NsBjgifTqZ7R4gyPNrEp6hydPr9doWRvwsSrRL5zVlGHFdQqnFHEXj4hv dlmn6HJYcMGbZjBQ9osweEypMYqPIqPBLnGFLbPnrcDeDkd4yzQ== X-Received: by 2002:a17:906:f2d6:b0:9ba:3af4:333e with SMTP id gz22-20020a170906f2d600b009ba3af4333emr11124547ejb.14.1700150065065; Thu, 16 Nov 2023 07:54:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IECXjoRz7jamF0JYD6ramenMK8K+YV0n/af+gRFHixa5QKtOmZZ43l7bP20cIrU6wL2XQl+hg== X-Received: by 2002:a17:906:f2d6:b0:9ba:3af4:333e with SMTP id gz22-20020a170906f2d600b009ba3af4333emr11124538ejb.14.1700150064728; Thu, 16 Nov 2023 07:54:24 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id n20-20020a170906b31400b009e656ce2930sm8606923ejz.60.2023.11.16.07.54.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 07:54:24 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][M:raspi][PATCH] UBUNTU: SAUCE: Revert "usb: misc: onboard-hub: add support for Microchip USB2514B USB 2.0 hub" Date: Thu, 16 Nov 2023 16:54:23 +0100 Message-Id: <20231116155423.506672-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2039786 This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. When the driver loads, all attached USB devices are reconnected, which breaks boot from USB. Temporarily revert support for this hub until a proper fix is available, it's not needed on Pi anyways. Signed-off-by: Juerg Haefliger Acked-by: Manuel Diewald --- drivers/usb/misc/onboard_usb_hub.c | 2 -- drivers/usb/misc/onboard_usb_hub.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c index 83f14ca1d38e..4a4056c09962 100644 --- a/drivers/usb/misc/onboard_usb_hub.c +++ b/drivers/usb/misc/onboard_usb_hub.c @@ -330,7 +330,6 @@ static struct platform_driver onboard_hub_driver = { /************************** USB driver **************************/ #define VENDOR_ID_GENESYS 0x05e3 -#define VENDOR_ID_MICROCHIP 0x0424 #define VENDOR_ID_REALTEK 0x0bda #define VENDOR_ID_TI 0x0451 #define VENDOR_ID_VIA 0x2109 @@ -409,7 +408,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) static const struct usb_device_id onboard_hub_id_table[] = { { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h index aca5f50eb0da..b96a26a9f746 100644 --- a/drivers/usb/misc/onboard_usb_hub.h +++ b/drivers/usb/misc/onboard_usb_hub.h @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { }; static const struct of_device_id onboard_hub_match[] = { - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, { .compatible = "usb424,2517", .data = µchip_usb424_data, }, { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },