diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 07:47:50 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 07:47:50 -0400 |
| commit | 2aebe3f3b20724e09ec76b196e16404d1ea573d9 (patch) | |
| tree | ef667cb786a58d3bb2639ad5c488e5bac501defa /include/dt-bindings | |
| parent | c8d1bc12c7986c166bd3504213d9df2bc11ad7d6 (diff) | |
| parent | e95cf393d2097a7744f98de1c7936fcbde0843e3 (diff) | |
Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
New Features
============
*) Add driver for USB PHYs on sun9i
*) Add driver for USB PHY on dm816x
*) Modified exynos5-usbdrd driver to add support for Exynos5433 SoC
Fixes
=====
*) Fix power_on/power_off failure paths in some drivers
*) Make miphy365x use generic PHY type constants
*) Fix build errors due to missing export symbols in qcom-ufs driver
*) Make all the functions return proper error values
Cleanups
========
*) use PTR_ERR_OR_ZERO to simplify code
*) use devm_kcalloc instead of devm_kzalloc with multiply
*) remove un-necessary ifdef CONFIG_OF
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/phy/phy-miphy365x.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/dt-bindings/phy/phy-miphy365x.h b/include/dt-bindings/phy/phy-miphy365x.h deleted file mode 100644 index 8ef8aba6edd6..000000000000 --- a/include/dt-bindings/phy/phy-miphy365x.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This header provides constants for the phy framework | ||
| 3 | * based on the STMicroelectronics MiPHY365x. | ||
| 4 | * | ||
| 5 | * Author: Lee Jones <lee.jones@linaro.org> | ||
| 6 | */ | ||
| 7 | #ifndef _DT_BINDINGS_PHY_MIPHY | ||
| 8 | #define _DT_BINDINGS_PHY_MIPHY | ||
| 9 | |||
| 10 | #define MIPHY_TYPE_SATA 1 | ||
| 11 | #define MIPHY_TYPE_PCIE 2 | ||
| 12 | #define MIPHY_TYPE_USB 3 | ||
| 13 | |||
| 14 | #endif /* _DT_BINDINGS_PHY_MIPHY */ | ||