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

Commit 2fc10246 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.15-rc3 into char-misc-next 



We want the fixes and changes in here for testing.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 05eec0c9 50c4c4e2

Documentation/core-api/genericirq.rst

+8 −8
Original line number Diff line number Diff line
@@ -225,9 +225,9 @@ interrupts. 


The following control flow is implemented (simplified excerpt)::



    :c:func:`desc->irq_data.chip->irq_mask_ack`;

    desc->irq_data.chip->irq_mask_ack();

    handle_irq_event(desc->action);

    :c:func:`desc->irq_data.chip->irq_unmask`;

    desc->irq_data.chip->irq_unmask();





Default Fast EOI IRQ flow handler
@@ -239,7 +239,7 @@ which only need an EOI at the end of the handler. 
The following control flow is implemented (simplified excerpt)::



    handle_irq_event(desc->action);

    :c:func:`desc->irq_data.chip->irq_eoi`;

    desc->irq_data.chip->irq_eoi();





Default Edge IRQ flow handler
@@ -251,15 +251,15 @@ interrupts. 
The following control flow is implemented (simplified excerpt)::



    if (desc->status & running) {

        :c:func:`desc->irq_data.chip->irq_mask_ack`;

        desc->irq_data.chip->irq_mask_ack();

        desc->status |= pending | masked;

        return;

    }

    :c:func:`desc->irq_data.chip->irq_ack`;

    desc->irq_data.chip->irq_ack();

    desc->status |= running;

    do {

        if (desc->status & masked)

            :c:func:`desc->irq_data.chip->irq_unmask`;

            desc->irq_data.chip->irq_unmask();

        desc->status &= ~pending;

        handle_irq_event(desc->action);

    } while (status & pending);
@@ -293,10 +293,10 @@ simplified version without locking. 
The following control flow is implemented (simplified excerpt)::



    if (desc->irq_data.chip->irq_ack)

        :c:func:`desc->irq_data.chip->irq_ack`;

        desc->irq_data.chip->irq_ack();

    handle_irq_event(desc->action);

    if (desc->irq_data.chip->irq_eoi)

            :c:func:`desc->irq_data.chip->irq_eoi`;

        desc->irq_data.chip->irq_eoi();





EOI Edge IRQ flow handler

Documentation/devicetree/bindings/arm/ccn.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 


Example:



	ccn@0x2000000000 {

	ccn@2000000000 {

		compatible = "arm,ccn-504";

		reg = <0x20 0x00000000 0 0x1000000>;

		interrupts = <0 181 4>;

Documentation/devicetree/bindings/arm/omap/crossbar.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use: 
	interrupts = <GIC_SPI request_number interrupt_level>



Example:

	device_x@0x4a023000 {

	device_x@4a023000 {

		/* Crossbar 8 used */

		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

		...

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	memory-controller@0x7000f000 {

	memory-controller@7000f000 {

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/clock/axi-clkgen.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Optional properties: 
- clock-output-names : From common clock binding.



Example:

	clock@0xff000000 {

	clock@ff000000 {

		compatible = "adi,axi-clkgen";

		#clock-cells = <0>;

		reg = <0xff000000 0x1000>;