Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH] usb: dwc3: fix backwards compat with rockchip devices
To:     Peter Geis <pgwipeout@gmail.com>, Felipe Balbi <balbi@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Robert Hancock <robert.hancock@calian.com>
Cc:     linux-rockchip@lists.infradead.org, heiko@sntech.de,
        Frank Wunderlich <frank-w@public-files.de>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20220409152116.3834354-1-pgwipeout@gmail.com>
From:   Sean Anderson <sean.anderson@seco.com>
Message-ID: <7e3080fe-a8bf-9ad9-af0c-f000203a5b13@seco.com>
Date:   Mon, 11 Apr 2022 10:50:01 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
In-Reply-To: <20220409152116.3834354-1-pgwipeout@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dVFOak4wdDhkelNmVVQxS05rSkYvejU4SmQ0aEQ3UlV6ckE3dC9hZTE4RVBX?=
 =?utf-8?B?R1FQUXBNdDd5WHQzSncwQ3NPalhKVTBTeUNMeTFkSmNqcmJiaVUzL3pKZmor?=
 =?utf-8?B?cEE5VlZjRTdBWlNzak9IZlhLY1lpemVKMENFVVllT1VmZjg1dkRBTEJKamNM?=
 =?utf-8?B?a1NUcnN1ZHc4SUJKdi9ScDd3cXEvSXlNZnVXMzU5NW1VQmx0enowUDBwc3Vz?=
 =?utf-8?B?eFZXYXp1d3kreDNEdDU2T2RiT2xkMWgxNGh3MnBGYWVyV2J1ZTZXTXlackkz?=
 =?utf-8?B?M1lUYnhMYzN5NFNNYjg3czdhTTcvQkJDOUsxRTJPMDVGeVRNM3dMMmxTVS8r?=
 =?utf-8?B?L3c5WFU4R0ZaZHVHTTRkREdiOXBydVFUZXZreVNFaHE5UUoyRDNVT0Z3YXRR?=
 =?utf-8?B?K3BXNEFtSjMvb0UrVUxjdU1zV3RLQWwyazlVMDVKVEZIR0NkWUQ3d1IzdGZ1?=
 =?utf-8?B?WXNmTWt3YUZkNnFoQ0xPaTBSYnZSazd0amZxZm1WcjNNZndLT0VRWGdPM3NX?=
 =?utf-8?B?Z0dDdVVzYUNuRTBBVU9SRnNhSDhwb1NyYnVoS3hXTm1LYXVMMDhlRTZNVDlI?=
 =?utf-8?B?bFIvSHI4UmxhY0t0WDZteWs1b3B0cElhcnVTNU05VGtJa2srY1hkYWk5eFJH?=
 =?utf-8?B?T09SRXJhdEwxM1RnYVRaaEVWTjF4akt6ZkZsNDF1RFBDNW5MRWFXaVNROThO?=
 =?utf-8?B?aU9OZVlxeUpSMy9qUjRnMjBLMXdlejZRTlpCM0ttVG4rcUIxL1AwQzlmSWl6?=
 =?utf-8?B?ZWQwN25maE5VRzd1bWszTVA0R1Y5aFU1RllMOEJSUTU1aks1c2NhOTVXWE5W?=
 =?utf-8?B?TmVTckRwdmtyT0J5U3dLcktWZFR3LzY0c2VVcEtpU3Q4VWlFWVhTSENoKzBK?=
 =?utf-8?B?cEc0ZTkzMDc3YTJSeTZmSXg5cXJnVWJObkRIRUVoZmV0Zkl1L3RrOVNzZTkr?=
 =?utf-8?B?R00wNk4zbG5GTlQvM3I4QkYyM0N5S3YvejhPMUliVHJRdFpyV250SkZmZ3VL?=
 =?utf-8?B?S1kvSWtTU1ljMmJPYXdqQjNDYnltRXBxRjZxbi90eFplc3U5TGFyZGliOS9E?=
 =?utf-8?B?Vk9XbXVtYW05SEJOQkxFRU5aMkpHcjN5eHppRGF1dUFvSkpLV3VBa0E3OG50?=
 =?utf-8?B?MHNNYVk4Z3hzcU5GV1VSK1NrV0hiQ0pHbkhiaE11WkM5NERuaFlpZlJSM1po?=
 =?utf-8?B?dDdheXBreW5rMWhZaGFrUzVFWEEreDUyZ2drL3NLUmE0R1dBS0tRQ3V2aU9M?=
 =?utf-8?B?RHhVTGF5UFF6SXVBYVNLRlh4WWVYMThmcXMyaVI4b3U4VmE0VVpzeWxmUElC?=
 =?utf-8?B?RkZ3SERnbFJkbW1NSlJNVTZYcWJlbUZjRGdMMktWTjRWUG8xT3NyeFkweFd1?=
 =?utf-8?B?TGo0YTZvVUNXb1R1Y1VCUHJIVTZscElhQkZWanhCUkFFQ3JaS2JVSXN6dmhB?=
 =?utf-8?B?b1BOQ2NVdzVEUnNHRG8wTWN5Q2hYeXI3TXZYeG8rNXMvbHdyMjNZN01ZdzZD?=
 =?utf-8?B?dG4wb0wzZ1BhZjhwTk1xSlFqbnY5UmNhTmpOTUszalk3UFFTSWVOSmRwTElK?=
 =?utf-8?B?clQyR0dVaEQ5RG1lWTliMU1vTFV0VXliWXIyRnk2aldTZ2NMTUxobDJ4NENR?=
 =?utf-8?B?ZGVRV0xmVFlWQmJicnhhOVNhS3RtRUJGclg1V3RFUGN5QStpaDdPMUFOTlJW?=
 =?utf-8?B?anRkZXZFWUtacVp6VWdUbnRXbGtCSDRhSkVGWHlsVEY4emZrZnVhRzIwWlF1?=
 =?utf-8?B?Sk9mL2ZOejZsNWV3TmZnOElUdndSZTFXWXg0MDBVVXplek5EcVdURUw0V2Rm?=
 =?utf-8?B?aGNNTDYraXRsVG5UUHg3TEl1RlNOY0t6OFRkekFkLytZSmp4SDlBWGVVSDhh?=
 =?utf-8?B?bFgzN293ejFqWGRJWCtycmJOUkR6d2VUWEFQaUR3LzB3WTF1ek1VNXpqUGU5?=
 =?utf-8?B?QUdVRnVPbUs1VlBlcUxRZCtqTkNXRklPcGVZVEpmMmE1MU1xN0RVYWxFMXBw?=
 =?utf-8?B?c1F2UFBSNVlsZXNGZ0hXV3dvbG1JL2NDSVlPY3JmdnJaVk12T25JbTgxM24y?=
 =?utf-8?B?ZnkwTncrT2FkL1B3Z1Q1cENMZUhBY2VPcFg0Y2ZsNHFOczdOR0FqaUpVc2Yx?=
 =?utf-8?B?NzJGOCtJc04rcjJuOUp6T2dLSU5peGt1L0N5ZHV1dWw0WS9UTjlsSk9lNnhO?=
 =?utf-8?B?V3FRcnRZczFuK3BpVUZMNW84UTRRMTFSUHRKTnlJaG90K2E1ejljaUtEM0ZZ?=
 =?utf-8?B?R2NPdmh2OCtPRWd2VkZobmxNbUlrbnNzRE84ZFZpYjlEdy8xcXlUUk4zaEsz?=
 =?utf-8?B?cVF1cno1aGh1STdoQkhCNDFrbDRFUml2ODhLUlFxZFlobHU4STh6bmhDY3lX?=
 =?utf-8?Q?dLWa7YynCIFmH3ws=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ed8f4e2e-0052-4be8-7165-08da1bca90ce
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 14:50:05.4544
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Qk0PPIQT6xFyJSoC0psAICVRAQ53gAaiNzzvMH1v0ClLxyraVP0mGRNY8aKadGmO4cRU2UgHQqCoKmY7E54mhw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR03MB2937
X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 4/9/22 11:21 AM, Peter Geis wrote:
> Commit 33fb697ec7e5 ("usb: dwc3: Get clocks individually") moved from
> the clk_bulk api to individual clocks, following the snps,dwc3.yaml
> dt-binding for clock names.
> Unfortunately the rk3328 (and upcoming rk356x support) use the
> rockchip,dwc3.yaml which has different clock names, which are common on
> devices using the glue layer.
> The rk3328 does not use a glue layer, but attaches directly to the dwc3
> core driver.
> The offending patch series failed to account for this, thus dwc3 was
> broken on rk3328.
> 
> To retain backwards compatibility with rk3328 device trees we must also
> check for the alternate clock names.
> 
> Fixes: 33fb697ec7e5 ("usb: dwc3: Get clocks individually")
> 
> Reported-by: Frank Wunderlich <frank-w@public-files.de>
> Signed-off-by: Peter Geis <pgwipeout@gmail.com>
> ---
> 
> This patch is standalone to fix the backwards compatibility, and is
> necessary no matter if we decide to retain the clock names in
> rockchip,dwc3.yaml as is or align with snps,dwc3.yaml.
> 
>  drivers/usb/dwc3/core.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 1170b800acdc..5bfd3e88af35 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -1690,21 +1690,44 @@ static int dwc3_probe(struct platform_device *pdev)
>  		/*
>  		 * Clocks are optional, but new DT platforms should support all
>  		 * clocks as required by the DT-binding.
> +		 * Some devices have different clock names in legacy device trees,
> +		 * check for them to retain backwards compatibility.
>  		 */
>  		dwc->bus_clk = devm_clk_get_optional(dev, "bus_early");
>  		if (IS_ERR(dwc->bus_clk))
>  			return dev_err_probe(dev, PTR_ERR(dwc->bus_clk),
>  					     "could not get bus clock\n");
>  
> +		if (dwc->bus_clk == NULL) {
> +			dwc->bus_clk = devm_clk_get_optional(dev, "bus_clk");
> +			if (IS_ERR(dwc->bus_clk))
> +				return dev_err_probe(dev, PTR_ERR(dwc->bus_clk),
> +						     "could not get bus clock\n");
> +		}
> +
>  		dwc->ref_clk = devm_clk_get_optional(dev, "ref");
>  		if (IS_ERR(dwc->ref_clk))
>  			return dev_err_probe(dev, PTR_ERR(dwc->ref_clk),
>  					     "could not get ref clock\n");
>  
> +		if (dwc->ref_clk == NULL) {
> +			dwc->ref_clk = devm_clk_get_optional(dev, "ref_clk");
> +			if (IS_ERR(dwc->ref_clk))
> +				return dev_err_probe(dev, PTR_ERR(dwc->ref_clk),
> +						     "could not get ref clock\n");
> +		}
> +
>  		dwc->susp_clk = devm_clk_get_optional(dev, "suspend");
>  		if (IS_ERR(dwc->susp_clk))
>  			return dev_err_probe(dev, PTR_ERR(dwc->susp_clk),
>  					     "could not get suspend clock\n");
> +
> +		if (dwc->susp_clk == NULL) {
> +			dwc->susp_clk = devm_clk_get_optional(dev, "suspend_clk");
> +			if (IS_ERR(dwc->susp_clk))
> +				return dev_err_probe(dev, PTR_ERR(dwc->susp_clk),
> +						     "could not get suspend clock\n");
> +		}
>  	}
>  
>  	ret = reset_control_deassert(dwc->reset);
> 

Acked-by: Sean Anderson <sean.anderson@seco.com>