Re: [PATCH 0/3] [RFC] ptp: IEEE 1588 clock support

[Wolfgang Grandegger <wg@grandegger.com>]

Richard Cochran wrote:
> On Wed, Apr 28, 2010 at 04:31:35PM +0200, Wolfgang Grandegger wrote:
>> That's because some 1588_PPS related bits are not yet setup in the
>> platform code of mainline kernel.
> 
> Just remembered, I am carrying along the following patch to fix the
> wrong mainline code for the mpc8313. Really annoying.

OK.

> Richard
> 
>>From 4306b6f89e5565928b4462fd8cff19a3e484f1c4 Mon Sep 17 00:00:00 2001
> From: Richard Cochran <richard.cochran@omicron.at>
> Date: Tue, 6 Apr 2010 13:36:32 +0200
> Subject: [PATCH] mpc8313: fixed the board support for REV C
> 
> ---
>  arch/powerpc/boot/dts/mpc8313erdb.dts     |   56 ++++++++++++++++++++++------
>  arch/powerpc/platforms/83xx/mpc831x_rdb.c |   15 ++++++++
>  2 files changed, 59 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
> index 761faa7..183f2aa 100644
> --- a/arch/powerpc/boot/dts/mpc8313erdb.dts
> +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
> @@ -70,6 +70,26 @@
>  			reg = <0x0 0x0 0x800000>;
>  			bank-width = <2>;
>  			device-width = <1>;
> +			partition@0 {
> +				label = "U-Boot";
> +				reg = <0x00000000 0x00100000>;
> +			};
> +			partition@100000 {
> +				label = "kernel";
> +				reg = <0x00100000 0x00200000>;
> +			};
> +			partition@300000 {
> +				label = "rootfs";
> +				reg = <0x00300000 0x00400000>;
> +			};
> +			partition@700000 {
> +				label = "DTB";
> +				reg = <0x00700000 0x00010000>;
> +			};
> +			partition@710000 {
> +				label = "vsc-util";
> +				reg = <0x00710000 0x000F0000>;
> +			};
>  		};
>  
>  		nand@1,0 {
> @@ -78,19 +98,31 @@
>  			compatible = "fsl,mpc8313-fcm-nand",
>  			             "fsl,elbc-fcm-nand";
>  			reg = <0x1 0x0 0x2000>;
> -
> -			u-boot@0 {
> -				reg = <0x0 0x100000>;
> -				read-only;
> +			partition@0 {
> +				label = "U-Boot-NAND";
> +				reg = <0x00000000 0x00100000>;
>  			};
> -
> -			kernel@100000 {
> -				reg = <0x100000 0x300000>;
> +			partition@100000 {
> +				label = "JFFS2-NAND";
> +				reg = <0x00100000 0x00800000>;
>  			};
> -
> -			fs@400000 {
> -				reg = <0x400000 0x1c00000>;
> +			partition@900000 {
> +				label = "Ramdisk-NAND";
> +				reg = <0x00900000 0x00400000>;
> +			};
> +			partition@d00000 {
> +				label = "Reserve-NAND";
> +				reg = <0x00d00000 0x01000000>;
>  			};
> +			partition@1d00000 {
> +				label = "Kernel-NAND";
> +				reg = <0x01d00000 0x00200000>;
> +			};
> +			partition@1f00000 {
> +				label = "DTB-NAND";
> +				reg = <0x01f00000 0x00100000>;
> +			};
> +
>  		};
>  	};
>  
> @@ -188,7 +220,7 @@
>  			compatible = "gianfar";
>  			reg = <0x24000 0x1000>;
>  			local-mac-address = [ 00 00 00 00 00 00 ];
> -			interrupts = <37 0x8 36 0x8 35 0x8>;
> +			interrupts = <32 0x8 33 0x8 34 0x8>;
>  			interrupt-parent = <&ipic>;
>  			tbi-handle = < &tbi0 >;
>  			/* Vitesse 7385 isn't on the MDIO bus */
> @@ -223,7 +255,7 @@
>  			reg = <0x25000 0x1000>;
>  			ranges = <0x0 0x25000 0x1000>;
>  			local-mac-address = [ 00 00 00 00 00 00 ];
> -			interrupts = <34 0x8 33 0x8 32 0x8>;
> +			interrupts = <35 0x8 36 0x8 37 0x8>;

I used these interrupt number fixes as well but it was not necessary for
the actual net-next-2.6 tree. Need to check why? I remember some version
dependent re-mapping code.

>  			interrupt-parent = <&ipic>;
>  			tbi-handle = < &tbi1 >;
>  			phy-handle = < &phy4 >;
> diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
> index 0b4f883..7f80269 100644
> --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
> +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
> @@ -20,6 +20,7 @@
>  #include <asm/ipic.h>
>  #include <asm/udbg.h>
>  #include <sysdev/fsl_pci.h>
> +#include <sysdev/fsl_soc.h>
>  
>  #include "mpc83xx.h"
>  
> @@ -31,6 +32,8 @@ static void __init mpc831x_rdb_setup_arch(void)
>  #ifdef CONFIG_PCI
>  	struct device_node *np;
>  #endif
> +	void __iomem *immap;
> +	unsigned long spcr, sicrh;
>  
>  	if (ppc_md.progress)
>  		ppc_md.progress("mpc831x_rdb_setup_arch()", 0);
> @@ -42,6 +45,18 @@ static void __init mpc831x_rdb_setup_arch(void)
>  		mpc83xx_add_bridge(np);
>  #endif
>  	mpc831x_usb_cfg();
> +
> +#define MPC83XX_SPCR_OFFS         0x110
> +#define MPC8313_SPCR_1588_PPS 0x00004000
> +#define MPC8313_SICRH_1588_PPS 0x01000000
> +
> +	immap = ioremap(get_immrbase(), 0x1000);
> +	spcr = in_be32(immap + MPC83XX_SPCR_OFFS);
> +	sicrh = in_be32(immap + MPC83XX_SICRH_OFFS);
> +	sicrh |= MPC8313_SICRH_1588_PPS;
> +	out_be32(immap + MPC83XX_SICRH_OFFS, sicrh);
> +	spcr |= MPC8313_SPCR_1588_PPS;
> +	out_be32(immap + MPC83XX_SPCR_OFFS, spcr);
>  }

That's missing to get the PPS signal output. But it should probably go
to gianfar_ptp.c.

Wolfgang.