Skip to content

Commit d4e1768

Browse files
yangbolu1991davem330
authored andcommitted
ptp_qoriq: fix register memory map
The 1588 timer on eTSEC Ethernet controller uses different register memory map with DPAA Ethernet controller. Now the new ENETC Ethernet controller uses same reigster memory map with DPAA. To support ENETC, let's use register memory map of DPAA/ENETC in default. Signed-off-by: Yangbo Lu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2843bf5 commit d4e1768

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

drivers/ptp/ptp_qoriq.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,11 +504,12 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base,
504504
ptp_qoriq->write = qoriq_write_be;
505505
}
506506

507-
if (of_device_is_compatible(node, "fsl,fman-ptp-timer")) {
508-
ptp_qoriq->regs.ctrl_regs = base + FMAN_CTRL_REGS_OFFSET;
509-
ptp_qoriq->regs.alarm_regs = base + FMAN_ALARM_REGS_OFFSET;
510-
ptp_qoriq->regs.fiper_regs = base + FMAN_FIPER_REGS_OFFSET;
511-
ptp_qoriq->regs.etts_regs = base + FMAN_ETTS_REGS_OFFSET;
507+
/* The eTSEC uses differnt memory map with DPAA/ENETC */
508+
if (of_device_is_compatible(node, "fsl,etsec-ptp")) {
509+
ptp_qoriq->regs.ctrl_regs = base + ETSEC_CTRL_REGS_OFFSET;
510+
ptp_qoriq->regs.alarm_regs = base + ETSEC_ALARM_REGS_OFFSET;
511+
ptp_qoriq->regs.fiper_regs = base + ETSEC_FIPER_REGS_OFFSET;
512+
ptp_qoriq->regs.etts_regs = base + ETSEC_ETTS_REGS_OFFSET;
512513
} else {
513514
ptp_qoriq->regs.ctrl_regs = base + CTRL_REGS_OFFSET;
514515
ptp_qoriq->regs.alarm_regs = base + ALARM_REGS_OFFSET;

include/linux/fsl/ptp_qoriq.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ struct ptp_qoriq_registers {
5858
};
5959

6060
/* Offset definitions for the four register groups */
61-
#define CTRL_REGS_OFFSET 0x0
62-
#define ALARM_REGS_OFFSET 0x40
63-
#define FIPER_REGS_OFFSET 0x80
64-
#define ETTS_REGS_OFFSET 0xa0
65-
66-
#define FMAN_CTRL_REGS_OFFSET 0x80
67-
#define FMAN_ALARM_REGS_OFFSET 0xb8
68-
#define FMAN_FIPER_REGS_OFFSET 0xd0
69-
#define FMAN_ETTS_REGS_OFFSET 0xe0
61+
#define ETSEC_CTRL_REGS_OFFSET 0x0
62+
#define ETSEC_ALARM_REGS_OFFSET 0x40
63+
#define ETSEC_FIPER_REGS_OFFSET 0x80
64+
#define ETSEC_ETTS_REGS_OFFSET 0xa0
65+
66+
#define CTRL_REGS_OFFSET 0x80
67+
#define ALARM_REGS_OFFSET 0xb8
68+
#define FIPER_REGS_OFFSET 0xd0
69+
#define ETTS_REGS_OFFSET 0xe0
7070

7171

7272
/* Bit definitions for the TMR_CTRL register */

0 commit comments

Comments
 (0)