Commit be69087c authored by Jonathan Lemon's avatar Jonathan Lemon Committed by David S. Miller

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

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: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2c4f0ac
...@@ -339,7 +339,7 @@ static struct ptp_ocp_eeprom_map fb_eeprom_map[] = { ...@@ -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[] = { ...@@ -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) ...@@ -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) ...@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment