Doug / smarc-fsl-linux-kernel | Embedian Git Server

Commit 2a05e333c2cee711c828d79300010b721c81574f

Authored by Holger Brunck 2011-09-27 15:44:50 +0800

Committed by Kumar Gala 2011-10-12 05:18:41 +0800

Exists in master and in 6 other branches

powerpc/82xx: updates for mgcoge

Add:
 - Setup dts node for USB
 - pin description and setup for SMC1 (serial interface)

Update and cleanup mgcoge_defconfig:
- enable: TIPC, UBIFS, USB_GADGET driver, SQUASHFS, HIGHRES timers
          POSIX_MQUEUE, EMBEDDED
- disable: EXT3, PPC_PMAC

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Showing 3 changed files with 29 additions and 11 deletions Inline Diff

arch/powerpc/boot/dts/mgcoge.dts
arch/powerpc/configs/mgcoge_defconfig
arch/powerpc/platforms/82xx/km82xx.c

arch/powerpc/boot/dts/mgcoge.dts

Diff comments View file @ 2a05e33

 /*
  * Device Tree for the MGCOGE plattform from keymile
  *
  * Copyright 2008 DENX Software Engineering GmbH
  * Heiko Schocher <hs@denx.de>
  *
  * 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 = "MGCOGE";
 	compatible = "keymile,km82xx";
 	#address-cells = <1>;
 	#size-cells = <1>;
 	aliases {
 		ethernet0 = &eth0;
 		serial0 = &smc2;
 	};
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		PowerPC,8247@0 {
 			device_type = "cpu";
 			reg = <0>;
 			d-cache-line-size = <32>;
 			i-cache-line-size = <32>;
 			d-cache-size = <16384>;
 			i-cache-size = <16384>;
 			timebase-frequency = <0>; /* Filled in by U-Boot */
 			clock-frequency = <0>; /* Filled in by U-Boot */
 			bus-frequency = <0>; /* Filled in by U-Boot */
 		};
 	};
 	localbus@f0010100 {
 		compatible = "fsl,mpc8247-localbus",
 		             "fsl,pq2-localbus",
 		             "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <1>;
 		reg = <0xf0010100 0x40>;
 		ranges = <0 0 0xfe000000 0x00400000
 			  1 0 0x30000000 0x00010000
 			  2 0 0x40000000 0x00010000
 			  5 0 0x50000000 0x04000000
 			>;
 		flash@0,0 {
 			compatible = "cfi-flash";
 			reg = <0 0x0 0x400000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			bank-width = <1>;
 			device-width = <1>;
 			partition@0 {
 				label = "u-boot";
 				reg = <0x00000 0xC0000>;
 			};
 			partition@1 {
 				label = "env";
 				reg = <0xC0000 0x20000>;
 			};
 			partition@2 {
 				label = "envred";
 				reg = <0xE0000 0x20000>;
 			};
 			partition@3 {
 				label = "free";
 				reg = <0x100000 0x300000>;
 			};
 		};
 		flash@5,0 {
 			compatible = "cfi-flash";
 			reg = <5 0x00000000 0x02000000
 			       5 0x02000000 0x02000000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			bank-width = <2>;
 			partition@app { /* 64 MBytes */
 				label = "ubi0";
 				reg = <0x00000000 0x04000000>;
 			};
 		};
 	};
 	memory {
 		device_type = "memory";
 		reg = <0 0>; /* Filled in by U-Boot */
 	};
 	soc@f0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "fsl,mpc8247-immr", "fsl,pq2-soc", "simple-bus";
 		ranges = <0x00000000 0xf0000000 0x00053000>;
 		// Temporary until code stops depending on it.
 		device_type = "soc";
 		cpm@119c0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#interrupt-cells = <2>;
 			compatible = "fsl,mpc8247-cpm", "fsl,cpm2",
 					"simple-bus";
 			reg = <0x119c0 0x30>;
 			ranges;
 			muram {
 				compatible = "fsl,cpm-muram";
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0 0 0x10000>;
 				data@0 {
 					compatible = "fsl,cpm-muram-data";
 					reg = <0x80 0x1f80 0x9800 0x800>;
 				};
 			};
 			brg@119f0 {
 				compatible = "fsl,mpc8247-brg",
 				             "fsl,cpm2-brg",
 				             "fsl,cpm-brg";
 				reg = <0x119f0 0x10 0x115f0 0x10>;
 			};
 			/* Monitor port/SMC2 */
 			smc2: serial@11a90 {
 				device_type = "serial";
 				compatible = "fsl,mpc8247-smc-uart",
 				             "fsl,cpm2-smc-uart";
 				reg = <0x11a90 0x20 0x88fc 0x02>;
 				interrupts = <5 8>;
 				interrupt-parent = <&PIC>;
 				fsl,cpm-brg = <2>;
 				fsl,cpm-command = <0x21200000>;
 				current-speed = <0>; /* Filled in by U-Boot */
 			};
 			eth0: ethernet@11a60 {
 				device_type = "network";
 				compatible = "fsl,mpc8247-scc-enet",
 				             "fsl,cpm2-scc-enet";
 				reg = <0x11a60 0x20 0x8300 0x100 0x11390 1>;
 				local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */
 				interrupts = <43 8>;
 				interrupt-parent = <&PIC>;
 				linux,network-index = <0>;
 				fsl,cpm-command = <0xce00000>;
 				fixed-link = <0 0 10 0 0>;
 			};
 			i2c@11860 {
 				compatible = "fsl,mpc8272-i2c",
 					     "fsl,cpm2-i2c";
 				reg = <0x11860 0x20 0x8afc 0x2>;
 				interrupts = <1 8>;
 				interrupt-parent = <&PIC>;
 				fsl,cpm-command = <0x29600000>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
 			mdio@10d40 {
 				compatible = "fsl,cpm2-mdio-bitbang";
 				reg = <0x10d00 0x14>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				fsl,mdio-pin = <12>;
 				fsl,mdc-pin = <13>;
 				phy0: ethernet-phy@0 {
 					reg = <0x0>;
 				};
 				phy1: ethernet-phy@1 {
 					reg = <0x1>;
 				};
 			};
 			/* FCC1 management to switch */
 			ethernet@11300 {
 				device_type = "network";
 				compatible = "fsl,cpm2-fcc-enet";
 				reg = <0x11300 0x20 0x8400 0x100 0x11390 0x1>;
 				local-mac-address = [ 00 01 02 03 04 07 ];
 				interrupts = <32 8>;
 				interrupt-parent = <&PIC>;
 				phy-handle = <&phy0>;
 				linux,network-index = <1>;
 				fsl,cpm-command = <0x12000300>;
 			};
 			/* FCC2 to redundant core unit over backplane */
 			ethernet@11320 {
 				device_type = "network";
 				compatible = "fsl,cpm2-fcc-enet";
 				reg = <0x11320 0x20 0x8500 0x100 0x113b0 0x1>;
 				local-mac-address = [ 00 01 02 03 04 08 ];
 				interrupts = <33 8>;
 				interrupt-parent = <&PIC>;
 				phy-handle = <&phy1>;
 				linux,network-index = <2>;
 				fsl,cpm-command = <0x16200300>;
 			};
+			usb@11b60 {
+				compatible = "fsl,mpc8272-cpm-usb";
+				mode = "peripheral";
+				reg = <0x11b60 0x40 0x8b00 0x100>;
+				interrupts = <11 8>;
+				interrupt-parent = <&PIC>;
+				usb-clock = <5>;
+			};
 		};
 		cpm2_pio_c: gpio-controller@10d40 {
 			#gpio-cells = <2>;
 			compatible = "fsl,cpm2-pario-bank";
 			reg = <0x10d40 0x14>;
 			gpio-controller;
 		};
 		PIC: interrupt-controller@10c00 {
 			#interrupt-cells = <2>;
 			interrupt-controller;
 			reg = <0x10c00 0x80>;
 			compatible = "fsl,mpc8247-pic", "fsl,pq2-pic";
 		};
 	};
 };

arch/powerpc/configs/mgcoge_defconfig

Diff comments View file @ 2a05e33

+CONFIG_EXPERIMENTAL=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
+# CONFIG_RD_GZIP is not set
 CONFIG_KALLSYMS_ALL=y
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_IOSCHED_CFQ is not set
+# CONFIG_PPC_PMAC is not set
 CONFIG_PPC_82xx=y
 CONFIG_MGCOGE=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BINFMT_MISC=y
 # CONFIG_SECCOMP is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
+CONFIG_TIPC=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_GEOMETRY=y
 # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
-# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
 CONFIG_FIXED_PHY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_FS_ENET=y
 CONFIG_FS_ENET_MDIO_FCC=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
 CONFIG_SERIAL_CPM=y
 CONFIG_SERIAL_CPM_CONSOLE=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_POWERMAC is not set
 CONFIG_I2C_CPM=y
 # CONFIG_HWMON is not set
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_FSL_USB2=y
+CONFIG_USB_G_SERIAL=y
+CONFIG_UIO=y
+CONFIG_UIO_PDRV=y
 CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
 CONFIG_AUTOFS4_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MAC_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y

arch/powerpc/platforms/82xx/km82xx.c

Diff comments View file @ 2a05e33

 /*
  * Keymile km82xx support
  * Copyright 2008-2011 DENX Software Engineering GmbH
  * Author: Heiko Schocher <hs@denx.de>
  *
  * based on code from:
  * Copyright 2007 Freescale Semiconductor, Inc.
  * Author: Scott Wood <scottwood@freescale.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.
  */
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 #include <asm/cpm2.h>
 #include <asm/udbg.h>
 #include <asm/machdep.h>
 #include <asm/time.h>
 #include <asm/mpc8260.h>
 #include <asm/prom.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/cpm2_pic.h>
 #include "pq2.h"
 static void __init km82xx_pic_init(void)
 {
 	struct device_node *np = of_find_compatible_node(NULL, NULL,
 							"fsl,pq2-pic");
 	if (!np) {
 		printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
 		return;
 	}
 	cpm2_pic_init(np);
 	of_node_put(np);
 }
 struct cpm_pin {
 	int port, pin, flags;
 };
 static __initdata struct cpm_pin km82xx_pins[] = {
+	/* SMC1 */
+	{2, 4, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+	{2, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	/* SMC2 */
 	{0, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{0, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	/* SCC1 */
 	{2, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
 	/* SCC4 */
 	{2, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2,  9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2,  8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{3, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{3, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	/* FCC1 */
 	{0, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{0, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{0, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{0, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{0, 18, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{0, 19, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{0, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{0, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{0, 26, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
 	{0, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
 	{0, 28, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
 	{0, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
 	{0, 30, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
 	{0, 31, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
 	{2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2, 23, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	/* FCC2 */
 	{1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
 	{1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	/* MDC */
 	{0, 13, CPM_PIN_OUTPUT | CPM_PIN_GPIO},
 #if defined(CONFIG_I2C_CPM)
 	/* I2C */
 	{3, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
 	{3, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
 #endif
 	/* USB */
 	{0, 10, CPM_PIN_OUTPUT | CPM_PIN_GPIO},    /* FULL_SPEED */
 	{0, 11, CPM_PIN_OUTPUT | CPM_PIN_GPIO},    /*/SLAVE */
 	{2, 10, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXN */
 	{2, 11, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXP */
 	{2, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* /OE */
 	{2, 27, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXCLK */
 	{3, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* TXP */
 	{3, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* TXN */
 	{3, 25, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXD */
 };
 static void __init init_ioports(void)
 {
 	int i;
 	for (i = 0; i < ARRAY_SIZE(km82xx_pins); i++) {
 		const struct cpm_pin *pin = &km82xx_pins[i];
 		cpm2_set_pin(pin->port, pin->pin, pin->flags);
 	}
 	cpm2_smc_clk_setup(CPM_CLK_SMC2, CPM_BRG8);
+	cpm2_smc_clk_setup(CPM_CLK_SMC1, CPM_BRG7);
 	cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_RX);
 	cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_TX);
 	cpm2_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RTX);
 	cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK7, CPM_CLK_RX);
 	cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK8, CPM_CLK_TX);
 	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_RX);
 	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK9,  CPM_CLK_TX);
 	cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
 	cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
 	/* Force USB FULL SPEED bit to '1' */
 	setbits32(&cpm2_immr->im_ioport.iop_pdata, 1 << (31 - 10));
 	/* clear USB_SLAVE */
 	clrbits32(&cpm2_immr->im_ioport.iop_pdata, 1 << (31 - 11));
 }
 static void __init km82xx_setup_arch(void)
 {
 	if (ppc_md.progress)
 		ppc_md.progress("km82xx_setup_arch()", 0);
 	cpm2_reset();
 	/* When this is set, snooping CPM DMA from RAM causes
 	 * machine checks.  See erratum SIU18.
 	 */
 	clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_bcr, MPC82XX_BCR_PLDP);
 	init_ioports();
 	if (ppc_md.progress)
 		ppc_md.progress("km82xx_setup_arch(), finish", 0);
 }
 static  __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
 	{},
 };
 static int __init declare_of_platform_devices(void)
 {
 	of_platform_bus_probe(NULL, of_bus_ids, NULL);
 	return 0;
 }
 machine_device_initcall(km82xx, declare_of_platform_devices);
 /*
  * Called very early, device-tree isn't unflattened
  */
 static int __init km82xx_probe(void)
 {
 	unsigned long root = of_get_flat_dt_root();
 	return of_flat_dt_is_compatible(root, "keymile,km82xx");
 }
 define_machine(km82xx)
 {
 	.name = "Keymile km82xx",
 	.probe = km82xx_probe,
 	.setup_arch = km82xx_setup_arch,
 	.init_IRQ = km82xx_pic_init,
 	.get_irq = cpm2_get_irq,
 	.calibrate_decr = generic_calibrate_decr,
 	.restart = pq2_restart,
 	.progress = udbg_progress,
 };