Skip to content

Commit 2fc1024

Browse files
committed
Merge 4.15-rc3 into char-misc-next
We want the fixes and changes in here for testing. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 05eec0c + 50c4c4e commit 2fc1024

File tree

1,514 files changed

+13681
-8540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,514 files changed

+13681
-8540
lines changed

Documentation/core-api/genericirq.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ interrupts.
225225

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

228-
:c:func:`desc->irq_data.chip->irq_mask_ack`;
228+
desc->irq_data.chip->irq_mask_ack();
229229
handle_irq_event(desc->action);
230-
:c:func:`desc->irq_data.chip->irq_unmask`;
230+
desc->irq_data.chip->irq_unmask();
231231

232232

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

241241
handle_irq_event(desc->action);
242-
:c:func:`desc->irq_data.chip->irq_eoi`;
242+
desc->irq_data.chip->irq_eoi();
243243

244244

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

253253
if (desc->status & running) {
254-
:c:func:`desc->irq_data.chip->irq_mask_ack`;
254+
desc->irq_data.chip->irq_mask_ack();
255255
desc->status |= pending | masked;
256256
return;
257257
}
258-
:c:func:`desc->irq_data.chip->irq_ack`;
258+
desc->irq_data.chip->irq_ack();
259259
desc->status |= running;
260260
do {
261261
if (desc->status & masked)
262-
:c:func:`desc->irq_data.chip->irq_unmask`;
262+
desc->irq_data.chip->irq_unmask();
263263
desc->status &= ~pending;
264264
handle_irq_event(desc->action);
265265
} while (status & pending);
@@ -293,10 +293,10 @@ simplified version without locking.
293293
The following control flow is implemented (simplified excerpt)::
294294

295295
if (desc->irq_data.chip->irq_ack)
296-
:c:func:`desc->irq_data.chip->irq_ack`;
296+
desc->irq_data.chip->irq_ack();
297297
handle_irq_event(desc->action);
298298
if (desc->irq_data.chip->irq_eoi)
299-
:c:func:`desc->irq_data.chip->irq_eoi`;
299+
desc->irq_data.chip->irq_eoi();
300300

301301

302302
EOI Edge IRQ flow handler

Documentation/devicetree/bindings/arm/ccn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Required properties:
1515

1616
Example:
1717

18-
ccn@0x2000000000 {
18+
ccn@2000000000 {
1919
compatible = "arm,ccn-504";
2020
reg = <0x20 0x00000000 0 0x1000000>;
2121
interrupts = <0 181 4>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use:
4949
interrupts = <GIC_SPI request_number interrupt_level>
5050

5151
Example:
52-
device_x@0x4a023000 {
52+
device_x@4a023000 {
5353
/* Crossbar 8 used */
5454
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
5555
...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Required properties:
88
- interrupts : Should contain MC General interrupt.
99

1010
Example:
11-
memory-controller@0x7000f000 {
11+
memory-controller@7000f000 {
1212
compatible = "nvidia,tegra20-mc";
1313
reg = <0x7000f000 0x024
1414
0x7000f03c 0x3c4>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Optional properties:
1717
- clock-output-names : From common clock binding.
1818

1919
Example:
20-
clock@0xff000000 {
20+
clock@ff000000 {
2121
compatible = "adi,axi-clkgen";
2222
#clock-cells = <0>;
2323
reg = <0xff000000 0x1000>;

Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Example:
2323
clocks = <&clk_osc>;
2424
};
2525

26-
aux: aux@0x7e215004 {
26+
aux: aux@7e215004 {
2727
compatible = "brcm,bcm2835-aux";
2828
#clock-cells = <1>;
2929
reg = <0x7e215000 0x8>;

Documentation/devicetree/bindings/clock/exynos4-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tree sources.
2424

2525
Example 1: An example of a clock controller node is listed below.
2626

27-
clock: clock-controller@0x10030000 {
27+
clock: clock-controller@10030000 {
2828
compatible = "samsung,exynos4210-clock";
2929
reg = <0x10030000 0x20000>;
3030
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5250-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tree sources.
2222

2323
Example 1: An example of a clock controller node is listed below.
2424

25-
clock: clock-controller@0x10010000 {
25+
clock: clock-controller@10010000 {
2626
compatible = "samsung,exynos5250-clock";
2727
reg = <0x10010000 0x30000>;
2828
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5410-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Example 1: An example of a clock controller node is listed below.
3030
#clock-cells = <0>;
3131
};
3232

33-
clock: clock-controller@0x10010000 {
33+
clock: clock-controller@10010000 {
3434
compatible = "samsung,exynos5410-clock";
3535
reg = <0x10010000 0x30000>;
3636
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5420-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tree sources.
2323

2424
Example 1: An example of a clock controller node is listed below.
2525

26-
clock: clock-controller@0x10010000 {
26+
clock: clock-controller@10010000 {
2727
compatible = "samsung,exynos5420-clock";
2828
reg = <0x10010000 0x30000>;
2929
#clock-cells = <1>;

0 commit comments

Comments
 (0)