diff options
| author | John Hubbard <[email protected]> | 2019-01-12 17:29:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-01-12 21:07:14 -0800 |
| commit | e1706720408e72fb883f6b151c2b3b23d8e7e5b2 (patch) | |
| tree | f9fd329df1d28571861f56f8cac7131a72211961 /include/linux/phy | |
| parent | b8c3b8992ff2827482ac1543f84f5024a72c4f2e (diff) | |
phy: fix build breakage: add PHY_MODE_SATA
Commit 49e54187ae0b ("ata: libahci_platform: comply to PHY framework") uses
the PHY_MODE_SATA, but that enum had not yet been added. This caused a
build failure for me, with today's linux.git.
Also, there is a potentially conflicting (mis-named) PHY_MODE_SATA, hiding
in the Marvell Berlin SATA PHY driver.
Fix the build by:
1) Renaming Marvell's defined value to a more scoped name,
in order to avoid any potential conflicts: PHY_BERLIN_MODE_SATA.
2) Adding the missing enum, which was going to be added anyway as part
of [1].
[1] https://lkml.kernel.org/r/[email protected]
Fixes: 49e54187ae0b ("ata: libahci_platform: comply to PHY framework")
Signed-off-by: John Hubbard <[email protected]>
Acked-by: Jens Axboe <[email protected]>
Acked-by: Olof Johansson <[email protected]>
Cc: Grzegorz Jaszczyk <[email protected]>
Cc: Miquel Raynal <[email protected]>
Cc: Hans de Goede <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'include/linux/phy')
| -rw-r--r-- | include/linux/phy/phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index e8e118d70fd7..3f350e2749fe 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -42,6 +42,7 @@ enum phy_mode { PHY_MODE_PCIE, PHY_MODE_ETHERNET, PHY_MODE_MIPI_DPHY, + PHY_MODE_SATA }; /** |