Received-SPF: pass (google.com: domain of linux-kernel+bounces-73142-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Javier Carrasco <javier.carrasco@wolfvision.net>
Date: Tue, 20 Feb 2024 15:05:46 +0100
Subject: [PATCH v4 2/8] usb: misc: onboard_dev: add support for non-hub
 devices
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240220-onboard_xvf3500-v4-2-dc1617cc5dd4@wolfvision.net>
References: <20240220-onboard_xvf3500-v4-0-dc1617cc5dd4@wolfvision.net>
In-Reply-To: <20240220-onboard_xvf3500-v4-0-dc1617cc5dd4@wolfvision.net>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Matthias Kaehlcke <mka@chromium.org>, 
 Greg Kroah-Hartman <gregkh@linuxfoundation.org>, 
 Helen Koike <helen.koike@collabora.com>, 
 Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, 
 Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, 
 David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, 
 Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, 
 Russell King <linux@armlinux.org.uk>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, 
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, 
 Javier Carrasco <javier.carrasco@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?b25RMGhhdERMU1hKQ3RORWQ5T2pQZTFiVjFvcUxFRDNvN3JlMDE0c0dYUkZo?=
 =?utf-8?B?STM3RDdjckNnNkNLR1NMY2FHYkx6VnhlYVhmM1U1T2Y4S0ZCUld0Sm1nU21E?=
 =?utf-8?B?RnduOGdKL2ZhRWJHY0ZFc3RNM2JRcEE2c2JJNFNqZkw1eG9XVlVkL3lMRzQ5?=
 =?utf-8?B?aGE2Z2Jqc2RLRFpDWkp0SlZNUVJXV25HZHVZNkZsYU8wMjhQN2d5MTBJSWhq?=
 =?utf-8?B?dkE2YlM0ZGNpUVhQZzN4MTZ4eW9jNnk0YjQzVkRlaW8zYSt2M09NbGdvOVJr?=
 =?utf-8?B?WUpWRkd4THN3VkhnZ3B5VTgzNGdIaEthQmt2eXdpZzRrc0dxV3VLRGw4N1Uz?=
 =?utf-8?B?QWFnZm5uRXlKTWNtWmg1dGRlblcvTmQ1RnE2TnNBRWVLNGc1QnVXTFRmc1pn?=
 =?utf-8?B?ZE1iWWpJS1RLaW1tVzhlTGlMbHY4eUhZQzM2aitLOWNJUnlZek82MTduUC8x?=
 =?utf-8?B?c2p4ZzA0NUhpNVN0S0VMZWVFZ0NWNVg0cmg5UUQ3VU9SVEVINklmSVJtemVJ?=
 =?utf-8?B?bHRuQnp4ZzhKYTU1V25xb2VsZHZOdUNCWTlyVFZkcGpKZUlJSFBEblN3RCs3?=
 =?utf-8?B?aFQ0UFFqbDhQUCtGTi9CdVMxcVc1Z1ZCdDlWdGdmNU0rQWpDRk5uUGhaV0RP?=
 =?utf-8?B?TG84NzdiRFJ6TEJMSzkyWkp2M2lCRWxTcmYzR2pLbFNMM0tpcWdoYlcwVTZI?=
 =?utf-8?B?ek1xcFAzd0tjaXZ2ZzdxL1NsS2NzTUNTTWhzazViY0tPNk9vVzVSb1ZQK3B3?=
 =?utf-8?B?SWkvZkZSd3pMT0NsR1VmVDFkTG5XaWhMSnJydEVxRmpuQmd2aEFuREtCSG12?=
 =?utf-8?B?TklxYzg5QVpod29HS2pOVitHWWZLY1E0VGR0aGhFcTF1UFlHZmxva2pTdHUv?=
 =?utf-8?B?VzB4aVJ2UG92QzAwd0IyeHNMU0xBTUtKb3hvZzlocUFWRlBLbEg1RTN1VXRK?=
 =?utf-8?B?ZFFRWHdBeVlmbVJveUMwcG9xRnN1a29hWWxLNitQUExEZTg3cExUVzQ0L1N0?=
 =?utf-8?B?RGtneXNkRUhsT3hHNDJQV0EwdXphY2JiSVRqZTBoeUpVNmowS2FKakVHekhL?=
 =?utf-8?B?QVliVEJnMlhnSnNHK1VJY3ZkQ3BwOVF0N0h6M2ZxV21MblBsOThEbnNyVW5v?=
 =?utf-8?B?SkFjMjVZaVRpS3FaaUllT01kUGdtcDBvV1pvRkVjYVVUMC9wSVprMklMaXRu?=
 =?utf-8?B?aTQ4YnlxTW9jSnFia2Fwa1l2cDRkZFR4SkUycWdzRjk4dktJQnovVFFIc1RF?=
 =?utf-8?B?NUZaVG11S2RFRzJra1dCYmNKNno2QnNPeUxCeGswYXE5bmJ0WTg4bmdEdnJo?=
 =?utf-8?B?cFJKN3pHRkJnSlZFNlY0Z2hCNGhPZXVDdk9qTkdwcFJacFBjVGEvcHhVWWNE?=
 =?utf-8?B?R1pLbk9zbm83cXdGMHFLYkljdWV1WFBiMUFBb1ZXZFJhVktlR3Y2WDlmVmJV?=
 =?utf-8?B?ZVVpOWNJZUkwSVVYM01mUE9jalllS0lTSHJqUHdKVExGVGZ3d3FSbDRscklN?=
 =?utf-8?B?UHp4WnVFK201cUtZdXJkUE9DRStuV2p2TkJ6aU1wUndSL00wLzRMcWgzWG15?=
 =?utf-8?B?WW5YVndIREgzK3laa1cxeGVLakFFQUR1UGhWYzREM1gvRmFGRmUrWjFBRjRZ?=
 =?utf-8?B?Q2EwZExRczFiMnlEL2NNaUcxREcwSWxhNXV2am5keWtPMEtwVXEydis3ejVT?=
 =?utf-8?B?ODhkS3BNOWsrRFZQMnlJelpxQUlSRlQxaUUxNkt6aUhod3RMaFZ5ZU11VUVM?=
 =?utf-8?B?ZnJXZlZZZHl2eGRUM1ZwQ1hIUkFsT2RtN1NwWlZZdVdCb3pSUE1Rbythc3N2?=
 =?utf-8?B?NHJWTWtuWW5jZlYvQTV3VmNueFoyNzJTcmQ2SHl3NXhybE9nbFd0SG53R1M3?=
 =?utf-8?B?NHplcm0zQ1krR1hNckF0Y3FqWHdlbENJVDB0SmtDYStxV3V1NUxHQkR1dDNy?=
 =?utf-8?B?VFdEcXVrL3A5RnNja3l1cE45OENucU16QzloanpBY0RQckFUdGpJUVNwSjBQ?=
 =?utf-8?B?dWlPWkE1VS9KYlFFUFB1U2QwMXpTTmNkOVBmNWtiUk5nUmp3YWpIRDJuV2tD?=
 =?utf-8?B?bS82YkNPNTQ0ejhsdEFCUkh6dmJKZkhTaUZEcXVUN1ZVYXVVNENSRHNVNlMv?=
 =?utf-8?B?WE1VTGJWbGN4dnNOcnhXTEc4dTNtSTQvd2lTb2l2VkJ4RVU5WS9aQlE2VmVG?=
 =?utf-8?Q?q8Q9tWBlssvuR4tLhUM0dQo=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: d7934c8c-e1be-44cf-0bb6-08dc321d0cfc
X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 14:05:53.4092
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CNEjTGxetI51RtL/aJ8DejDSGPv8LacTvfODENzgmlRYMidrwxyE4BRgYVEf0vZt/VF11pLlMmc2nZEkzpBDvSsa2t5j5VusN4b1N/JlhW4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5577

Most of the functionality this driver provides can be used by non-hub
devices as well.

To account for the hub-specific code, add a flag to the device data
structure and check its value for hub-specific code.

Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net>
---
 drivers/usb/misc/onboard_usb_dev.c |  3 ++-
 drivers/usb/misc/onboard_usb_dev.h | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c
index 2103af2cb2a6..f43130a6786f 100644
--- a/drivers/usb/misc/onboard_usb_dev.c
+++ b/drivers/usb/misc/onboard_usb_dev.c
@@ -129,7 +129,8 @@ static int __maybe_unused onboard_dev_suspend(struct device *dev)
 		if (!device_may_wakeup(node->udev->bus->controller))
 			continue;
 
-		if (usb_wakeup_enabled_descendants(node->udev)) {
+		if (usb_wakeup_enabled_descendants(node->udev) ||
+		    !onboard_dev->pdata->is_hub) {
 			power_off = false;
 			break;
 		}
diff --git a/drivers/usb/misc/onboard_usb_dev.h b/drivers/usb/misc/onboard_usb_dev.h
index f13d11a84371..ebe83e19d818 100644
--- a/drivers/usb/misc/onboard_usb_dev.h
+++ b/drivers/usb/misc/onboard_usb_dev.h
@@ -9,51 +9,61 @@
 struct onboard_dev_pdata {
 	unsigned long reset_us;		/* reset pulse width in us */
 	unsigned int num_supplies;	/* number of supplies */
+	bool is_hub;
 };
 
 static const struct onboard_dev_pdata microchip_usb424_data = {
 	.reset_us = 1,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata microchip_usb5744_data = {
 	.reset_us = 0,
 	.num_supplies = 2,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata realtek_rts5411_data = {
 	.reset_us = 0,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata ti_tusb8041_data = {
 	.reset_us = 3000,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata cypress_hx3_data = {
 	.reset_us = 10000,
 	.num_supplies = 2,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata cypress_hx2vl_data = {
 	.reset_us = 1,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata genesys_gl850g_data = {
 	.reset_us = 3,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata genesys_gl852g_data = {
 	.reset_us = 50,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct onboard_dev_pdata vialab_vl817_data = {
 	.reset_us = 10,
 	.num_supplies = 1,
+	.is_hub = true,
 };
 
 static const struct of_device_id onboard_dev_match[] = {

-- 
2.40.1