Skip to contentSkip to conversation

phy: tusb1210: use bitmasks to set VENDOR_SPECIFIC2

PATCH Applied Liam Beguin 2 participants 6 messages Dec 11, 2020 – Mar 2, 2021 Generic PHY framework

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 phy: tusb1210: use bitmasks to set VENDOR_SPECIFIC2

From: Liam Beguin <[email protected]>

Start by reading the content of the VENDOR_SPECIFIC2 register and update each bit field based on device properties when defined.

The use of bit masks prevents fields from overriding each other and enables users to clear bits which are set by default, like datapolarity in this instance.

---
Changes since v1:
- use set_mask_bits

Changes since v2:
- fix missing bit shift dropped in v2
- rebase on 5.9-rc1

Changes since v3:
- switch to u8p_replace_bits() since there's little reason to protect against concurrent access

Changes since v4:
- rebase on latest master

 drivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/phy/ti/phy-tusb1210.c +14 -13
index d8d0cc11d187..a63213f5972a 100644
@@ -7,15 +7,16 @@
  * Author: Heikki Krogerus <[email protected]>
  */
 #include <linux/module.h>
+#include <linux/bitfield.h>
 #include <linux/ulpi/driver.h>
 #include <linux/ulpi/regs.h>
 #include <linux/gpio/consumer.h>
 #include <linux/phy/ulpi_phy.h>
 
 #define TUSB1210_VENDOR_SPECIFIC2		0x80
-#define TUSB1210_VENDOR_SPECIFIC2_IHSTX_SHIFT	0
-#define TUSB1210_VENDOR_SPECIFIC2_ZHSDRV_SHIFT	4
-#define TUSB1210_VENDOR_SPECIFIC2_DP_SHIFT	6
+#define TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK	GENMASK(3, 0)
+#define TUSB1210_VENDOR_SPECIFIC2_ZHSDRV_MASK	GENMASK(5, 4)
+#define TUSB1210_VENDOR_SPECIFIC2_DP_MASK	BIT(6)
 
 struct tusb1210 {
 	struct ulpi *ulpi;
@@ -118,22 +119,22 @@ static int tusb1210_probe(struct ulpi *ulpi)
 	 * diagram optimization and DP/DM swap.
 	 */
 
+	reg = ulpi_read(ulpi, TUSB1210_VENDOR_SPECIFIC2);
+
 	/* High speed output drive strength configuration */
-	device_property_read_u8(&ulpi->dev, "ihstx", &val);
-	reg = val << TUSB1210_VENDOR_SPECIFIC2_IHSTX_SHIFT;
+	if (!device_property_read_u8(&ulpi->dev, "ihstx", &val))
+		u8p_replace_bits(&reg, val, (u8)TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK);
 
 	/* High speed output impedance configuration */
-	device_property_read_u8(&ulpi->dev, "zhsdrv", &val);
-	reg |= val << TUSB1210_VENDOR_SPECIFIC2_ZHSDRV_SHIFT;
+	if (!device_property_read_u8(&ulpi->dev, "zhsdrv", &val))
+		u8p_replace_bits(&reg, val, (u8)TUSB1210_VENDOR_SPECIFIC2_ZHSDRV_MASK);
 
 	/* DP/DM swap control */
-	device_property_read_u8(&ulpi->dev, "datapolarity", &val);
-	reg |= val << TUSB1210_VENDOR_SPECIFIC2_DP_SHIFT;
+	if (!device_property_read_u8(&ulpi->dev, "datapolarity", &val))
+		u8p_replace_bits(&reg, val, (u8)TUSB1210_VENDOR_SPECIFIC2_DP_MASK);
 
-	if (reg) {
-		ulpi_write(ulpi, TUSB1210_VENDOR_SPECIFIC2, reg);
-		tusb->vendor_specific2 = reg;
-	}
+	ulpi_write(ulpi, TUSB1210_VENDOR_SPECIFIC2, reg);
+	tusb->vendor_specific2 = reg;
 
 	tusb->phy = ulpi_phy_create(ulpi, &phy_ops);
 	if (IS_ERR(tusb->phy))

base-commit: 33dc9614dc208291d0c4bcdeb5d30d481dcd2c4c

Signature · 1 line
2.27.0
maintainer Applied
#1 lore raw
Quoted 8 lines · Liam Beguin

From: Liam Beguin <[email protected]>

Start by reading the content of the VENDOR_SPECIFIC2 register and update each bit field based on device properties when defined.

The use of bit masks prevents fields from overriding each other and enables users to clear bits which are set by default, like datapolarity in this instance.

Applied, thanks

Signature · 1 line
~Vinod
#2 lore raw

Hi Vinod,

Quoted 2 lines · Vinod Koul

Applied, thanks

I can't seem to find where this was applied, could you point me to the right repository?

Quoted 2 lines

--
~Vinod

Thanks,
Liam

maintainer
#3 lore raw
Quoted 8 lines · Liam Beguin

Hi Vinod,

Quoted 2 lines · Vinod Koul

Applied, thanks

I can't seem to find where this was applied, could you point me to the right repository?

Yeah I cant find the commit in phy-next. I will apply this after merge window opens.. sorry for the miss

Signature · 1 line
~Vinod
maintainer
#4 lore raw
Quoted 4 lines · Vinod Koul
Quoted 3 lines · Liam Beguin

Hi Vinod,

On Wed Jan 13, 2021 at 6:49 AM EST, Vinod Koul wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Applied, thanks

I can't seem to find where this was applied, could you point me to the right repository?

Yeah I cant find the commit in phy-next. I will apply this after merge window opens.. sorry for the miss

Done now, it should be in linux-next for tomorrow

Signature · 1 line
~Vinod
#5 lore raw
Quoted 8 lines · Vinod Koul
Quoted 7 lines · Vinod Koul
Quoted 6 lines · Liam Beguin

Hi Vinod,

Quoted 2 lines · Vinod Koul

Applied, thanks

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

I can't seem to find where this was applied, could you point me to the right repository?

Yeah I cant find the commit in phy-next. I will apply this after merge window opens.. sorry for the miss

Done now, it should be in linux-next for tomorrow

Perfect! Thanks again for your time,

Quoted 3 lines

--
~Vinod

Liam