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

Commit 4aa12f7b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'kumar/kumar-next' into next

parents b58602a4 068e8c9d

Documentation/powerpc/dts-bindings/fsl/board.txt

+31 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ This is the memory-mapped registers for on board FPGA. 


Required properities:

- compatible : should be "fsl,fpga-pixis".

- reg : should contain the address and the lenght of the FPPGA register

- reg : should contain the address and the length of the FPPGA register

  set.



Example (MPC8610HPCD):
@@ -27,3 +27,33 @@ Example (MPC8610HPCD): 
		compatible = "fsl,fpga-pixis";

		reg = <0xe8000000 32>;

	};



* Freescale BCSR GPIO banks



Some BCSR registers act as simple GPIO controllers, each such

register can be represented by the gpio-controller node.



Required properities:

- compatible : Should be "fsl,<board>-bcsr-gpio".

- reg : Should contain the address and the length of the GPIO bank

  register.

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional paramters (currently unused).

- gpio-controller : Marks the port as GPIO controller.



Example:



	bcsr@1,0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "fsl,mpc8360mds-bcsr";

		reg = <1 0 0x8000>;

		ranges = <0 1 0 0x8000>;



		bcsr13: gpio-controller@d {

			#gpio-cells = <2>;

			compatible = "fsl,mpc8360mds-bcsr-gpio";

			reg = <0xd 1>;

			gpio-controller;

		};

	};

arch/powerpc/boot/dts/mpc836x_mds.dts

+41 −2
Original line number Diff line number Diff line
@@ -69,8 +69,18 @@ 
		};



		bcsr@1,0 {

			#address-cells = <1>;

			#size-cells = <1>;

 			compatible = "fsl,mpc8360mds-bcsr";

			reg = <1 0 0x8000>;

			ranges = <0 1 0 0x8000>;



			bcsr13: gpio-controller@d {

				#gpio-cells = <2>;

				compatible = "fsl,mpc8360mds-bcsr-gpio";

				reg = <0xd 1>;

				gpio-controller;

			};

		};

	};
@@ -195,10 +205,21 @@ 
		};



		par_io@1400 {

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x1400 0x100>;

			ranges = <0 0x1400 0x100>;

			device_type = "par_io";

			num-ports = <7>;



			qe_pio_b: gpio-controller@18 {

				#gpio-cells = <2>;

				compatible = "fsl,mpc8360-qe-pario-bank",

					     "fsl,mpc8323-qe-pario-bank";

				reg = <0x18 0x18>;

				gpio-controller;

			};



			pio1: ucc_pin@01 {

				pio-map = <

			/* port  pin  dir  open_drain  assignment  has_irq */
@@ -282,6 +303,15 @@ 
			};

		};



		timer@440 {

			compatible = "fsl,mpc8360-qe-gtm",

				     "fsl,qe-gtm", "fsl,gtm";

			reg = <0x440 0x40>;

			clock-frequency = <132000000>;

			interrupts = <12 13 14 15>;

			interrupt-parent = <&qeic>;

		};



		spi@4c0 {

			cell-index = <0>;

			compatible = "fsl,spi";
@@ -301,11 +331,20 @@ 
		};



		usb@6c0 {

			compatible = "qe_udc";

			compatible = "fsl,mpc8360-qe-usb",

				     "fsl,mpc8323-qe-usb";

			reg = <0x6c0 0x40 0x8b00 0x100>;

			interrupts = <11>;

			interrupt-parent = <&qeic>;

			mode = "slave";

			fsl,fullspeed-clock = "clk21";

			fsl,lowspeed-clock = "brg9";

			gpios = <&qe_pio_b  2 0   /* USBOE */

				 &qe_pio_b  3 0   /* USBTP */

				 &qe_pio_b  8 0   /* USBTN */

				 &qe_pio_b  9 0   /* USBRP */

				 &qe_pio_b 11 0   /* USBRN */

				 &bcsr13    5 0   /* SPEED */

				 &bcsr13    4 1>; /* POWER */

		};



		enet0: ucc@2000 {

arch/powerpc/boot/dts/mpc836x_rdk.dts

+17 −2
Original line number Diff line number Diff line
@@ -218,8 +218,23 @@ 
				reg = <0x440 0x40>;

				interrupts = <12 13 14 15>;

				interrupt-parent = <&qeic>;

				/* filled by u-boot */

				clock-frequency = <0>;

				clock-frequency = <166666666>;

			};



			usb@6c0 {

				compatible = "fsl,mpc8360-qe-usb",

					     "fsl,mpc8323-qe-usb";

				reg = <0x6c0 0x40 0x8b00 0x100>;

				interrupts = <11>;

				interrupt-parent = <&qeic>;

				fsl,fullspeed-clock = "clk21";

				gpios = <&qe_pio_b  2 0 /* USBOE */

					 &qe_pio_b  3 0 /* USBTP */

					 &qe_pio_b  8 0 /* USBTN */

					 &qe_pio_b  9 0 /* USBRP */

					 &qe_pio_b 11 0 /* USBRN */

					 &qe_pio_e 20 0 /* SPEED */

					 &qe_pio_e 21 1 /* POWER */>;

			};



			spi@4c0 {

arch/powerpc/boot/dts/mpc8641_hpcn.dts

+32 −24
Original line number Diff line number Diff line
@@ -26,7 +26,13 @@ 
		serial1 = &serial1;

		pci0 = &pci0;

		pci1 = &pci1;

		rapidio0 = &rapidio0;

/*

 * Only one of Rapid IO or PCI can be present due to HW limitations and

 * due to the fact that the 2 now share address space in the new memory

 * map.  The most likely case is that we have PCI, so comment out the

 * rapidio node.  Leave it here for reference.

 */

		/* rapidio0 = &rapidio0; */

	};



	cpus {
@@ -62,18 +68,17 @@ 
		reg = <0x00000000 0x40000000>;	// 1G at 0x0

	};



	localbus@f8005000 {

	localbus@ffe05000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8641-localbus", "simple-bus";

		reg = <0xf8005000 0x1000>;

		reg = <0xffe05000 0x1000>;

		interrupts = <19 2>;

		interrupt-parent = <&mpic>;



		ranges = <0 0 0xff800000 0x00800000

			  1 0 0xfe000000 0x01000000

			  2 0 0xf8200000 0x00100000

			  3 0 0xf8100000 0x00100000>;

		ranges = <0 0 0xef800000 0x00800000

			  2 0 0xffdf8000 0x00008000

			  3 0 0xffdf0000 0x00008000>;



		flash@0,0 {

			compatible = "cfi-flash";
@@ -103,13 +108,13 @@ 
		};

	};



	soc8641@f8000000 {

	soc8641@ffe00000 {

		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "soc";

		compatible = "simple-bus";

		ranges = <0x00000000 0xf8000000 0x00100000>;

		reg = <0xf8000000 0x00001000>;	// CCSRBAR

		ranges = <0x00000000 0xffe00000 0x00100000>;

		reg = <0xffe00000 0x00001000>;	// CCSRBAR

		bus-frequency = <0>;



		i2c@3000 {
@@ -340,17 +345,17 @@ 
		};

	};



	pci0: pcie@f8008000 {

	pci0: pcie@ffe08000 {

		cell-index = <0>;

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0xf8008000 0x1000>;

		reg = <0xffe08000 0x1000>;

		bus-range = <0x0 0xff>;

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

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

			  0x01000000 0x0 0x00000000 0xffc00000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <24 2>;
@@ -481,7 +486,7 @@ 


				  0x01000000 0x0 0x00000000

				  0x01000000 0x0 0x00000000

				  0x0 0x00100000>;

				  0x0 0x00010000>;

			uli1575@0 {

				reg = <0 0 0 0 0>;

				#size-cells = <2>;
@@ -491,7 +496,7 @@ 
					  0x0 0x20000000

					  0x01000000 0x0 0x00000000

					  0x01000000 0x0 0x00000000

					  0x0 0x00100000>;

					  0x0 0x00010000>;

				isa@1e {

					device_type = "isa";

					#interrupt-cells = <2>;
@@ -549,17 +554,17 @@ 


	};



	pci1: pcie@f8009000 {

	pci1: pcie@ffe09000 {

		cell-index = <1>;

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0xf8009000 0x1000>;

		reg = <0xffe09000 0x1000>;

		bus-range = <0 0xff>;

		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;

			  0x01000000 0x0 0x00000000 0xffc10000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <25 2>;
@@ -582,18 +587,21 @@ 


				  0x01000000 0x0 0x00000000

				  0x01000000 0x0 0x00000000

				  0x0 0x00100000>;

				  0x0 0x00010000>;

		};

	};

	rapidio0: rapidio@f80c0000 {

/*

	rapidio0: rapidio@ffec0000 {

		#address-cells = <2>;

		#size-cells = <2>;

		compatible = "fsl,rapidio-delta";

		reg = <0xf80c0000 0x20000>;

		ranges = <0 0 0xc0000000 0 0x20000000>;

		reg = <0xffec0000 0x20000>;

		ranges = <0 0 0x80000000 0 0x20000000>;

		interrupt-parent = <&mpic>;

		/* err_irq bell_outb_irq bell_inb_irq

			msg1_tx_irq msg1_rx_irq	msg2_tx_irq msg2_rx_irq */

		// err_irq bell_outb_irq bell_inb_irq

		//	msg1_tx_irq msg1_rx_irq	msg2_tx_irq msg2_rx_irq

		interrupts = <48 2 49 2 50 2 53 2 54 2 55 2 56 2>;

	};

*/



};

arch/powerpc/configs/85xx/mpc8572_ds_defconfig

+28 −15
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc3

# Sat Nov  8 12:40:13 2008

# Linux kernel version: 2.6.28-rc8

# Tue Dec 30 11:17:46 2008

#

# CONFIG_PPC64 is not set
@@ -21,7 +21,10 @@ CONFIG_FSL_BOOKE=y 
CONFIG_FSL_EMB_PERFMON=y

# CONFIG_PHYS_64BIT is not set

CONFIG_SPE=y

CONFIG_PPC_MMU_NOHASH=y

# CONFIG_PPC_MM_SLICES is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_PPC32=y

CONFIG_WORD_SIZE=32

# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -50,7 +53,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
CONFIG_PPC_OF=y

CONFIG_OF=y

CONFIG_PPC_UDBG_16550=y

# CONFIG_GENERIC_TBSYNC is not set

CONFIG_GENERIC_TBSYNC=y

CONFIG_AUDIT_ARCH=y

CONFIG_GENERIC_BUG=y

CONFIG_DEFAULT_UIMAGE=y
@@ -62,7 +65,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 
# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y
@@ -126,6 +129,7 @@ CONFIG_HAVE_IOREMAP_PROT=y 
CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -138,6 +142,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

CONFIG_LBD=y

# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -197,6 +202,7 @@ CONFIG_PPC_I8259=y 
# CONFIG_CPM2 is not set

CONFIG_FSL_ULI1575=y

# CONFIG_MPC8xxx_GPIO is not set

# CONFIG_SIMPLE_GPIO is not set



#

# Kernel options
@@ -224,6 +230,7 @@ CONFIG_MATH_EMULATION=y 
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_HAS_WALK_MEMORY=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

# CONFIG_IRQ_ALL_CPUS is not set

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -241,6 +248,9 @@ CONFIG_ZONE_DMA_FLAG=1 
CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set
@@ -443,8 +453,10 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_C2PORT is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -784,6 +796,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_HVC_UDBG is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

CONFIG_NVRAM=y
@@ -869,11 +882,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 
# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#
@@ -886,14 +899,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set



#

# Voltage and Current regulators

#

# CONFIG_REGULATOR is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set



#

# Multimedia devices
@@ -1252,11 +1258,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

#



#

# may also be needed; see USB_STORAGE Help for more information

# see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1348,6 +1354,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set



#

# SPI RTC drivers
@@ -1624,6 +1631,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_PRINT_STACK_DEPTH=64

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1649,11 +1657,16 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set