clk-bcm2835: Don't wait for pllh lock

raspberrypi inclusion
category: feature
bugzilla: 50432

--------------------------------
Signed-off-by: NPhil Elwell <phil@raspberrypi.org>
Signed-off-by: NFang Yafen <yafen@iscas.ac.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

drivers/clk/bcm/clk-bcm2835.c

@@ -644,6 +644,7 @@ static int bcm2835_pll_on(struct clk_hw *hw)
 	spin_unlock(&cprman->regs_lock);
 
 	/* Wait for the PLL to lock. */
+	if (strcmp(data->name, "pllh")) {
 		timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
 		while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) {
 			if (ktime_after(ktime_get(), timeout)) {
@@ -654,6 +655,7 @@ static int bcm2835_pll_on(struct clk_hw *hw)
 
 			cpu_relax();
 		}
+	}
 
 	cprman_write(cprman, data->a2w_ctrl_reg,
 		     cprman_read(cprman, data->a2w_ctrl_reg) |