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

Commit 5393f780 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits)
  powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/
  powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots
  powerpc/e500mc: Doorbells need to be taken w/exceptions disabled
  powerpc: Enable PS3 options and QPACE in ppc64_defconfig
  powerpc/powermac: Fix occasional SMP boot failure
  powerpc/cacheinfo: Rename cache_dir per-cpu variable
  hvc_console: Use kzalloc() instead of kmalloc() + memset()
  hvc_console: Do not set low_latency when using interrupts
  hvc_console: Call free_irq() only if request_irq() was successful
  hvc_console: Change an mb() to smp_mb() and add some comments
  powerpc: Cleanup from l64 to ll64 change: drivers/net
  powerpc: Cleanup from l64 to ll64 change: drivers/char
  powerpc: Cleanup from l64 to ll64 change: arch code
  powerpc: Change u64/s64 to a long long integer type
  powerpc/kexec: Check crash_base for relocatable kernel
  powerpc: Make dummy section a valid note header
  Xilinx: SPI: updated driver for device tree
  drivers/of: Add the of_find_i2c_device_by_node function.
  powerpc/xsysace: add compatible string for non-ipcore instance
  powerpc/mpc52xx: remove dead code from GPIO driver
  ...
parents bca26856 ea0105ea

arch/powerpc/boot/dts/mpc8315erdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ 
			device_type = "serial";

			compatible = "ns16550";

			reg = <0x4500 0x100>;

			clock-frequency = <0>;

			clock-frequency = <133333333>;

			interrupts = <9 0x8>;

			interrupt-parent = <&ipic>;

		};
@@ -265,7 +265,7 @@ 
			device_type = "serial";

			compatible = "ns16550";

			reg = <0x4600 0x100>;

			clock-frequency = <0>;

			clock-frequency = <133333333>;

			interrupts = <10 0x8>;

			interrupt-parent = <&ipic>;

		};

arch/powerpc/boot/dts/mpc8544ds.dts

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ 
			  0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */
@@ -350,7 +350,7 @@ 
			  0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <25 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds.dts

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ 
			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */
@@ -761,7 +761,7 @@ 
			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <27 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ 
			  0x1000000 0x0 0x0 0xffc10000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <25 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */

arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
			  0x1000000 0x0 0x0 0xffc20000 0x0 0x10000>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupts = <27 2>;

		interrupts = <26 2>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			/* IDSEL 0x0 */