diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/phy/phy-ti-am654.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'drivers/phy/phy-ti-am654.c')
| -rw-r--r-- | drivers/phy/phy-ti-am654.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c index 82010e7c96..27a312227b 100644 --- a/drivers/phy/phy-ti-am654.c +++ b/drivers/phy/phy-ti-am654.c @@ -28,8 +28,8 @@ #define CMU_MASTER_CDN_O BIT(24) #define COMLANE_R138 0xb38 -#define CONFIG_VERSION_REG_MASK GENMASK(23, 16) -#define CONFIG_VERSION_REG_SHIFT 16 +#define CFG_VERSION_REG_MASK GENMASK(23, 16) +#define CFG_VERSION_REG_SHIFT 16 #define VERSION 0x70 #define COMLANE_R190 0xb90 @@ -286,8 +286,8 @@ static int serdes_am654_init(struct phy *x) u32 mask; u32 val; - mask = CONFIG_VERSION_REG_MASK; - val = VERSION << CONFIG_VERSION_REG_SHIFT; + mask = CFG_VERSION_REG_MASK; + val = VERSION << CFG_VERSION_REG_SHIFT; regmap_update_bits(phy->regmap, COMLANE_R138, mask, val); val = CMU_MASTER_CDN_O; |