Skip to content

Commit

Permalink
Revert "powerpc/83xx: gianfar_ptp: select 1588 clock source through d…
Browse files Browse the repository at this point in the history
…ts file"

This reverts commit 894116b.

I applied the wrong version of this patch, correct
version coming up.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Oct 1, 2013
1 parent 5a0068d commit 3f3f096
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
16 changes: 1 addition & 15 deletions Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ General Properties:

Clock Properties:

- fsl,cksel Timer reference clock source.
- fsl,tclk-period Timer reference clock period in nanoseconds.
- fsl,tmr-prsc Prescaler, divides the output clock.
- fsl,tmr-add Frequency compensation value.
Expand All @@ -98,7 +97,7 @@ Clock Properties:
clock. You must choose these carefully for the clock to work right.
Here is how to figure good values:

TimerOsc = selected reference clock MHz
TimerOsc = system clock MHz
tclk_period = desired clock period nanoseconds
NominalFreq = 1000 / tclk_period MHz
FreqDivRatio = TimerOsc / NominalFreq (must be greater that 1.0)
Expand All @@ -115,26 +114,13 @@ Clock Properties:
Pulse Per Second (PPS) signal, since this will be offered to the PPS
subsystem to synchronize the Linux clock.

"fsl,cksel" property allows to select different reference clock
sources:

<0> - external high precision timer reference clock (TSEC_TMR_CLK
input is used for this purpose);
<1> - eTSEC system clock;
<2> - eTSEC1 transmit clock;
<3> - RTC clock input.

When this attribute is not used, eTSEC system clock will serve as
IEEE 1588 timer reference clock.

Example:

ptp_clock@24E00 {
compatible = "fsl,etsec-ptp";
reg = <0x24E00 0xB0>;
interrupts = <12 0x8 13 0x8>;
interrupt-parent = < &ipic >;
fsl,cksel = <1>;
fsl,tclk-period = <10>;
fsl,tmr-prsc = <100>;
fsl,tmr-add = <0x999999A4>;
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/freescale/gianfar_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
err = -ENODEV;

etsects->caps = ptp_gianfar_caps;

if (get_of_u32(node, "fsl,cksel", &etsects->cksel))
etsects->cksel = DEFAULT_CKSEL;
etsects->cksel = DEFAULT_CKSEL;

if (get_of_u32(node, "fsl,tclk-period", &etsects->tclk_period) ||
get_of_u32(node, "fsl,tmr-prsc", &etsects->tmr_prsc) ||
Expand Down

0 comments on commit 3f3f096

Please sign in to comment.