Skip to content

Commit 077e4b5

Browse files
committed
Merge tag 'v4.9.83' into linux-4.9-at91
This is the 4.9.83 stable release
2 parents 696b1a3 + 80c1c83 commit 077e4b5

109 files changed

Lines changed: 757 additions & 416 deletions

File tree

Some content is hidden

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

Documentation/devicetree/bindings/dma/snps-dma.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ Example:
6363
interrupts = <0 35 0x4>;
6464
status = "disabled";
6565
dmas = <&dmahost 12 0 1>,
66-
<&dmahost 13 0 1 0>;
66+
<&dmahost 13 1 0>;
6767
dma-names = "rx", "rx";
6868
};

Documentation/filesystems/ext4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ data_err=ignore(*) Just print an error message if an error occurs
233233
data_err=abort Abort the journal if an error occurs in a file
234234
data buffer in ordered mode.
235235

236-
grpid Give objects the same group ID as their creator.
236+
grpid New objects have the group ID of their parent.
237237
bsdgroups
238238

239239
nogrpid (*) New objects have the group ID of their creator.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 9
3-
SUBLEVEL = 82
3+
SUBLEVEL = 83
44
EXTRAVERSION =
55
NAME = Roaring Lionus
66

arch/arm/boot/dts/arm-realview-eb-mp.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@
150150
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
151151
};
152152

153-
&charlcd {
154-
interrupt-parent = <&intc>;
155-
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
156-
};
157-
158153
&serial0 {
159154
interrupt-parent = <&intc>;
160155
interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/exynos5410.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@
274274
&rtc {
275275
clocks = <&clock CLK_RTC>;
276276
clock-names = "rtc";
277-
interrupt-parent = <&pmu_system_controller>;
278277
status = "disabled";
279278
};
280279

arch/arm/boot/dts/lpc3250-ea3250.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
uda1380: uda1380@18 {
157157
compatible = "nxp,uda1380";
158158
reg = <0x18>;
159-
power-gpio = <&gpio 0x59 0>;
160-
reset-gpio = <&gpio 0x51 0>;
159+
power-gpio = <&gpio 3 10 0>;
160+
reset-gpio = <&gpio 3 2 0>;
161161
dac-clk = "wspll";
162162
};
163163

arch/arm/boot/dts/lpc3250-phy3250.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
uda1380: uda1380@18 {
8282
compatible = "nxp,uda1380";
8383
reg = <0x18>;
84-
power-gpio = <&gpio 0x59 0>;
85-
reset-gpio = <&gpio 0x51 0>;
84+
power-gpio = <&gpio 3 10 0>;
85+
reset-gpio = <&gpio 3 2 0>;
8686
dac-clk = "wspll";
8787
};
8888

arch/arm/boot/dts/mt2701.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,14 @@
197197
compatible = "mediatek,mt2701-hifsys", "syscon";
198198
reg = <0 0x1a000000 0 0x1000>;
199199
#clock-cells = <1>;
200+
#reset-cells = <1>;
200201
};
201202

202203
ethsys: syscon@1b000000 {
203204
compatible = "mediatek,mt2701-ethsys", "syscon";
204205
reg = <0 0x1b000000 0 0x1000>;
205206
#clock-cells = <1>;
207+
#reset-cells = <1>;
206208
};
207209

208210
bdpsys: syscon@1c000000 {

arch/arm/boot/dts/s5pv210.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@
463463
compatible = "samsung,exynos4210-ohci";
464464
reg = <0xec300000 0x100>;
465465
interrupts = <23>;
466+
interrupt-parent = <&vic1>;
466467
clocks = <&clocks CLK_USB_HOST>;
467468
clock-names = "usbhost";
468469
#address-cells = <1>;

arch/arm/boot/dts/spear1310-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
spi0: spi@e0100000 {
350350
status = "okay";
351351
num-cs = <3>;
352-
cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>;
352+
cs-gpios = <&gpio1 7 0>, <&spics 0 0>, <&spics 1 0>;
353353

354354
stmpe610@0 {
355355
compatible = "st,stmpe610";

0 commit comments

Comments
 (0)