Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 393adcac authored by Wolfgang Grandegger's avatar Wolfgang Grandegger Committed by Kumar Gala
Browse files

powerpc/85xx: Add support for the "socrates" board (MPC8544). 



Supported are Ethernet, serial console, I2C, I2C-based RTC and
temperature sensors, NOR and NAND flash, PCI, USB, CAN and Lime
display controller.

The multiplexing of FPGA interrupts onto PowerPC interrupt lines is
supported through our own fpga_pic interrupt controller driver.

For example the SJA1000 controller is level low sensitive connected to
fpga_pic line 2 and is routed to the second (of three) irq lines to
the CPU:

    can@3,100 {
            compatible = "philips,sja1000";
            reg = <3 0x100 0x80>;
            interrupts = <2 2>;
            interrupts = <2 8 1>;   // number, type, routing
            interrupt-parent = <&fpga_pic>;
    };

Signed-off-by: default avatarSergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: default avatarYuri Tikhonov <yur@emcraft.com>
Signed-off-by: default avatarIlya Yanok <yanok@emcraft.com>
Signed-off-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarDmitry Rakhchev <rda@emcraft.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent a6ecb7e9

arch/powerpc/boot/dts/socrates.dts

0 → 100644
+338 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the Socrates board (MPC8544).

 *

 * Copyright (c) 2008 Emcraft Systems.

 * Sergei Poselenov, <sposelenov@emcraft.com>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



/dts-v1/;



/ {

	model = "abb,socrates";

	compatible = "abb,socrates";

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		ethernet0 = &enet0;

		ethernet1 = &enet1;

		serial0 = &serial0;

		serial1 = &serial1;

		pci0 = &pci0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,8544@0 {

			device_type = "cpu";

			reg = <0>;

			d-cache-line-size = <32>;

			i-cache-line-size = <32>;

			d-cache-size = <0x8000>;	// L1, 32K

			i-cache-size = <0x8000>;	// L1, 32K

			timebase-frequency = <0>;

			bus-frequency = <0>;

			clock-frequency = <0>;

			next-level-cache = <&L2>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x00000000>;	// Filled in by U-Boot

	};



	soc8544@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;



		ranges = <0x00000000 0xe0000000 0x00100000>;

		reg = <0xe0000000 0x00001000>;	// CCSRBAR 1M

		bus-frequency = <0>;		// Filled in by U-Boot

		compatible = "fsl,mpc8544-immr", "simple-bus";



		memory-controller@2000 {

			compatible = "fsl,mpc8544-memory-controller";

			reg = <0x2000 0x1000>;

			interrupt-parent = <&mpic>;

			interrupts = <18 2>;

		};



		L2: l2-cache-controller@20000 {

			compatible = "fsl,mpc8544-l2-cache-controller";

			reg = <0x20000 0x1000>;

			cache-line-size = <32>;

			cache-size = <0x40000>;	// L2, 256K

			interrupt-parent = <&mpic>;

			interrupts = <16 2>;

		};



		i2c@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			cell-index = <0>;

			compatible = "fsl-i2c";

			reg = <0x3000 0x100>;

			interrupts = <43 2>;

			interrupt-parent = <&mpic>;

			dfsrr;



			dtt@28 {

				compatible = "winbond,w83782d";

				reg = <0x28>;

			};

			rtc@32 {

				compatible = "epson,rx8025";

				reg = <0x32>;

				interrupts = <7 1>;

				interrupt-parent = <&mpic>;

			};

			dtt@4c {

				compatible = "dallas,ds75";

				reg = <0x4c>;

			};

			ts@4a {

				compatible = "ti,tsc2003";

				reg = <0x4a>;

				interrupt-parent = <&mpic>;

				interrupts = <8 1>;

			};

		};



		i2c@3100 {

			#address-cells = <1>;

			#size-cells = <0>;

			cell-index = <1>;

			compatible = "fsl-i2c";

			reg = <0x3100 0x100>;

			interrupts = <43 2>;

			interrupt-parent = <&mpic>;

			dfsrr;

		};



		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "eTSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <29 2 30 2 34 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy0>;

			tbi-handle = <&tbi0>;

			phy-connection-type = "rgmii-id";



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

				reg = <0x520 0x20>;



				phy0: ethernet-phy@0 {

					interrupt-parent = <&mpic>;

					interrupts = <0 1>;

					reg = <0>;

				};

				phy1: ethernet-phy@1 {

					interrupt-parent = <&mpic>;

					interrupts = <0 1>;

					reg = <1>;

				};

				tbi0: tbi-phy@11 {

					reg = <0x11>;

				};

			};

		};



		enet1: ethernet@26000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "eTSEC";

			compatible = "gianfar";

			reg = <0x26000 0x1000>;

			ranges = <0x0 0x26000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <31 2 32 2 33 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy1>;

			tbi-handle = <&tbi1>;

			phy-connection-type = "rgmii-id";



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-tbi";

				reg = <0x520 0x20>;



				tbi1: tbi-phy@11 {

					reg = <0x11>;

				};

			};

		};



		serial0: serial@4500 {

			cell-index = <0>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <0x4500 0x100>;

			clock-frequency = <0>;

			interrupts = <42 2>;

			interrupt-parent = <&mpic>;

		};



		serial1: serial@4600 {

			cell-index = <1>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <0x4600 0x100>;

			clock-frequency = <0>;

			interrupts = <42 2>;

			interrupt-parent = <&mpic>;

		};



		global-utilities@e0000 {	//global utilities block

			compatible = "fsl,mpc8548-guts";

			reg = <0xe0000 0x1000>;

			fsl,has-rstcr;

		};



		mpic: pic@40000 {

			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <2>;

			reg = <0x40000 0x40000>;

			compatible = "chrp,open-pic";

			device_type = "open-pic";

		};

	};





	localbus {

		compatible = "fsl,mpc8544-localbus",

		             "fsl,pq3-localbus",

			     "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;

		reg = <0xe0005000 0x40>;



		ranges = <0 0 0xfc000000 0x04000000

			  2 0 0xc8000000 0x04000000

			  3 0 0xc0000000 0x00100000

			>; /* Overwritten by U-Boot */



		nor_flash@0,0 {

			compatible = "amd,s29gl256n", "cfi-flash";

			bank-width = <2>;

			reg = <0x0 0x000000 0x4000000>;

			#address-cells = <1>;

			#size-cells = <1>;

			partition@0 {

				label = "kernel";

				reg = <0x0 0x1e0000>;

				read-only;

			};

			partition@1e0000 {

				label = "dtb";

				reg = <0x1e0000 0x20000>;

			};

			partition@200000 {

				label = "root";

				reg = <0x200000 0x200000>;

			};

			partition@400000 {

				label = "user";

				reg = <0x400000 0x3b80000>;

			};

			partition@3f80000 {

				label = "env";

				reg = <0x3f80000 0x40000>;

				read-only;

			};

			partition@3fc0000 {

				label = "u-boot";

				reg = <0x3fc0000 0x40000>;

				read-only;

			};

		};



		display@2,0 {

			compatible = "fujitsu,lime";

			reg = <2 0x0 0x4000000>;

			interrupt-parent = <&mpic>;

			interrupts = <6 1>;

		};



		fpga_pic: fpga-pic@3,10 {

			compatible = "abb,socrates-fpga-pic";

			reg = <3 0x10 0x10>;

			interrupt-controller;

			/* IRQs 2, 10, 11, active low, level-sensitive */

			interrupts = <2 1 10 1 11 1>;

			interrupt-parent = <&mpic>;

			#interrupt-cells = <3>;

		};



		spi@3,60 {

			compatible = "abb,socrates-spi";

			reg = <3 0x60 0x10>;

			interrupts = <8 4 0>;	// number, type, routing

			interrupt-parent = <&fpga_pic>;

		};



		nand@3,70 {

			compatible = "abb,socrates-nand";

			reg = <3 0x70 0x04>;

			bank-width = <1>;

			#address-cells = <1>;

			#size-cells = <1>;

			data@0 {

				label = "data";

				reg = <0x0 0x40000000>;

			};

		};



		can@3,100 {

			compatible = "philips,sja1000";

			reg = <3 0x100 0x80>;

			interrupts = <2 8 1>;	// number, type, routing

			interrupt-parent = <&fpga_pic>;

		};

	};



	pci0: pci@e0008000 {

		cell-index = <0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		compatible = "fsl,mpc8540-pci";

		device_type = "pci";

		reg = <0xe0008000 0x1000>;

		clock-frequency = <66666666>;



		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

				/* IDSEL 0x11 */

				 0x8800 0x0 0x0 1 &mpic 5 1

				/* IDSEL 0x12 */

				 0x9000 0x0 0x0 1 &mpic 4 1>;

		interrupt-parent = <&mpic>;

		interrupts = <24 2>;

		bus-range = <0x0 0x0>;

		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xe2000000 0x0 0x01000000>;

	};



};

arch/powerpc/configs/85xx/socrates_defconfig

0 → 100644
+1410 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/platforms/85xx/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ config MPC85xx_DS 
	help

	  This option enables support for the MPC85xx DS (MPC8544 DS) board



config SOCRATES

	bool "Socrates"

	select DEFAULT_UIMAGE

	help

	  This option enables support for the Socrates board.



config KSI8560

        bool "Emerson KSI8560"

        select DEFAULT_UIMAGE

arch/powerpc/platforms/85xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,4 +13,5 @@ obj-$(CONFIG_STX_GP3) += stx_gp3.o 
obj-$(CONFIG_TQM85xx)	  += tqm85xx.o

obj-$(CONFIG_SBC8560)     += sbc8560.o

obj-$(CONFIG_SBC8548)     += sbc8548.o

obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o

obj-$(CONFIG_KSI8560)	  += ksi8560.o

arch/powerpc/platforms/85xx/socrates.c

0 → 100644
+133 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008 Emcraft Systems

 * Sergei Poselenov <sposelenov@emcraft.com>

 *

 * Based on MPC8560 ADS and arch/ppc tqm85xx ports

 *

 * Maintained by Kumar Gala (see MAINTAINERS for contact information)

 *

 * Copyright 2008 Freescale Semiconductor Inc.

 *

 * Copyright (c) 2005-2006 DENX Software Engineering

 * Stefan Roese <sr@denx.de>

 *

 * Based on original work by

 * 	Kumar Gala <kumar.gala@freescale.com>

 *      Copyright 2004 Freescale Semiconductor Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/kdev_t.h>

#include <linux/delay.h>

#include <linux/seq_file.h>

#include <linux/of_platform.h>



#include <asm/system.h>

#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/pci-bridge.h>

#include <asm/mpic.h>

#include <asm/prom.h>

#include <mm/mmu_decl.h>

#include <asm/udbg.h>



#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>



#include "socrates_fpga_pic.h"



static void __init socrates_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np;



	np = of_find_node_by_type(NULL, "open-pic");

	if (!np) {

		printk(KERN_ERR "Could not find open-pic node\n");

		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Could not map mpic register space\n");

		of_node_put(np);

		return;

	}



	mpic = mpic_alloc(np, r.start,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);

	of_node_put(np);



	mpic_init(mpic);



	np = of_find_compatible_node(NULL, NULL, "abb,socrates-fpga-pic");

	if (!np) {

		printk(KERN_ERR "Could not find socrates-fpga-pic node\n");

		return;

	}

	socrates_fpga_pic_init(np);

	of_node_put(np);

}



/*

 * Setup the architecture

 */

static void __init socrates_setup_arch(void)

{

#ifdef CONFIG_PCI

	struct device_node *np;

#endif



	if (ppc_md.progress)

		ppc_md.progress("socrates_setup_arch()", 0);



#ifdef CONFIG_PCI

	for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")

		fsl_add_bridge(np, 1);

#endif

}



static struct of_device_id __initdata socrates_of_bus_ids[] = {

	{ .compatible = "simple-bus", },

	{ .compatible = "gianfar", },

	{},

};



static void __init socrates_init(void)

{

	of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL);

}



/*

 * Called very early, device-tree isn't unflattened

 */

static int __init socrates_probe(void)

{

	unsigned long root = of_get_flat_dt_root();



	if (of_flat_dt_is_compatible(root, "abb,socrates"))

		return 1;



	return 0;

}



define_machine(socrates) {

	.name			= "Socrates",

	.probe			= socrates_probe,

	.setup_arch		= socrates_setup_arch,

	.init			= socrates_init,

	.init_IRQ		= socrates_pic_init,

	.get_irq		= mpic_get_irq,

	.restart		= fsl_rstcr_restart,

	.calibrate_decr		= generic_calibrate_decr,

	.progress		= udbg_progress,

};