From patchwork Fri Apr 9 20:38:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 418191 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1881026jai; Fri, 9 Apr 2021 13:38:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5m91Bsv7dXjEaRWqEuYfHd/LRBuDWVtpKiYMKcJeGlFLXu+9Rr3QlkO5Skkbj1WOmB9wZ X-Received: by 2002:a05:6402:2787:: with SMTP id b7mr19130842ede.225.1618000703669; Fri, 09 Apr 2021 13:38:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618000703; cv=none; d=google.com; s=arc-20160816; b=fihIEgIS38UNgXO/NVP4CnIyx0lbHmJ2hIqAFTJSvqoop4HEH5MxNWd/lo8HEDE7Jt 5ZNgrSkj9ePAn03r9cEuyhZ840k8ozNtQSI2FNqTVA56tMqObFZxWvU+ZXLIeSW5+IoS 11XCqqRYVg6ufUZCSczVVstMoIY5iEZ5GWIHUXJoel9sUViCsngqmp94NctCo2wbty+F pPVPUh9Kz6elbDp8iCJbi9BpX4FWrq4Dkwj62KrODHcgRZ4nqEF1CStR/93H/psW38kw SHdNj/9DUdX4sRchGGmcCJjBEnYfJ+55I6fjuBt10Ddvq7X9OXZeuymXwpYxMzxV51NC OlCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=G72dkrgDXPYx2WxwBWqVMOItq+SOgqC43Kp6+r++3bE=; b=AG+H8uhI9P17ocf3W45oD8d873Wxb6/RyyUnPKPOZMxEmXuI51kejSv9gYyopv2MYl 3f7vRi1Mb30URJHuZOr6tHpmTW/8REI1tjdZb3OPUrnXQFyFbTYh4VKehQCK6X9gOX35 kNsYXnva3lZMCqFX7Crz0vVSYZAZ9GOg+2Rs/3MmDlUb46ogE4sEGbCc0XU2V1h17QsK pow35hwQNyLuFrdMRupFBRmQlWs+DIPj3mdMOx4lj+E7hEbq9Pf/pLfewHkYNIE25RiJ W7PfUoo1cmvWX1bpzTBuyfGxJAdTeUT2S2yYgUWq45AUO8hK+csqhkC89WnrZl3LnSIc v6Bw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga26si2687270ejc.301.2021.04.09.13.38.23; Fri, 09 Apr 2021 13:38:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234187AbhDIUif (ORCPT + 3 others); Fri, 9 Apr 2021 16:38:35 -0400 Received: from foss.arm.com ([217.140.110.172]:59746 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbhDIUie (ORCPT ); Fri, 9 Apr 2021 16:38:34 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A497B1FB; Fri, 9 Apr 2021 13:38:15 -0700 (PDT) Received: from u200856.usa.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 569EF3F694; Fri, 9 Apr 2021 13:38:15 -0700 (PDT) From: Jeremy Linton To: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, hminas@synopsys.com, Jeremy Linton Subject: [PATCH v2] usb: dwc2: Enable RPi in ACPI mode Date: Fri, 9 Apr 2021 15:38:09 -0500 Message-Id: <20210409203809.21940-1-jeremy.linton@arm.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The dwc2 driver has everything we need to run in ACPI mode except for the ACPI module device table boilerplate. With that added and identified as "BCM2848", an id in use by other OSs for this device, the dw2 controller on the BCM2711 will work. Signed-off-by: Jeremy Linton --- drivers/usb/dwc2/core.h | 2 ++ drivers/usb/dwc2/params.c | 18 +++++++++++++++++- drivers/usb/dwc2/platform.c | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) -- 2.29.2 diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 7161344c6522..defc6034af49 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -38,6 +38,7 @@ #ifndef __DWC2_CORE_H__ #define __DWC2_CORE_H__ +#include #include #include #include @@ -1339,6 +1340,7 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev); /* The device ID match table */ extern const struct of_device_id dwc2_of_match_table[]; +extern const struct acpi_device_id dwc2_acpi_match[]; int dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg); int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg); diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c index 92df3d620f7d..7a6089fa81e1 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -232,6 +232,12 @@ const struct of_device_id dwc2_of_match_table[] = { }; MODULE_DEVICE_TABLE(of, dwc2_of_match_table); +const struct acpi_device_id dwc2_acpi_match[] = { + { "BCM2848", (kernel_ulong_t)dwc2_set_bcm_params }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, dwc2_acpi_match); + static void dwc2_set_param_otg_cap(struct dwc2_hsotg *hsotg) { u8 val; @@ -866,10 +872,12 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg) return 0; } +typedef void (*set_params_cb)(struct dwc2_hsotg *data); + int dwc2_init_params(struct dwc2_hsotg *hsotg) { const struct of_device_id *match; - void (*set_params)(struct dwc2_hsotg *data); + set_params_cb set_params; dwc2_set_default_params(hsotg); dwc2_get_device_properties(hsotg); @@ -878,6 +886,14 @@ int dwc2_init_params(struct dwc2_hsotg *hsotg) if (match && match->data) { set_params = match->data; set_params(hsotg); + } else { + const struct acpi_device_id *amatch; + + amatch = acpi_match_device(dwc2_acpi_match, hsotg->dev); + if (amatch && amatch->driver_data) { + set_params = (set_params_cb)amatch->driver_data; + set_params(hsotg); + } } dwc2_check_params(hsotg); diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 5f18acac7406..53fc6bc3ed1a 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -734,6 +734,7 @@ static struct platform_driver dwc2_platform_driver = { .driver = { .name = dwc2_driver_name, .of_match_table = dwc2_of_match_table, + .acpi_match_table = ACPI_PTR(dwc2_acpi_match), .pm = &dwc2_dev_pm_ops, }, .probe = dwc2_driver_probe,