aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Karicheri2014-08-08 10:13:48 -0500
committerMurali Karicheri2014-08-08 10:13:48 -0500
commitf58210a5e43a71fcc2b46a18d7a90dc9991b519e (patch)
treeadaddcdb71fb94f74f89a56c4ca8ffe99d2fc35e
parent8cd1a2c917363419a51fe09ea92f46da3fda9aa6 (diff)
parent15fb15a1fadaa84d367f18c634cf74a4cd30481c (diff)
downloadlinux-v3.8/rio-dev-dio.tar.gz
linux-v3.8/rio-dev-dio.tar.xz
linux-v3.8/rio-dev-dio.zip
Merge branch 'v3.8/master' into v3.8/rio-dev-diov3.8/rio-dev-dio
-rw-r--r--Documentation/devicetree/bindings/arm/keystone/ti,uio-module-drv.txt39
-rw-r--r--arch/arm/boot/dts/k2hk-evm.dts22
2 files changed, 53 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/arm/keystone/ti,uio-module-drv.txt b/Documentation/devicetree/bindings/arm/keystone/ti,uio-module-drv.txt
index 919c17c21d1..b9aa6fd4a9b 100644
--- a/Documentation/devicetree/bindings/arm/keystone/ti,uio-module-drv.txt
+++ b/Documentation/devicetree/bindings/arm/keystone/ti,uio-module-drv.txt
@@ -16,14 +16,37 @@ Recommended properties :
16- interrupts : standard interrupt property 16- interrupts : standard interrupt property
17- clocks : desired clock domain property 17- clocks : desired clock domain property
18 18
19Optional properties:
20- cfg-params: Specifies configuration parameters to be used with specific peripherals
21 ti,serdes_refclk_khz: serdes reference clock in khz
22 ti,serdes_maxserrate_khz: serdes maximum serial rate in khz
23 ti,serdes_maxlanerate: Lane rate "full" or "half" or "quarter"
24 The following are serdes equilization tap parameters
25 ti,serdes_c1 : Serdes c1 coefficient (0-31)
26 ti,serdes_c2 : Serdes c2 coefficient (0-15)
27 ti,serdes_cm : Serdes cm coefficient (0-15)
28 Other serdes configurations
29 ti,serdes_tx_att : Serdes TX attenuation (0-15)
30 ti,serdes_tx_vreg_lev : Serdes regulator voltage setting for TX driver slices
31 : (0-7)
19Example: 32Example:
20 33
21 uio_hyperlink0: hyperlink0 { 34 uio_hyperlink0: hyperlink0 {
22 compatible = "ti,uio-module-drv"; 35 compatible = "ti,uio-module-drv";
23 mem = <0x21400000 0x00000100 36 mem = <0x21400000 0x00000100
24 0x40000000 0x10000000 37 0x40000000 0x10000000
25 0x0231a000 0x00002000>; 38 0x0231a000 0x00002000>;
26 clocks = <&clkhyperlink0>; 39 clocks = <&clkhyperlink0>;
27 interrupts = <0 387 0x101>; 40 interrupts = <0 387 0x101>;
28 label = "hyperlink0"; 41 label = "hyperlink0";
42 cfg-params
43 {
44 ti,serdes_refclk_khz = <312500>;
45 ti,serdes_maxserrate_khz = <6250000>;
46 ti,serdes_lanerate = "half";
47 ti,serdes_c1 = <4>;
48 ti,serdes_c2 = <0>;
49 ti,serdes_cm = <3>;
50 ti,serdes_tx_att = <5>;
51 ti,serdes_tx_vreg_lev = <0>;
29 }; 52 };
diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index 338dba02b0a..ba42b5aa64f 100644
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/k2hk-evm.dts
@@ -1713,6 +1713,17 @@
1713 clocks = <&clkhyperlink0>; 1713 clocks = <&clkhyperlink0>;
1714 interrupts = <0 387 0x101>; 1714 interrupts = <0 387 0x101>;
1715 label = "hyperlink0"; 1715 label = "hyperlink0";
1716 cfg-params
1717 {
1718 ti,serdes_refclk_khz = <312500>;
1719 ti,serdes_maxserrate_khz = <6250000>;
1720 ti,serdes_lanerate = "half";
1721 ti,serdes_c1 = <4>;
1722 ti,serdes_c2 = <0>;
1723 ti,serdes_cm = <3>;
1724 ti,serdes_tx_att = <6>;
1725 ti,serdes_tx_vreg_lev = <4>;
1726 };
1716 }; 1727 };
1717 1728
1718 uio_hyperlink1: hyperlink1 { 1729 uio_hyperlink1: hyperlink1 {
@@ -1723,6 +1734,17 @@
1723 clocks = <&clkhyperlink1>; 1734 clocks = <&clkhyperlink1>;
1724 interrupts = <0 388 0x101>; 1735 interrupts = <0 388 0x101>;
1725 label = "hyperlink1"; 1736 label = "hyperlink1";
1737 cfg-params
1738 {
1739 ti,serdes_refclk_khz = <312500>;
1740 ti,serdes_maxserrate_khz = <6250000>;
1741 ti,serdes_lanerate = "half";
1742 ti,serdes_c1 = <4>;
1743 ti,serdes_c2 = <0>;
1744 ti,serdes_cm = <3>;
1745 ti,serdes_tx_att = <6>;
1746 ti,serdes_tx_vreg_lev = <4>;
1747 };
1726 }; 1748 };
1727 1749
1728 uio_mpax: mpax { 1750 uio_mpax: mpax {