korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

ptp: ocp: Rename output selector 'GNSS' to 'GNSS1'

Browse Source 
As there are may be 2 GNSS outputs, rename the first one for clarity.
This also works around a parsing issue when specifying selectors.

Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jonathan Lemon 2022-03-10 12:19:05 -08:00 committed by David S. Miller
parent b2c4f0ac53
commit be69087ce6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ptp/ptp_ocp.c
View File

@ -339,7 +339,7 @@ static struct ptp_ocp_eeprom_map fb_eeprom_map[] = {
* 0: TS3 (and PPS) * 0: TS3 (and PPS)
* 1: TS0 * 1: TS0
* 2: TS1 * 2: TS1
* 3: GNSS * 3: GNSS1
* 4: GNSS2 * 4: GNSS2
* 5: MAC * 5: MAC
* 6: TS2 * 6: TS2
@ -540,7 +540,7 @@ static struct ocp_selector ptp_ocp_sma_out[] = {
{ .name = "10Mhz", .value = 0x00 }, { .name = "10Mhz", .value = 0x00 },
{ .name = "PHC", .value = 0x01 }, { .name = "PHC", .value = 0x01 },
{ .name = "MAC", .value = 0x02 }, { .name = "MAC", .value = 0x02 },
{ .name = "GNSS", .value = 0x04 }, { .name = "GNSS1", .value = 0x04 },
{ .name = "GNSS2", .value = 0x08 }, { .name = "GNSS2", .value = 0x08 },
{ .name = "IRIG", .value = 0x10 }, { .name = "IRIG", .value = 0x10 },
{ .name = "DCF", .value = 0x20 }, { .name = "DCF", .value = 0x20 },
@ -2288,7 +2288,7 @@ ptp_ocp_summary_show(struct seq_file *s, void *data)
if (bp->ts0) { if (bp->ts0) {
ts_reg = bp->ts0->mem; ts_reg = bp->ts0->mem;
on = ioread32(&ts_reg->enable); on = ioread32(&ts_reg->enable);
src = "GNSS"; src = "GNSS1";
seq_printf(s, "%7s: %s, src: %s\n", "TS0", seq_printf(s, "%7s: %s, src: %s\n", "TS0",
on ? " ON" : "OFF", src); on ? " ON" : "OFF", src);
} }
@ -2371,7 +2371,7 @@ ptp_ocp_summary_show(struct seq_file *s, void *data)
else if (val & 0x02) else if (val & 0x02)
src = "MAC"; src = "MAC";
else if (val & 0x04) else if (val & 0x04)
src = "GNSS"; src = "GNSS1";
else else
src = "----"; src = "----";
} else { } else {