Commit cdd854bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)
  powerpc/8xx: Add support for the MPC8xx based boards from TQC
  powerpc/85xx: Introduce support for the Freescale P1022DS reference board
  powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board
  powerpc/85xx: Change deprecated binding for 85xx-based boards
  powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge
  powerpc/tqm85xx: update PCI interrupt-map attribute
  powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale
  powerpc/fsl_pci: add quirk for mpc8308 pcie bridge
  powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
  powerpc/85xx: Fix booting for P1021MDS boards
  powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards
  powerpc/85xx: kexec for SMP 85xx BookE systems
  powerpc/5200/i2c: improve i2c bus error recovery
  of/xilinxfb: update tft compatible versions
  powerpc/fsl-diu-fb: Support setting display mode using EDID
  powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
  powerpc/5121: shared DIU framebuffer support
  powerpc/5121: move fsl-diu-fb.h to include/linux
  powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor
  powerpc/512x: add clock structure for Video-IN (VIU) unit
  ...
parents bbc4fd12 42a0ae22

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

+18 −2
Original line number Diff line number Diff line
@@ -4,10 +4,17 @@ The Freescale DIU is a LCD controller, with proper hardware, it can also 
drive DVI monitors.



Required properties:

- compatible : should be "fsl-diu".

- compatible : should be "fsl,diu" or "fsl,mpc5121-diu".

- reg : should contain at least address and length of the DIU register

  set.

- Interrupts : one DIU interrupt should be describe here.

- interrupts : one DIU interrupt should be described here.

- interrupt-parent : the phandle for the interrupt controller that

  services interrupts for this device.



Optional properties:

- edid : verbatim EDID data block describing attached display.

  Data from the detailed timing descriptor will be used to

  program the display controller.



Example (MPC8610HPCD):

	display@2c000 {
@@ -16,3 +23,12 @@ Example (MPC8610HPCD): 
		interrupts = <72 2>;

		interrupt-parent = <&mpic>;

	};



Example for MPC5121:

	display@2100 {

		compatible = "fsl,mpc5121-diu";

		reg = <0x2100 0x100>;

		interrupts = <64 0x8>;

		interrupt-parent = <&ipic>;

		edid = [edid-data];

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Recommended properties : 
 - fsl,preserve-clocking : boolean; if defined, the clock settings

   from the bootloader are preserved (not touched).

 - clock-frequency : desired I2C bus clock frequency in Hz.

 - fsl,timeout : I2C bus timeout in microseconds.



Examples :
@@ -59,4 +60,5 @@ Examples : 
		interrupts = <43 2>;

		interrupt-parent = <&mpic>;

		clock-frequency = <400000>;

		fsl,timeout = <10000>;

	};

arch/powerpc/Kconfig

+8 −7
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config PPC 
	select GENERIC_ATOMIC64 if PPC32

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64



config EARLY_PRINTK

	bool
@@ -218,7 +219,7 @@ config ARCH_HIBERNATION_POSSIBLE 
config ARCH_SUSPEND_POSSIBLE

	def_bool y

	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \

		   PPC_85xx || PPC_86xx

		   PPC_85xx || PPC_86xx || PPC_PSERIES



config PPC_DCR_NATIVE

	bool
@@ -351,7 +352,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE 


config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on (PPC_BOOK3S || (FSL_BOOKE && !SMP)) && EXPERIMENTAL

	depends on (PPC_BOOK3S || FSL_BOOKE) && 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
@@ -368,8 +369,8 @@ config KEXEC 


config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx

	select RELOCATABLE if PPC64

	depends on PPC64 || 6xx || FSL_BOOKE

	select RELOCATABLE if PPC64 || FSL_BOOKE

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The same kernel binary can be used as production kernel and dump
@@ -668,7 +669,7 @@ config NEED_SG_DMA_LENGTH 


config GENERIC_ISA_DMA

	bool

	depends on PPC64 || POWER4 || 6xx && !CPM2

	depends on ISA_DMA_API

	default y



config PPC_INDIRECT_PCI
@@ -897,7 +898,7 @@ config KERNEL_START_BOOL 
config KERNEL_START

	hex "Virtual address of kernel base" if KERNEL_START_BOOL

	default PAGE_OFFSET if PAGE_OFFSET_BOOL

	default "0xc2000000" if CRASH_DUMP

	default "0xc2000000" if CRASH_DUMP && !RELOCATABLE

	default "0xc0000000"



config PHYSICAL_START_BOOL
@@ -910,7 +911,7 @@ config PHYSICAL_START_BOOL 


config PHYSICAL_START

	hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL

	default "0x02000000" if PPC_STD_MMU && CRASH_DUMP

	default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !RELOCATABLE

	default "0x00000000"



config PHYSICAL_ALIGN

arch/powerpc/boot/dts/canyonlands.dts

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ 
				clock-frequency = <0>; /* Filled in by U-Boot */

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

				interrupt-parent = <&UIC1>;

				interrupts = <0x1d 0x4>;

				interrupts = <28 0x4>;

			};



			UART3: serial@ef600600 {
@@ -281,7 +281,7 @@ 
				clock-frequency = <0>; /* Filled in by U-Boot */

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

				interrupt-parent = <&UIC1>;

				interrupts = <0x1e 0x4>;

				interrupts = <29 0x4>;

			};



			IIC0: i2c@ef600700 {

arch/powerpc/boot/dts/glacier.dts

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ 
				clock-frequency = <0>; /* Filled in by U-Boot */

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

				interrupt-parent = <&UIC1>;

				interrupts = <0x1d 0x4>;

				interrupts = <28 0x4>;

			};



			UART3: serial@ef600600 {
@@ -270,7 +270,7 @@ 
				clock-frequency = <0>; /* Filled in by U-Boot */

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

				interrupt-parent = <&UIC1>;

				interrupts = <0x1e 0x4>;

				interrupts = <29 0x4>;

			};



			IIC0: i2c@ef600700 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE