From: David S. Miller Date: Wed, 17 Feb 2021 21:49:26 +0000 (-0800) Subject: Merge branch 'ptp-ptp_clockmatrix-Fix-output-1-PPS-alignment' X-Git-Tag: microblaze-v5.13~205^2~3 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=41f1a01bb6c678681147f52180a7c20b0e12e137;p=linux-2.6-microblaze.git Merge branch 'ptp-ptp_clockmatrix-Fix-output-1-PPS-alignment' Vincent Cheng says: ==================== ptp: ptp_clockmatrix: Fix output 1 PPS alignment. This series fixes a race condition that may result in the output clock not aligned to internal 1 PPS clock. Part of device initialization is to align the rising edge of output clocks to the internal rising edge of the 1 PPS clock. If the system APLL and DPLL are not locked when this alignment occurs, the alignment fails and a fixed offset between the internal 1 PPS clock and the output clock occurs. If a clock is dynamically enabled after power-up, the output clock also needs to be aligned to the internal 1 PPS clock. v3: Suggested by: Jakub Kicinski - Remove unnecessary 'err' variable - Increase msleep()/loop accuracy by using jiffies in while() - No empty lines between variables - No empty lines between call and the if - parenthesis around a == b are unnecessary - Inconsistent \n usage in dev_() - Remove unnecessary empty line - Leave string format in place so static code checkers can validate arguments v2: Suggested by: Richard Cochran - Added const to "char * fmt" - Break unrelated header change into separate patch ==================== Signed-off-by: David S. Miller --- 41f1a01bb6c678681147f52180a7c20b0e12e137