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

Commit 8bfc245f authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'mips-next-3.9' of... 

Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
parents 612663a9 535237ce

Documentation/devicetree/bindings/mips/cpu_irq.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
MIPS CPU interrupt controller



On MIPS the mips_cpu_intc_init() helper can be used to initialize the 8 CPU

IRQs from a devicetree file and create a irq_domain for IRQ controller.



With the irq_domain in place we can describe how the 8 IRQs are wired to the

platforms internal interrupt controller cascade.



Below is an example of a platform describing the cascade inside the devicetree

and the code used to load it inside arch_init_irq().



Required properties:

- compatible : Should be "mti,cpu-interrupt-controller"



Example devicetree:

	cpu-irq: cpu-irq@0 {

		#address-cells = <0>;



		interrupt-controller;

		#interrupt-cells = <1>;



		compatible = "mti,cpu-interrupt-controller";

	};



	intc: intc@200 {

		compatible = "ralink,rt2880-intc";

		reg = <0x200 0x100>;



		interrupt-controller;

		#interrupt-cells = <1>;



		interrupt-parent = <&cpu-irq>;

		interrupts = <2>;

	};





Example platform irq.c:

static struct of_device_id __initdata of_irq_ids[] = {

	{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },

	{ .compatible = "ralink,rt2880-intc", .data = intc_of_init },

	{},

};



void __init arch_init_irq(void)

{

	of_irq_init(of_irq_ids);

}

Documentation/devicetree/bindings/serial/lantiq_asc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Lantiq SoC ASC serial controller



Required properties:

- compatible : Should be "lantiq,asc"

- reg : Address and length of the register set for the device

- interrupts: the 3 (tx rx err) interrupt numbers. The interrupt specifier

  depends on the interrupt-parent interrupt controller.



Example:



asc1: serial@E100C00 {

	compatible = "lantiq,asc";

	reg = <0xE100C00 0x400>;

	interrupt-parent = <&icu0>;

	interrupts = <112 113 114>;

};

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			real-time workloads.  It can also improve energy

			efficiency for asymmetric multiprocessors.



	rcu_nocbs_poll	[KNL,BOOT]

	rcu_nocb_poll	[KNL,BOOT]

			Rather than requiring that offloaded CPUs

			(specified by rcu_nocbs= above) explicitly

			awaken the corresponding "rcuoN" kthreads,

Documentation/x86/boot.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment 
Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

		protocol entry point.



Protocol 2.12:	(Kernel 3.9) Added the xloadflags field and extension fields

Protocol 2.12:	(Kernel 3.8) Added the xloadflags field and extension fields

	 	to struct boot_params for for loading bzImage and ramdisk

		above 4G in 64bit.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE 
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

W:	http://www.atmel.com/products/AVR32/

W:	http://avr32linux.org/

W:	http://mirror.egtvedt.no/avr32linux.org/

W:	http://avrfreaks.net/

S:	Maintained

F:	arch/avr32/