Commit 91d0a48a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Reuse-ptp_qoriq-driver-for-dpaa2-ptp' 



Yangbo Lu says:

====================
Reuse ptp_qoriq driver for dpaa2-ptp

Although dpaa2-ptp.c driver is a fsl_mc_driver which
is using MC APIs for register accessing, it's same IP
block with eTSEC/DPAA/ENETC 1588 timer.
This patch-set is to convert to reuse ptp_qoriq driver by
using register ioremap and dropping related MC APIs.
However the interrupts could only be handled by MC which
fires MSIs to ARM cores. So the interrupt enabling and
handling still rely on MC APIs. MC APIs for interrupt
and PPS event support are also added by this patch-set.

---
Changes for v2:
	- Allowed to compile with COMPILE_TEST.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 930cfe0f 28c67157

Documentation/devicetree/bindings/ptp/ptp-qoriq.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ General Properties: 


  - compatible   Should be "fsl,etsec-ptp" for eTSEC

                 Should be "fsl,fman-ptp-timer" for DPAA FMan

                 Should be "fsl,dpaa2-ptp" for DPAA2

                 Should be "fsl,enetc-ptp" for ENETC

  - reg          Offset and length of the register set for the device

  - interrupts   There should be at least two interrupts. Some devices

MAINTAINERS

+2 −7
Original line number Diff line number Diff line
@@ -4922,13 +4922,6 @@ L: linux-kernel@vger.kernel.org 
S:	Maintained

F:	drivers/staging/fsl-dpaa2/ethsw



DPAA2 PTP CLOCK DRIVER

M:	Yangbo Lu <yangbo.lu@nxp.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*

F:	drivers/net/ethernet/freescale/dpaa2/dprtc*



DPT_I2O SCSI RAID DRIVER

M:	Adaptec OEM Raid Solutions <aacraid@microsemi.com>

L:	linux-scsi@vger.kernel.org
@@ -6371,6 +6364,8 @@ FREESCALE QORIQ PTP CLOCK DRIVER 
M:	Yangbo Lu <yangbo.lu@nxp.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*

F:	drivers/net/ethernet/freescale/dpaa2/dprtc*

F:	drivers/net/ethernet/freescale/enetc/enetc_ptp.c

F:	drivers/ptp/ptp_qoriq.c

F:	drivers/ptp/ptp_qoriq_debugfs.c

arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -609,6 +609,14 @@ 
				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;

		};



		ptp-timer@8b95000 {

			compatible = "fsl,dpaa2-ptp";

			reg = <0x0 0x8b95000 0x0 0x100>;

			clocks = <&clockgen 4 0>;

			little-endian;

			fsl,extts-fifo;

		};



		cluster1_core0_watchdog: wdt@c000000 {

			compatible = "arm,sp805-wdt", "arm,primecell";

			reg = <0x0 0xc000000 0x0 0x1000>;

arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -321,6 +321,14 @@ 
			};

		};



		ptp-timer@8b95000 {

			compatible = "fsl,dpaa2-ptp";

			reg = <0x0 0x8b95000 0x0 0x100>;

			clocks = <&clockgen 4 1>;

			little-endian;

			fsl,extts-fifo;

		};



		fsl_mc: fsl-mc@80c000000 {

			compatible = "fsl,qoriq-mc";

			reg = <0x00000008 0x0c000000 0 0x40>,	 /* MC portal base */

arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -848,6 +848,14 @@ 
			dma-coherent;

		};



		ptp-timer@8b95000 {

			compatible = "fsl,dpaa2-ptp";

			reg = <0x0 0x8b95000 0x0 0x100>;

			clocks = <&clockgen 4 1>;

			little-endian;

			fsl,extts-fifo;

		};



		fsl_mc: fsl-mc@80c000000 {

			compatible = "fsl,qoriq-mc";

			reg = <0x00000008 0x0c000000 0 0x40>,