Skip to content

Commit 51e18a4

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 5e54b3c + f335195 commit 51e18a4

File tree

753 files changed

+7219
-4574
lines changed

Some content is hidden

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

753 files changed

+7219
-4574
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>;

‎Documentation/devicetree/bindings/clock/exynos5440-clock.txt

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

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

24-
clock: clock-controller@0x10010000 {
24+
clock: clock-controller@10010000 {
2525
compatible = "samsung,exynos5440-clock";
2626
reg = <0x160000 0x10000>;
2727
#clock-cells = <1>;

‎Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt

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

1515
Example:
1616

17-
pllctrl: pll-controller@0x02310000 {
17+
pllctrl: pll-controller@02310000 {
1818
compatible = "ti,keystone-pllctrl", "syscon";
1919
reg = <0x02310000 0x200>;
2020
};

‎Documentation/devicetree/bindings/clock/zx296702-clk.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ ID in its "clocks" phandle cell. See include/dt-bindings/clock/zx296702-clock.h
2020
for the full list of zx296702 clock IDs.
2121

2222

23-
topclk: topcrm@0x09800000 {
23+
topclk: topcrm@09800000 {
2424
compatible = "zte,zx296702-topcrm-clk";
2525
reg = <0x09800000 0x1000>;
2626
#clock-cells = <1>;
2727
};
2828

29-
uart0: serial@0x09405000 {
29+
uart0: serial@09405000 {
3030
compatible = "zte,zx296702-uart";
3131
reg = <0x09405000 0x1000>;
3232
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

‎Documentation/devicetree/bindings/crypto/fsl-sec4.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ System ON/OFF key driver
456456
Definition: this is phandle to the register map node.
457457

458458
EXAMPLE:
459-
snvs-pwrkey@0x020cc000 {
459+
snvs-pwrkey@020cc000 {
460460
compatible = "fsl,sec-v4.0-pwrkey";
461461
regmap = <&snvs>;
462462
interrupts = <0 4 0x4>
@@ -545,7 +545,7 @@ FULL EXAMPLE
545545
interrupts = <93 2>;
546546
};
547547

548-
snvs-pwrkey@0x020cc000 {
548+
snvs-pwrkey@020cc000 {
549549
compatible = "fsl,sec-v4.0-pwrkey";
550550
regmap = <&sec_mon>;
551551
interrupts = <0 4 0x4>;

‎Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Required properties:
99
- clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";
1010

1111
Example:
12-
dfi: dfi@0xff630000 {
12+
dfi: dfi@ff630000 {
1313
compatible = "rockchip,rk3399-dfi";
1414
reg = <0x00 0xff630000 0x00 0x4000>;
1515
rockchip,pmu = <&pmugrf>;

‎Documentation/devicetree/bindings/display/atmel,lcdc.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Optional properties:
2727

2828
Example:
2929

30-
fb0: fb@0x00500000 {
30+
fb0: fb@00500000 {
3131
compatible = "atmel,at91sam9g45-lcdc";
3232
reg = <0x00500000 0x1000>;
3333
interrupts = <23 3 0>;
@@ -41,7 +41,7 @@ Example:
4141

4242
Example for fixed framebuffer memory:
4343

44-
fb0: fb@0x00500000 {
44+
fb0: fb@00500000 {
4545
compatible = "atmel,at91sam9263-lcdc";
4646
reg = <0x00700000 0x1000 0x70000000 0x200000>;
4747
[...]

‎Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Hypervisor OS configuration:
7373
max-read-transactions = <31>;
7474
channel-reset-timeout-cycles = <0x500>;
7575

76-
hidma_24: dma-controller@0x5c050000 {
76+
hidma_24: dma-controller@5c050000 {
7777
compatible = "qcom,hidma-1.0";
7878
reg = <0 0x5c050000 0x0 0x1000>,
7979
<0 0x5c0b0000 0x0 0x1000>;
@@ -85,7 +85,7 @@ Hypervisor OS configuration:
8585

8686
Guest OS configuration:
8787

88-
hidma_24: dma-controller@0x5c050000 {
88+
hidma_24: dma-controller@5c050000 {
8989
compatible = "qcom,hidma-1.0";
9090
reg = <0 0x5c050000 0x0 0x1000>,
9191
<0 0x5c0b0000 0x0 0x1000>;

‎Documentation/devicetree/bindings/dma/zxdma.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Required properties:
1313
Example:
1414

1515
Controller:
16-
dma: dma-controller@0x09c00000{
16+
dma: dma-controller@09c00000{
1717
compatible = "zte,zx296702-dma";
1818
reg = <0x09c00000 0x1000>;
1919
clocks = <&topclk ZX296702_DMA_ACLK>;

‎Documentation/devicetree/bindings/eeprom/at25.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
EEPROMs (SPI) compatible with Atmel at25.
22

33
Required properties:
4-
- compatible : "atmel,at25".
4+
- compatible : Should be "<vendor>,<type>", and generic value "atmel,at25".
5+
Example "<vendor>,<type>" values:
6+
"microchip,25lc040"
7+
"st,m95m02"
8+
"st,m95256"
9+
510
- reg : chip select number
611
- spi-max-frequency : max spi frequency to use
712
- pagesize : size of the eeprom page
@@ -13,7 +18,7 @@ Optional properties:
1318
- spi-cpol : SPI inverse clock polarity, as per spi-bus bindings.
1419
- read-only : this parameter-less property disables writes to the eeprom
1520

16-
Obsolete legacy properties are can be used in place of "size", "pagesize",
21+
Obsolete legacy properties can be used in place of "size", "pagesize",
1722
"address-width", and "read-only":
1823
- at25,byte-len : total eeprom size in bytes
1924
- at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h
@@ -22,8 +27,8 @@ Obsolete legacy properties are can be used in place of "size", "pagesize",
2227
Additional compatible properties are also allowed.
2328

2429
Example:
25-
at25@0 {
26-
compatible = "atmel,at25", "st,m95256";
30+
eeprom@0 {
31+
compatible = "st,m95256", "atmel,at25";
2732
reg = <0>
2833
spi-max-frequency = <5000000>;
2934
spi-cpha;

‎Documentation/devicetree/bindings/gpio/gpio-altera.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Optional properties:
3030

3131
Example:
3232

33-
gpio_altr: gpio@0xff200000 {
33+
gpio_altr: gpio@ff200000 {
3434
compatible = "altr,pio-1.0";
3535
reg = <0xff200000 0x10>;
3636
interrupts = <0 45 4>;

‎Documentation/devicetree/bindings/gpio/gpio-pca953x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Required properties:
2727
ti,tca6424
2828
ti,tca9539
2929
ti,tca9554
30-
onsemi,pca9654
30+
onnn,pca9654
3131
exar,xra1202
3232

3333
Optional properties:

‎Documentation/devicetree/bindings/i2c/i2c-jz4780.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Optional properties:
1818
Example
1919

2020
/ {
21-
i2c4: i2c4@0x10054000 {
21+
i2c4: i2c4@10054000 {
2222
compatible = "ingenic,jz4780-i2c";
2323
reg = <0x10054000 0x1000>;
2424

‎Documentation/devicetree/bindings/iio/pressure/hp03.txt

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

1111
Example:
1212

13-
hp03@0x77 {
13+
hp03@77 {
1414
compatible = "hoperf,hp03";
1515
reg = <0x77>;
1616
xclr-gpio = <&portc 0 0x0>;

‎Documentation/devicetree/bindings/input/touchscreen/bu21013.txt

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

1717
i2c@80110000 {
18-
bu21013_tp@0x5c {
18+
bu21013_tp@5c {
1919
compatible = "rohm,bu21013_tp";
2020
reg = <0x5c>;
2121
touch-gpio = <&gpio2 20 0x4>;

‎Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ Example:
155155
<0x0 0xe112f000 0 0x02000>,
156156
<0x0 0xe1140000 0 0x10000>,
157157
<0x0 0xe1160000 0 0x10000>;
158-
v2m0: v2m@0x8000 {
158+
v2m0: v2m@8000 {
159159
compatible = "arm,gic-v2m-frame";
160160
msi-controller;
161161
reg = <0x0 0x80000 0 0x1000>;
162162
};
163163

164164
....
165165

166-
v2mN: v2m@0x9000 {
166+
v2mN: v2m@9000 {
167167
compatible = "arm,gic-v2m-frame";
168168
msi-controller;
169169
reg = <0x0 0x90000 0 0x1000>;

‎Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Example 2:
7171
* An interrupt generating device that is wired to a Meta external
7272
* trigger block.
7373
*/
74-
uart1: uart@0x02004c00 {
74+
uart1: uart@02004c00 {
7575
// Interrupt source '5' that is level-sensitive.
7676
// Note that there are only two cells as specified in the
7777
// interrupt parent's '#interrupt-cells' property.

‎Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Example 1:
5151
/*
5252
* TZ1090 PDC block
5353
*/
54-
pdc: pdc@0x02006000 {
54+
pdc: pdc@02006000 {
5555
// This is an interrupt controller node.
5656
interrupt-controller;
5757

‎Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Example:
3939

4040
The following is an example from the SPEAr320 SoC dtsi file.
4141

42-
shirq: interrupt-controller@0xb3000000 {
42+
shirq: interrupt-controller@b3000000 {
4343
compatible = "st,spear320-shirq";
4444
reg = <0xb3000000 0x1000>;
4545
interrupts = <28 29 30 1>;

‎Documentation/devicetree/bindings/mailbox/altera-mailbox.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ Optional properties:
1414
depends on the interrupt controller parent.
1515

1616
Example:
17-
mbox_tx: mailbox@0x100 {
17+
mbox_tx: mailbox@100 {
1818
compatible = "altr,mailbox-1.0";
1919
reg = <0x100 0x8>;
2020
interrupt-parent = < &gic_0 >;
2121
interrupts = <5>;
2222
#mbox-cells = <1>;
2323
};
2424

25-
mbox_rx: mailbox@0x200 {
25+
mbox_rx: mailbox@200 {
2626
compatible = "altr,mailbox-1.0";
2727
reg = <0x200 0x8>;
2828
interrupt-parent = < &gic_0 >;
@@ -40,7 +40,7 @@ support only one channel).The equivalent "mbox-names" property value can be
4040
used to give a name to the communication channel to be used by the client user.
4141

4242
Example:
43-
mclient0: mclient0@0x400 {
43+
mclient0: mclient0@400 {
4444
compatible = "client-1.0";
4545
reg = <0x400 0x10>;
4646
mbox-names = "mbox-tx", "mbox-rx";

‎Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Optional properties:
1515
- brcm,use-bcm-hdr: present if a BCM header precedes each frame.
1616

1717
Example:
18-
pdc0: iproc-pdc0@0x612c0000 {
18+
pdc0: iproc-pdc0@612c0000 {
1919
compatible = "brcm,iproc-pdc-mbox";
2020
reg = <0 0x612c0000 0 0x445>; /* PDC FS0 regs */
2121
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)