add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/drivers/phy/st/phy-miphy28lp.c
..
..
@@ -1,18 +1,15 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2014 STMicroelectronics
3
4
  *
4
5
  * STMicroelectronics PHY driver MiPHY28lp (for SoC STiH407).
5
6
  *
6
7
  * Author: Alexandre Torgue <alexandre.torgue@st.com>
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2, as
10
- * published by the Free Software Foundation.
11
- *
12
8
  */
13
9
 
14
10
 #include <linux/platform_device.h>
15
11
 #include <linux/io.h>
12
+#include <linux/iopoll.h>
16
13
 #include <linux/kernel.h>
17
14
 #include <linux/module.h>
18
15
 #include <linux/of.h>
..
..
@@ -488,19 +485,11 @@
488
485
 
489
486
 static inline int miphy28lp_wait_compensation(struct miphy28lp_phy *miphy_phy)
490
487
 {
491
-	unsigned long finish = jiffies + 5 * HZ;
492
488
 	u8 val;
493
489
 
494
490
 	/* Waiting for Compensation to complete */
495
-	do {
496
-		val = readb_relaxed(miphy_phy->base + MIPHY_COMP_FSM_6);
497
-
498
-		if (time_after_eq(jiffies, finish))
499
-			return -EBUSY;
500
-		cpu_relax();
501
-	} while (!(val & COMP_DONE));
502
-
503
-	return 0;
491
+	return readb_relaxed_poll_timeout(miphy_phy->base + MIPHY_COMP_FSM_6,
492
+					  val, val & COMP_DONE, 1, 5 * USEC_PER_SEC);
504
493
 }
505
494
 
506
495
 
..
..
@@ -809,7 +798,6 @@
809
798
 
810
799
 static inline int miphy_is_ready(struct miphy28lp_phy *miphy_phy)
811
800
 {
812
-	unsigned long finish = jiffies + 5 * HZ;
813
801
 	u8 mask = HFC_PLL | HFC_RDY;
814
802
 	u8 val;
815
803
 
..
..
@@ -820,21 +808,14 @@
820
808
 	if (miphy_phy->type == PHY_TYPE_SATA)
821
809
 		mask |= PHY_RDY;
822
810
 
823
-	do {
824
-		val = readb_relaxed(miphy_phy->base + MIPHY_STATUS_1);
825
-		if ((val & mask) != mask)
826
-			cpu_relax();
827
-		else
828
-			return 0;
829
-	} while (!time_after_eq(jiffies, finish));
830
-
831
-	return -EBUSY;
811
+	return readb_relaxed_poll_timeout(miphy_phy->base + MIPHY_STATUS_1,
812
+					  val, (val & mask) == mask, 1,
813
+					  5 * USEC_PER_SEC);
832
814
 }
833
815
 
834
816
 static int miphy_osc_is_ready(struct miphy28lp_phy *miphy_phy)
835
817
 {
836
818
 	struct miphy28lp_dev *miphy_dev = miphy_phy->phydev;
837
-	unsigned long finish = jiffies + 5 * HZ;
838
819
 	u32 val;
839
820
 
840
821
 	if (!miphy_phy->osc_rdy)
..
..
@@ -843,17 +824,10 @@
843
824
 	if (!miphy_phy->syscfg_reg[SYSCFG_STATUS])
844
825
 		return -EINVAL;
845
826
 
846
-	do {
847
-		regmap_read(miphy_dev->regmap,
848
-				miphy_phy->syscfg_reg[SYSCFG_STATUS], &val);
849
-
850
-		if ((val & MIPHY_OSC_RDY) != MIPHY_OSC_RDY)
851
-			cpu_relax();
852
-		else
853
-			return 0;
854
-	} while (!time_after_eq(jiffies, finish));
855
-
856
-	return -EBUSY;
827
+	return regmap_read_poll_timeout(miphy_dev->regmap,
828
+					miphy_phy->syscfg_reg[SYSCFG_STATUS],
829
+					val, val & MIPHY_OSC_RDY, 1,
830
+					5 * USEC_PER_SEC);
857
831
 }
858
832
 
859
833
 static int miphy28lp_get_resource_byname(struct device_node *child,