From: Tom Rini <trini@konsulko.com>
Date: Fri, 5 Jul 2024 16:22:53 +0000 (-0600)
Subject: Merge branch 'qcom-main' of https://source.denx.de/u-boot/custodians/u-boot-snapdragon
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=18908395edcee8450d742c670610557751866393;p=u-boot.git

Merge branch 'qcom-main' of https://source.denx.de/u-boot/custodians/u-boot-snapdragon

Various minor fixes and improvements:

* Fix Qualcomm SPMI v5 support
* Move default environment to a file
* Add support for special pins (e.g ufs/mmc reset/data pins)
* IPQ moves to OF_UPSTREAM and receives some cleanup and MAINTAINERS
  changes
* Add a reset driver for devices without PSCI
* msm8916 USB clock improvements for mobile devices
---

18908395edcee8450d742c670610557751866393
diff --cc drivers/clk/qcom/clock-apq8016.c
index 41fe4d896a,e9f04dbe6c..b5def55dbc
--- a/drivers/clk/qcom/clock-apq8016.c
+++ b/drivers/clk/qcom/clock-apq8016.c
@@@ -116,6 -123,13 +123,13 @@@ static ulong apq8016_clk_set_rate(struc
  	case GCC_BLSP1_UART2_APPS_CLK: /* UART2 */
  		apq8016_clk_init_uart(priv->base, clk->id);
  		return 7372800;
+ 	case GCC_USB_HS_SYSTEM_CLK:
+ 		if (rate != 80000000)
+ 			log_warning("Unexpected rate %ld requested for USB_HS_SYSTEM_CLK\n",
 -			            rate);
++				    rate);
+ 		clk_rcg_set_rate_mnd(priv->base, USB_HS_SYSTEM_CLK_CMD_RCGR,
 -		                     10, 0, 0, CFG_CLK_SRC_GPLL0, 0);
++				     10, 0, 0, CFG_CLK_SRC_GPLL0, 0);
+ 		return rate;
  	default:
  		return 0;
  	}