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

Commit 6a1c9dfe authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote branch 'jwb/next' into next

parents e0dc09ff 2989b722

arch/powerpc/boot/dts/bluestone.dts

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

 * Device Tree for Bluestone (APM821xx) board.

 *

 * Copyright (c) 2010, Applied Micro Circuits Corporation

 * Author: Tirumala R Marri <tmarri@apm.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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,

 * MA 02111-1307 USA

 *

 */



/dts-v1/;



/ {

	#address-cells = <2>;

	#size-cells = <1>;

	model = "apm,bluestone";

	compatible = "apm,bluestone";

	dcr-parent = <&{/cpus/cpu@0}>;



	aliases {

		ethernet0 = &EMAC0;

		serial0 = &UART0;

		serial1 = &UART1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			model = "PowerPC,apm821xx";

			reg = <0x00000000>;

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

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

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

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

			i-cache-size = <32768>;

			d-cache-size = <32768>;

			dcr-controller;

			dcr-access-method = "native";

			next-level-cache = <&L2C0>;

		};

	};



	memory {

		device_type = "memory";

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

	};



	UIC0: interrupt-controller0 {

		compatible = "ibm,uic";

		interrupt-controller;

		cell-index = <0>;

		dcr-reg = <0x0c0 0x009>;

		#address-cells = <0>;

		#size-cells = <0>;

		#interrupt-cells = <2>;

	};



	UIC1: interrupt-controller1 {

		compatible = "ibm,uic";

		interrupt-controller;

		cell-index = <1>;

		dcr-reg = <0x0d0 0x009>;

		#address-cells = <0>;

		#size-cells = <0>;

		#interrupt-cells = <2>;

		interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */

		interrupt-parent = <&UIC0>;

	};



	UIC2: interrupt-controller2 {

		compatible = "ibm,uic";

		interrupt-controller;

		cell-index = <2>;

		dcr-reg = <0x0e0 0x009>;

		#address-cells = <0>;

		#size-cells = <0>;

		#interrupt-cells = <2>;

		interrupts = <0xa 0x4 0xb 0x4>; /* cascade */

		interrupt-parent = <&UIC0>;

	};



	UIC3: interrupt-controller3 {

		compatible = "ibm,uic";

		interrupt-controller;

		cell-index = <3>;

		dcr-reg = <0x0f0 0x009>;

		#address-cells = <0>;

		#size-cells = <0>;

		#interrupt-cells = <2>;

		interrupts = <0x10 0x4 0x11 0x4>; /* cascade */

		interrupt-parent = <&UIC0>;

	};



	SDR0: sdr {

		compatible = "ibm,sdr-apm821xx";

		dcr-reg = <0x00e 0x002>;

	};



	CPR0: cpr {

		compatible = "ibm,cpr-apm821xx";

		dcr-reg = <0x00c 0x002>;

	};



	plb {

		compatible = "ibm,plb4";

		#address-cells = <2>;

		#size-cells = <1>;

		ranges;

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



		SDRAM0: sdram {

			compatible = "ibm,sdram-apm821xx";

			dcr-reg = <0x010 0x002>;

		};



		MAL0: mcmal {

			compatible = "ibm,mcmal2";

			descriptor-memory = "ocm";

			dcr-reg = <0x180 0x062>;

			num-tx-chans = <1>;

			num-rx-chans = <1>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-parent = <&UIC2>;

			interrupts = <	/*TXEOB*/ 0x6 0x4

					/*RXEOB*/ 0x7 0x4

					/*SERR*/  0x3 0x4

					/*TXDE*/  0x4 0x4

					/*RXDE*/  0x5 0x4

		};



		POB0: opb {

			compatible = "ibm,opb";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;

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



			EBC0: ebc {

				compatible = "ibm,ebc";

				dcr-reg = <0x012 0x002>;

				#address-cells = <2>;

				#size-cells = <1>;

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

				/* ranges property is supplied by U-Boot */

				ranges = < 0x00000003 0x00000000 0xe0000000 0x8000000>;

				interrupts = <0x6 0x4>;

				interrupt-parent = <&UIC1>;



				nor_flash@0,0 {

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

					bank-width = <2>;

					reg = <0x00000000 0x00000000 0x00400000>;

					#address-cells = <1>;

					#size-cells = <1>;

					partition@0 {

						label = "kernel";

						reg = <0x00000000 0x00180000>;

					};

					partition@180000 {

						label = "env";

						reg = <0x00180000 0x00020000>;

					};

					partition@1a0000 {

						label = "u-boot";

						reg = <0x001a0000 0x00060000>;

					};

				};

			}



			UART0: serial@ef600300 {

				device_type = "serial";

				compatible = "ns16550";

				reg = <0xef600300 0x00000008>;

				virtual-reg = <0xef600300>;

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

				current-speed = <0>; /* Filled in by U-Boot */

				interrupt-parent = <&UIC1>;

				interrupts = <0x1 0x4>;

			};



			IIC0: i2c@ef600700 {

				compatible = "ibm,iic";

				reg = <0xef600700 0x00000014>;

				interrupt-parent = <&UIC0>;

				interrupts = <0x2 0x4>;

			};



			IIC1: i2c@ef600800 {

				compatible = "ibm,iic";

				reg = <0xef600800 0x00000014>;

				interrupt-parent = <&UIC0>;

				interrupts = <0x3 0x4>;

			};



			RGMII0: emac-rgmii@ef601500 {

				compatible = "ibm,rgmii";

				reg = <0xef601500 0x00000008>;

				has-mdio;

			};



			TAH0: emac-tah@ef601350 {

				compatible = "ibm,tah";

				reg = <0xef601350 0x00000030>;

			};



			EMAC0: ethernet@ef600c00 {

				device_type = "network";

				compatible = "ibm,emac4sync";

				interrupt-parent = <&EMAC0>;

				interrupts = <0x0 0x1>;

				#interrupt-cells = <1>;

				#address-cells = <0>;

				#size-cells = <0>;

				interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4

						 /*Wake*/   0x1 &UIC2 0x14 0x4>;

				reg = <0xef600c00 0x000000c4>;

				local-mac-address = [000000000000]; /* Filled in by U-Boot */

				mal-device = <&MAL0>;

				mal-tx-channel = <0>;

				mal-rx-channel = <0>;

				cell-index = <0>;

				max-frame-size = <9000>;

				rx-fifo-size = <16384>;

				tx-fifo-size = <2048>;

				phy-mode = "rgmii";

				phy-map = <0x00000000>;

				rgmii-device = <&RGMII0>;

				rgmii-channel = <0>;

				tah-device = <&TAH0>;

				tah-channel = <0>;

				has-inverted-stacr-oc;

				has-new-stacr-staopc;

			};

		};



	};

};

arch/powerpc/configs/44x/bluestone_defconfig

0 → 100644
+68 −0
Original line number Diff line number Diff line 
CONFIG_44x=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_PCI_QUIRKS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_BLUESTONE=y

# CONFIG_EBONY is not set

# CONFIG_KVM_GUEST is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SPARSE_IRQ=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE=""

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_OF_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=35000

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_IBM_NEW_EMAC=y

CONFIG_IBM_NEW_EMAC_RXB=256

CONFIG_IBM_NEW_EMAC_TXB=256

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IBM_IIC=y

CONFIG_SENSORS_AD7414=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_M41T80=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NLS=y

arch/powerpc/configs/ppc44x_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BAMBOO=y

CONFIG_BLUESTONE=y

CONFIG_SAM440EP=y

CONFIG_SEQUOIA=y

CONFIG_TAISHAN=y
@@ -97,14 +98,17 @@ CONFIG_USB_STORAGE=m 
CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=m

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_INOTIFY=y

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_UBIFS_FS=m

CONFIG_UBIFS_FS_XATTR=y

CONFIG_LOGFS=m

CONFIG_CRAMFS=y

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZO=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y
@@ -116,11 +120,8 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_HUNG_TASK=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_PCBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_VIRTUALIZATION=y

arch/powerpc/kernel/cpu_setup_44x.S

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ _GLOBAL(__setup_cpu_440grx) 
_GLOBAL(__setup_cpu_460ex)

_GLOBAL(__setup_cpu_460gt)

_GLOBAL(__setup_cpu_460sx)

_GLOBAL(__setup_cpu_apm821xx)

	mflr	r4

	bl	__init_fpu_44x

	bl	__fixup_440A_mcheck

arch/powerpc/kernel/cputable.c

+15 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); 
extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460sx(unsigned long offset, struct cpu_spec *spec);

extern void __setup_cpu_apm821xx(unsigned long offset, struct cpu_spec *spec);

extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
@@ -1809,6 +1810,20 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_440A,

		.platform		= "ppc440",

	},

	{ /* 464 in APM821xx */

		.pvr_mask		= 0xffffff00,

		.pvr_value		= 0x12C41C80,

		.cpu_name		= "APM821XX",

		.cpu_features		= CPU_FTRS_44X,

		.cpu_user_features	= COMMON_USER_BOOKE |

			PPC_FEATURE_HAS_FPU,

		.mmu_features		= MMU_FTR_TYPE_44x,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.cpu_setup		= __setup_cpu_apm821xx,

		.machine_check		= machine_check_440A,

		.platform		= "ppc440",

	},

	{ /* 476 core */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x11a50000,