Commit 9bb7361d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'jwb/next' into next

parents c6a389f1 9fcd768d

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE 


config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on (PPC_BOOK3S || FSL_BOOKE) && EXPERIMENTAL

	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !47x)) && EXPERIMENTAL

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

arch/powerpc/boot/dts/hcu4.dts

deleted100644 → 0
+0 −168
Original line number Diff line number Diff line 
/*

* Device Tree Source for Netstal Maschinen HCU4

* based on the IBM Walnut

*

* Copyright 2008

* Niklaus Giger <niklaus.giger@member.fsf.org>

*

* Copyright 2007 IBM Corp.

* Josh Boyer <jwboyer@linux.vnet.ibm.com>

*

* This file is licensed under the terms of the GNU General Public

* License version 2.  This program is licensed "as is" without

* any warranty of any kind, whether express or implied.

*/



/dts-v1/;



/ {

	#address-cells = <0x1>;

	#size-cells = <0x1>;

	model = "netstal,hcu4";

	compatible = "netstal,hcu4";

	dcr-parent = <0x1>;



	aliases {

		ethernet0 = "/plb/opb/ethernet@ef600800";

		serial0 = "/plb/opb/serial@ef600300";

	};



	cpus {

		#address-cells = <0x1>;

		#size-cells = <0x0>;



		cpu@0 {

			device_type = "cpu";

			model = "PowerPC,405GPr";

			reg = <0x0>;

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

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

			i-cache-line-size = <0x20>;

			d-cache-line-size = <0x20>;

			i-cache-size = <0x4000>;

			d-cache-size = <0x4000>;

			dcr-controller;

			dcr-access-method = "native";

			linux,phandle = <0x1>;

		};

	};



	memory {

		device_type = "memory";

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

	};



	UIC0: interrupt-controller {

		compatible = "ibm,uic";

		interrupt-controller;

		cell-index = <0x0>;

		dcr-reg = <0xc0 0x9>;

		#address-cells = <0x0>;

		#size-cells = <0x0>;

		#interrupt-cells = <0x2>;

		linux,phandle = <0x2>;

	};



	plb {

		compatible = "ibm,plb3";

		#address-cells = <0x1>;

		#size-cells = <0x1>;

		ranges;

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



		SDRAM0: memory-controller {

			compatible = "ibm,sdram-405gp";

			dcr-reg = <0x10 0x2>;

		};



		MAL: mcmal {

			compatible = "ibm,mcmal-405gp", "ibm,mcmal";

			dcr-reg = <0x180 0x62>;

			num-tx-chans = <0x1>;

			num-rx-chans = <0x1>;

			interrupt-parent = <0x2>;

			interrupts = <0xb 0x4 0xc 0x4 0xa 0x4 0xd 0x4 0xe 0x4>;

			linux,phandle = <0x3>;

		};



		POB0: opb {

			compatible = "ibm,opb-405gp", "ibm,opb";

			#address-cells = <0x1>;

			#size-cells = <0x1>;

			ranges = <0xef600000 0xef600000 0xa00000>;

			dcr-reg = <0xa0 0x5>;

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



			UART0: serial@ef600300 {

				device_type = "serial";

				compatible = "ns16550";

				reg = <0xef600300 0x8>;

				virtual-reg = <0xef600300>;

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

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

				interrupt-parent = <0x2>;

				interrupts = <0x0 0x4>;

			};



			IIC: i2c@ef600500 {

				compatible = "ibm,iic-405gp", "ibm,iic";

				reg = <0xef600500 0x11>;

				interrupt-parent = <0x2>;

				interrupts = <0x2 0x4>;

			};



			GPIO: gpio@ef600700 {

				compatible = "ibm,gpio-405gp";

				reg = <0xef600700 0x20>;

			};



			EMAC: ethernet@ef600800 {

				device_type = "network";

				compatible = "ibm,emac-405gp", "ibm,emac";

				interrupt-parent = <0x2>;

				interrupts = <0xf 0x4 0x9 0x4>;

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

				reg = <0xef600800 0x70>;

				mal-device = <0x3>;

				mal-tx-channel = <0x0>;

				mal-rx-channel = <0x0>;

				cell-index = <0x0>;

				max-frame-size = <0x5dc>;

				rx-fifo-size = <0x1000>;

				tx-fifo-size = <0x800>;

				phy-mode = "rmii";

				phy-map = <0x1>;

			};

		};



		EBC0: ebc {

			compatible = "ibm,ebc-405gp", "ibm,ebc";

			dcr-reg = <0x12 0x2>;

			#address-cells = <0x2>;

			#size-cells = <0x1>;

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



			sram@0,0 {

				reg = <0x0 0x0 0x80000>;

			};



			flash@0,80000 {

				compatible = "jedec-flash";

				bank-width = <0x1>;

				reg = <0x0 0x80000 0x80000>;

				#address-cells = <0x1>;

				#size-cells = <0x1>;



				partition@0 {

					label = "OpenBIOS";

					reg = <0x0 0x80000>;

					read-only;

				};

			};

		};

	};



	chosen {

		linux,stdout-path = "/plb/opb/serial@ef600300";

	};

};

arch/powerpc/boot/dts/yosemite.dts

+36 −0
Original line number Diff line number Diff line
@@ -138,6 +138,42 @@ 
				clock-frequency = <0>; /* Filled in by zImage */

				interrupts = <0x5 0x1>;

				interrupt-parent = <&UIC1>;



				nor_flash@0,0 {

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

					bank-width = <2>;

					reg = <0x00000000 0x00000000 0x04000000>;

					#address-cells = <1>;

					#size-cells = <1>;

					partition@0 {

						label = "kernel";

						reg = <0x00000000 0x001e0000>;

					};

					partition@1e0000 {

						label = "dtb";

						reg = <0x001e0000 0x00020000>;

					};

					partition@200000 {

						label = "ramdisk";

						reg = <0x00200000 0x01400000>;

					};

					partition@1600000 {

						label = "jffs2";

						reg = <0x01600000 0x00400000>;

					};

					partition@1a00000 {

						label = "user";

						reg = <0x01a00000 0x02540000>;

					};

					partition@3f40000 {

						label = "env";

						reg = <0x03f40000 0x00040000>;

					};

					partition@3f80000 {

						label = "u-boot";

						reg = <0x03f80000 0x00080000>;

					};

				};

			};



			UART0: serial@ef600300 {

arch/powerpc/configs/40x/hcu4_defconfig

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
CONFIG_40x=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_HCU4=y

# CONFIG_WALNUT is not set

CONFIG_SPARSE_IRQ=y

CONFIG_PCI=y

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_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

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=m

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=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_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_INOTIFY=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_CRYPTO=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

arch/powerpc/configs/ppc40x_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_PPC4xx_GPIO=y

CONFIG_ACADIA=y

CONFIG_EP405=y

CONFIG_HCU4=y

CONFIG_HOTFOOT=y

CONFIG_KILAUEA=y

CONFIG_MAKALU=y