Skip to content

Commit 451dc9e

Browse files
author
Eric Ruei
committed
Merge pull request torvalds#171 in PROCESSOR-SDK/processor-sdk-linux from plsdk-2750 to processor-sdk-linux-4.19.y
* commit '3c4238882bee4590cb0b6d69c3ee4f96ad7efd38': net: ethernet: ti: ptp_bc: make pps_mux_sel gpios optional net: ethernet: ti: cpts: enhance pps gen/latch operations arm: dts: am57[1,2,4]x-idk-pps: break timers into pps_timer and latch_timer arm: dts: am57[1,2,4]x-idk-pps: use PIN_OUTPUT_PULLDOWN for off state dt-bindings: net : ptp_bc: Document optional parameter pps-sel[0,1]-gpios dt-bindings: net: ti-prueth: Document the optional pinctrl parameters for SYNC/LATCH signal dt-bindings: net: cpsw: document PPS related optional parameters
2 parents ed81c3d + 3c42388 commit 451dc9e

File tree

9 files changed

+352
-171
lines changed

9 files changed

+352
-171
lines changed

‎Documentation/devicetree/bindings/net/cpsw.txt

+31
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@ Optional properties:
5454
- mac-address : See ethernet.txt file in the same directory
5555
- phy_id : Specifies slave phy id (deprecated, use phy-handle)
5656
- phy-handle : See ethernet.txt file in the same directory
57+
- pps_timer : phandle, referring to the DM timer for PPS generation
58+
- latch_timer : phandle, phandle, referring to the DM timer for PPS latch
59+
- pinctrl-names : List of assigned state names,
60+
see pinctrl binding documentation.
61+
- pinctrl-0: phandle, referring to the PPS signal on configuration node.
62+
- pinctrl-1: phandle, referring to the PPS signal off configuration node.
63+
- pinctrl-2: phandle, referring to the PPS ref signal on configuration node.
64+
- pinctrl-3: phandle, referring to the PPS ref signal off configuration node.
65+
- pinctrl-4: phandle, referring to the PPS latch signal on configuration node.
66+
- pinctrl-5: phandle, referring to the PPS latch signal off configuration node.
67+
- pps-enable-gpios : GPIO specifier, used to enable PPS signal output
68+
- ref-enable-gpios : GPIO specifier, used to enable PPS ref signal output
5769

5870
Slave sub-nodes:
5971
- fixed-link : See fixed-link.txt file in the same directory
@@ -126,3 +138,22 @@ Examples:
126138
mac-address = [ 00 00 00 00 00 00 ];
127139
};
128140
};
141+
142+
143+
(plus)
144+
&mac {
145+
/* cptr pps1 generator and latch properties */
146+
pps_timer = <&timer16>;
147+
latch_timer = <&timer15>;
148+
pinctrl-names = "pwm_off", "pwm_on", "ref_off", "ref_on",
149+
"latch_on", "latch_off";
150+
pinctrl-0 = <&pps1_timer16_pwm_off>;
151+
pinctrl-1 = <&pps1_timer16_pwm_on>;
152+
pinctrl-2 = <&pps1_timer16_pwm2_off>;
153+
pinctrl-3 = <&pps1_timer16_pwm2_on>;
154+
pinctrl-4 = <&pps1_timer15_latch_on>;
155+
pinctrl-5 = <&pps1_timer15_latch_off>;
156+
157+
pps-enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
158+
ref-enable-gpios = <&gpio6 19 GPIO_ACTIVE_HIGH>;
159+
};

‎Documentation/devicetree/bindings/net/ti-prueth.txt

+19-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ Optional properties:
3232
should be "rx_red_hp", "rx_red_lp".
3333
- interrupts : should contain an array of PRUSS system event
3434
numbers.
35+
- pinctrl-names : List of assigned state names,
36+
see pinctrl binding documentation.
37+
- pinctrl-0: phandle, referring to the SYNC0 signal on configuration node.
38+
- pinctrl-1: phandle, referring to the SYNC0 signal off configuration node.
39+
- pinctrl-2: phandle, referring to the LATCH0 signal on configuration node.
40+
- pinctrl-3: phandle, referring to the LATCH0 signal off configuration node.
3541

3642
Must contain children, one for each of the MAC ports.
3743
Children must be named ethernet-mii0 and ethernet-mii1.
@@ -67,7 +73,7 @@ Optional properties for children:
6773

6874
Example (am572x-idk board, dual-emac):
6975
======================================
70-
pruss2_eth {
76+
pruss2_eth: pruss2_eth {
7177
compatible = "ti,am57-prueth";
7278
prus = <&pru2_0>, <&pru2_1>;
7379
firmware-name = "ti-pruss/am57xx-pru0-prueth-fw.elf",
@@ -100,7 +106,7 @@ Example (am572x-idk board, dual-emac):
100106

101107
Example (am572x-idk board, single-emac):
102108
=======================================
103-
pruss2_eth {
109+
pruss2_eth: pruss2_eth {
104110
compatible = "ti,am57-prueth";
105111
prus = <&pru2_0>, <&pru2_1>;
106112
firmware-name = "",
@@ -120,3 +126,14 @@ Example (am572x-idk board, single-emac):
120126
local-mac-address = [00 00 00 00 00 00];
121127
};
122128
};
129+
130+
131+
Example (am572x-idk board, SYNC/LATCH configurations):
132+
======================================================
133+
&pruss2_eth {
134+
pinctrl-names = "sync0_off", "sync0_on", "latch0_off", "latch0_on";
135+
pinctrl-0 = <&pr2_edc_sync0_off>;
136+
pinctrl-1 = <&pr2_edc_sync0_on>;
137+
pinctrl-2 = <&pr2_edc_latch0_off>;
138+
pinctrl-3 = <&pr2_edc_latch0_on>;
139+
};

‎Documentation/devicetree/bindings/net/ti-ptp-bc.txt

+12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Texas Instruments PTP Boundary Clcok Internal Sync Monitor
44
Required properties:
55
- compatible : Should be
66
"ti,am57-bc" for AM57xx SoCs
7+
Optional properties:
8+
- pps-sel0-gpios : GPIO specifier, used to select PPS BC mux output
9+
- pps-sel1-gpios : GPIO specifier, used to select PPS BC mux output
710

811
Example:
912
========
@@ -19,3 +22,12 @@ To enable for am572x-idk, in am572x-idk.dts:
1922
&ptp_bc {
2023
status = "okay";
2124
};
25+
26+
To enable for am571x-idk-pps, in am572x-idk-pps.dtso:
27+
28+
&ptp_bc {
29+
pps-sel0-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
30+
pps-sel1-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
31+
32+
status = "okay";
33+
};

‎arch/arm/boot/dts/ti/am571x-idk-pps.dtso

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
&mac {
1313
/* cptr pps1 generator and latch properties */
14-
timers = <&timer16>, <&timer15>;
14+
pps_timer = <&timer16>;
15+
latch_timer = <&timer15>;
1516
pinctrl-names = "pwm_off", "pwm_on", "ref_off", "ref_on",
1617
"latch_on", "latch_off";
1718
pinctrl-0 = <&pps1_timer16_pwm_off>;
@@ -50,7 +51,7 @@
5051

5152
pps1_timer16_pwm_off: pps1_timer16_pwm_off {
5253
pinctrl-single,pins = <
53-
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT | MUX_MODE15)
54+
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
5455
>;
5556
};
5657

@@ -62,7 +63,7 @@
6263

6364
pps1_timer16_pwm2_off: pps1_timer16_pwm2_off {
6465
pinctrl-single,pins = <
65-
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT | MUX_MODE15)
66+
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
6667
>;
6768
};
6869

@@ -86,7 +87,7 @@
8687

8788
pr1_edc_sync0_off: pr1_edc_sync0_off {
8889
pinctrl-single,pins = <
89-
DRA7XX_CORE_IOPAD(0x3724, PIN_OUTPUT | MUX_MODE15)
90+
DRA7XX_CORE_IOPAD(0x3724, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
9091
>;
9192
};
9293

@@ -110,7 +111,7 @@
110111

111112
pr2_edc_sync0_off: pr2_edc_sync0_off {
112113
pinctrl-single,pins = <
113-
DRA7XX_CORE_IOPAD(0x3728, PIN_OUTPUT | MUX_MODE15)
114+
DRA7XX_CORE_IOPAD(0x3728, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
114115
>;
115116
};
116117

‎arch/arm/boot/dts/ti/am572x-idk-pps.dtso

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
&mac {
1313
/* cptr pps1 generator and latch properties */
14-
timers = <&timer16>, <&timer15>;
14+
pps_timer = <&timer16>;
15+
latch_timer = <&timer15>;
1516
pinctrl-names = "pwm_off", "pwm_on", "ref_off", "ref_on",
1617
"latch_on", "latch_off";
1718
pinctrl-0 = <&pps1_timer16_pwm_off>;
@@ -45,7 +46,7 @@
4546

4647
pps1_timer16_pwm_off: pps1_timer16_pwm_off {
4748
pinctrl-single,pins = <
48-
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT | MUX_MODE15)
49+
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
4950
>;
5051
};
5152

@@ -57,7 +58,7 @@
5758

5859
pps1_timer16_pwm2_off: pps1_timer16_pwm2_off {
5960
pinctrl-single,pins = <
60-
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT | MUX_MODE15)
61+
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
6162
>;
6263
};
6364

@@ -81,7 +82,7 @@
8182

8283
pr2_edc_sync0_off: pr2_edc_sync0_off {
8384
pinctrl-single,pins = <
84-
DRA7XX_CORE_IOPAD(0x35f8, PIN_OUTPUT | MUX_MODE15)
85+
DRA7XX_CORE_IOPAD(0x35f8, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
8586
>;
8687
};
8788

@@ -105,7 +106,7 @@
105106

106107
pr2_edc_sync1_off: pr2_edc_sync1_off {
107108
pinctrl-single,pins = <
108-
DRA7XX_CORE_IOPAD(0x35fc, PIN_OUTPUT | MUX_MODE15)
109+
DRA7XX_CORE_IOPAD(0x35fc, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
109110
>;
110111
};
111112
};

‎arch/arm/boot/dts/ti/am574x-idk-pps.dtso

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
&mac {
1414
/* cptr pps1 generator and latch properties */
15-
timers = <&timer16>, <&timer15>;
15+
pps_timer = <&timer16>;
16+
latch_timer = <&timer15>;
1617
pinctrl-names = "pwm_off", "pwm_on", "ref_off", "ref_on",
1718
"latch_on", "latch_off";
1819
pinctrl-0 = <&pps1_timer16_pwm_off>;
@@ -46,7 +47,7 @@
4647

4748
pps1_timer16_pwm_off: pps1_timer16_pwm_off {
4849
pinctrl-single,pins = <
49-
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT | MUX_MODE15)
50+
DRA7XX_CORE_IOPAD(0x36a0, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
5051
>;
5152
};
5253

@@ -58,7 +59,7 @@
5859

5960
pps1_timer16_pwm2_off: pps1_timer16_pwm2_off {
6061
pinctrl-single,pins = <
61-
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT | MUX_MODE15)
62+
DRA7XX_CORE_IOPAD(0x3680, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
6263
>;
6364
};
6465

@@ -82,7 +83,7 @@
8283

8384
pr2_edc_sync0_off: pr2_edc_sync0_off {
8485
pinctrl-single,pins = <
85-
DRA7XX_CORE_IOPAD(0x35f8, PIN_OUTPUT | MUX_MODE15)
86+
DRA7XX_CORE_IOPAD(0x35f8, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
8687
>;
8788
};
8889

@@ -106,7 +107,7 @@
106107

107108
pr2_edc_sync1_off: pr2_edc_sync1_off {
108109
pinctrl-single,pins = <
109-
DRA7XX_CORE_IOPAD(0x35fc, PIN_OUTPUT | MUX_MODE15)
110+
DRA7XX_CORE_IOPAD(0x35fc, PIN_OUTPUT_PULLDOWN | MUX_MODE15)
110111
>;
111112
};
112113
};

0 commit comments

Comments
 (0)