Merge tag 'for_3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next

Kishon writes:

Add new PHY drivers for SATA and USB in exynos, for USB in sunxi,
and a multi-purpose PHY in APM, all adapted to generic PHY framework.
Adapted USB3 PHY driver in OMAP to generic PHY driver and also used
the same driver for SATA in OMAP. It also includes miscellaneous cleanups
and fixes.

3 files changed, 159 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/phy/apm-xgene-phy.txt b/Documentation/devicetree/bindings/phy/apm-xgene-phy.txt
new file mode 100644
index 000000000000..5f3a65a9dd88
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/apm-xgene-phy.txt
@@ -0,0 +1,79 @@
+* APM X-Gene 15Gbps Multi-purpose PHY nodes
+
+PHY nodes are defined to describe on-chip 15Gbps Multi-purpose PHY. Each
+PHY (pair of lanes) has its own node.
+
+Required properties:
+- compatible            : Shall be "apm,xgene-phy".
+- reg                   : PHY memory resource is the SDS PHY access resource.
+- #phy-cells            : Shall be 1 as it expects one argument for setting
+                          the mode of the PHY. Possible values are 0 (SATA),
+                          1 (SGMII), 2 (PCIe), 3 (USB), and 4 (XFI).
+
+Optional properties:
+- status                : Shall be "ok" if enabled or "disabled" if disabled.
+                          Default is "ok".
+- clocks                : Reference to the clock entry.
+- apm,tx-eye-tuning     : Manual control to fine tune the capture of the serial
+                          bit lines from the automatic calibrated position.
+                          Two set of 3-tuple setting for each (up to 3)
+                          supported link speed on the host. Range from 0 to
+                          127 in unit of one bit period. Default is 10.
+- apm,tx-eye-direction  : Eye tuning manual control direction. 0 means sample
+                          data earlier than the nominal sampling point. 1 means
+                          sample data later than the nominal sampling point.
+                          Two set of 3-tuple setting for each (up to 3)
+                          supported link speed on the host. Default is 0.
+- apm,tx-boost-gain     : Frequency boost AC (LSB 3-bit) and DC (2-bit)
+                          gain control. Two set of 3-tuple setting for each
+                          (up to 3) supported link speed on the host. Range is
+                          between 0 to 31 in unit of dB. Default is 3.
+- apm,tx-amplitude      : Amplitude control. Two set of 3-tuple setting for
+                          each (up to 3) supported link speed on the host.
+                          Range is between 0 to 199500 in unit of uV.
+                          Default is 199500 uV.
+- apm,tx-pre-cursor1    : 1st pre-cursor emphasis taps control. Two set of
+                          3-tuple setting for each (up to 3) supported link
+                          speed on the host. Range is 0 to 273000 in unit of
+                          uV. Default is 0.
+- apm,tx-pre-cursor2    : 2st pre-cursor emphasis taps control. Two set of
+                          3-tuple setting for each (up to 3) supported link
+                          speed on the host. Range is 0 to 127400 in unit uV.
+                          Default is 0x0.
+- apm,tx-post-cursor    : Post-cursor emphasis taps control. Two set of
+                          3-tuple setting for Gen1, Gen2, and Gen3. Range is
+                          between 0 to 0x1f in unit of 18.2mV. Default is 0xf.
+- apm,tx-speed          : Tx operating speed. One set of 3-tuple for each
+                          supported link speed on the host.
+                           0 = 1-2Gbps
+                           1 = 2-4Gbps (1st tuple default)
+                           2 = 4-8Gbps
+                           3 = 8-15Gbps (2nd tuple default)
+                           4 = 2.5-4Gbps
+                           5 = 4-5Gbps
+                           6 = 5-6Gbps
+                           7 = 6-16Gbps (3rd tuple default)
+
+NOTE: PHY override parameters are board specific setting.
+
+Example:
+                phy1: phy@1f21a000 {
+                        compatible = "apm,xgene-phy";
+                        reg = <0x0 0x1f21a000 0x0 0x100>;
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                phy2: phy@1f22a000 {
+                        compatible = "apm,xgene-phy";
+                        reg = <0x0 0x1f22a000 0x0 0x100>;
+                        #phy-cells = <1>;
+                        status = "ok";
+                };
+
+                phy3: phy@1f23a000 {
+                        compatible = "apm,xgene-phy";
+                        reg = <0x0 0x1f23a000 0x0 0x100>;
+                        #phy-cells = <1>;
+                        status = "ok";
+                };
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index c0fccaa1671e..28f9edb8f19c 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -20,3 +20,57 @@ Required properties:
 - compatible : should be "samsung,exynos5250-dp-video-phy";
 - reg : offset and length of the Display Port PHY register set;
 - #phy-cells : from the generic PHY bindings, must be 0;
+
+Samsung S5P/EXYNOS SoC series USB PHY
+-------------------------------------------------
+
+Required properties:
+- compatible : should be one of the listed compatibles:
+        - "samsung,exynos4210-usb2-phy"
+        - "samsung,exynos4x12-usb2-phy"
+        - "samsung,exynos5250-usb2-phy"
+- reg : a list of registers used by phy driver
+        - first and obligatory is the location of phy modules registers
+- samsung,sysreg-phandle - handle to syscon used to control the system registers
+- samsung,pmureg-phandle - handle to syscon used to control PMU registers
+- #phy-cells : from the generic phy bindings, must be 1;
+- clocks and clock-names:
+        - the "phy" clock is required by the phy module, used as a gate
+        - the "ref" clock is used to get the rate of the clock provided to the
+          PHY module
+
+The first phandle argument in the PHY specifier identifies the PHY, its
+meaning is compatible dependent. For the currently supported SoCs (Exynos 4210
+and Exynos 4212) it is as follows:
+  0 - USB device ("device"),
+  1 - USB host ("host"),
+  2 - HSIC0 ("hsic0"),
+  3 - HSIC1 ("hsic1"),
+
+Exynos 4210 and Exynos 4212 use mode switching and require that mode switch
+register is supplied.
+
+Example:
+
+For Exynos 4412 (compatible with Exynos 4212):
+
+usbphy: phy@125b0000 {
+        compatible = "samsung,exynos4x12-usb2-phy";
+        reg = <0x125b0000 0x100>;
+        clocks = <&clock 305>, <&clock 2>;
+        clock-names = "phy", "ref";
+        status = "okay";
+        #phy-cells = <1>;
+        samsung,sysreg-phandle = <&sys_reg>;
+        samsung,pmureg-phandle = <&pmu_reg>;
+};
+
+Then the PHY can be used in other nodes such as:
+
+phy-consumer@12340000 {
+        phys = <&usbphy 2>;
+        phy-names = "phy";
+};
+
+Refer to DT bindings documentation of particular PHY consumer devices for more
+information about required PHYs and the way of specification.
diff --git a/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
new file mode 100644
index 000000000000..a82361b62015
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
@@ -0,0 +1,26 @@
+Allwinner sun4i USB PHY
+-----------------------
+
+Required properties:
+- compatible : should be one of "allwinner,sun4i-a10-usb-phy",
+  "allwinner,sun5i-a13-usb-phy" or "allwinner,sun7i-a20-usb-phy"
+- reg : a list of offset + length pairs
+- reg-names : "phy_ctrl", "pmu1" and for sun4i or sun7i "pmu2"
+- #phy-cells : from the generic phy bindings, must be 1
+- clocks : phandle + clock specifier for the phy clock
+- clock-names : "usb_phy"
+- resets : a list of phandle + reset specifier pairs
+- reset-names : "usb0_reset", "usb1_reset" and for sun4i or sun7i "usb2_reset"
+
+Example:
+        usbphy: phy@0x01c13400 {
+                #phy-cells = <1>;
+                compatible = "allwinner,sun4i-a10-usb-phy";
+                /* phy base regs, phy1 pmu reg, phy2 pmu reg */
+                reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>;
+                reg-names = "phy_ctrl", "pmu1", "pmu2";
+                clocks = <&usb_clk 8>;
+                clock-names = "usb_phy";
+                resets = <&usb_clk 1>, <&usb_clk 2>;
+                reset-names = "usb1_reset", "usb2_reset";
+        };