phy: tusb1210: use bitmasks to set VENDOR_SPECIFIC2
PATCH v4 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
drivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/phy/ti/phy-tusb1210.c +14 -13
@@ -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 (®, 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 (®, 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 (®, 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: 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5
Signature · 1 line
2.27.0
Vinod Koul
maintainerHi Liam,
Quoted 50 lines · Liam Beguin
From: Liam Beguin <[email protected]>
Start by reading the content of the
VENDOR_SPECIFIC2register 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.
Signed-off-by Liam Beguin <[email protected]>---
Changes since v1:
- useset_mask_bitsChanges since v2:
- fix missing bit shift dropped in v2
- rebase on 5.9-rc1Changes since v3:
- switch tou8p_replace_bits()since there's little reason to protect against concurrent accessdrivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)drivers/phy/ti/phy-tusb1210.c +4
-3@@ -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;
drivers/phy/ti/phy-tusb1210.c static int tusb1210_probe(struct ulpi *ulpi) · line 126
Quoted 10 lines
drivers/phy/ti/phy-tusb1210.c +4
-2@@ -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 (®, val, (u8 )TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK );
Any reason for using u8p_replace_bits and not u8_replace_bits?
Also please drop the u8 casts above, they seem unnecessary here
Quoted 26 lines
drivers/phy/ti/phy-tusb1210.c +6
-8/* 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 (®, 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 (®, 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:
9123e3a74ec7b934a4a099e98af6a61c2f80bbf5Signature · 1 line
2.27.0
Signature · 1 line
~Vinod
Hi Vinod,
Quoted 56 lines · Vinod Koul
Hi Liam,
Quoted 53 lines · Liam Beguin
From: Liam Beguin <[email protected]>
Start by reading the content of the
VENDOR_SPECIFIC2register 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.
Signed-off-by Liam Beguin <[email protected]>---
Changes since v1:
- useset_mask_bitsChanges since v2:
- fix missing bit shift dropped in v2
- rebase on 5.9-rc1Changes since v3:
- switch tou8p_replace_bits()since there's little reason to protect against concurrent accessdrivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)drivers/phy/ti/phy-tusb1210.c +4
-3@@ -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. */
Quoted 10 lines
drivers/phy/ti/phy-tusb1210.c static int tusb1210_probe(struct ulpi *ulpi) · line 126
Quoted 7 lines
drivers/phy/ti/phy-tusb1210.c +4
-2+ 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 (®, val, (u8 )TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK );Any reason for using
u8p_replace_bitsand notu8_replace_bits?
u8p_replace_bits seems like a more concise notation.
Quoted 2 lines
Also please drop the u8 casts above, they seem unnecessary here
I added the casts to get rid of compilation warnings.
Quoted 23 lines
Quoted 23 lines
drivers/phy/ti/phy-tusb1210.c +6
-8/* 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 (®, 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 (®, 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))
Quoted 6 lines
Quoted 3 lines
base-commit:
9123e3a74ec7b934a4a099e98af6a61c2f80bbf5Signature · 1 line
2.27.0--
~Vinod
Thanks,
Liam
Hi Vinod,
Quoted 56 lines · Vinod Koul
Hi Liam,
Quoted 53 lines · Liam Beguin
From: Liam Beguin <[email protected]>
Start by reading the content of the
VENDOR_SPECIFIC2register 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.
Signed-off-by Liam Beguin <[email protected]>---
Changes since v1:
- useset_mask_bitsChanges since v2:
- fix missing bit shift dropped in v2
- rebase on 5.9-rc1Changes since v3:
- switch tou8p_replace_bits()since there's little reason to protect against concurrent accessdrivers/phy/ti/phy-tusb1210.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)drivers/phy/ti/phy-tusb1210.c +4
-3@@ -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. */
Quoted 10 lines
drivers/phy/ti/phy-tusb1210.c static int tusb1210_probe(struct ulpi *ulpi) · line 126
Quoted 7 lines
drivers/phy/ti/phy-tusb1210.c +4
-2+ 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 (®, val, (u8 )TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK );Any reason for using
u8p_replace_bitsand notu8_replace_bits?
u8p_replace_bits seemed like a more concise notation.
Quoted 2 lines
Also please drop the u8 casts above, they seem unnecessary here
I added the type casts to get rid of compilation warnings.
Quoted 23 lines
Quoted 23 lines
drivers/phy/ti/phy-tusb1210.c +6
-8/* 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 (®, 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 (®, 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))
Quoted 6 lines
Quoted 3 lines
base-commit:
9123e3a74ec7b934a4a099e98af6a61c2f80bbf5Signature · 1 line
2.27.0--
~Vinod
Thanks,
Liam