Skip to content

Commit 60b7379

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2 parents a523a5e + 7a5a4f9 commit 60b7379

File tree

193 files changed

+1306
-840
lines changed

Some content is hidden

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

193 files changed

+1306
-840
lines changed

‎Documentation/filesystems/overlayfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ is formed.
6464
At mount time, the two directories given as mount options "lowerdir" and
6565
"upperdir" are combined into a merged directory:
6666

67-
mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\
67+
mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\
6868
workdir=/work /merged
6969

7070
The "workdir" needs to be an empty directory on the same filesystem

‎Documentation/networking/timestamping.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID:
136136

137137
This option is implemented only for transmit timestamps. There, the
138138
timestamp is always looped along with a struct sock_extended_err.
139-
The option modifies field ee_info to pass an id that is unique
139+
The option modifies field ee_data to pass an id that is unique
140140
among all possibly concurrently outstanding timestamp requests for
141141
that socket. In practice, it is a monotonically increasing u32
142142
(that wraps).

‎MAINTAINERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6908,11 +6908,12 @@ F: drivers/scsi/osd/
69086908
F: include/scsi/osd_*
69096909
F: fs/exofs/
69106910

6911-
OVERLAYFS FILESYSTEM
6911+
OVERLAY FILESYSTEM
69126912
M: Miklos Szeredi <[email protected]>
6913-
L: [email protected]
6913+
L: [email protected]
6914+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
69146915
S: Supported
6915-
F: fs/overlayfs/*
6916+
F: fs/overlayfs/
69166917
F: Documentation/filesystems/overlayfs.txt
69176918

69186919
P54 WIRELESS DRIVER

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 18
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Diseased Newt
66

77
# *DOCUMENTATION*

‎arch/arm/boot/dts/exynos5250-snow.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,4 +624,8 @@
624624
num-cs = <1>;
625625
};
626626

627+
&usbdrd_dwc3 {
628+
dr_mode = "host";
629+
};
630+
627631
#include "cros-ec-keyboard.dtsi"

‎arch/arm/boot/dts/exynos5250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
#size-cells = <1>;
556556
ranges;
557557

558-
dwc3 {
558+
usbdrd_dwc3: dwc3 {
559559
compatible = "synopsys,dwc3";
560560
reg = <0x12000000 0x10000>;
561561
interrupts = <0 72 0>;

‎arch/arm/boot/dts/r8a7740.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
clocks = <&cpg_clocks R8A7740_CLK_S>,
434434
<&cpg_clocks R8A7740_CLK_S>, <&sub_clk>,
435435
<&cpg_clocks R8A7740_CLK_B>,
436-
<&sub_clk>, <&sub_clk>,
436+
<&cpg_clocks R8A7740_CLK_HPP>, <&sub_clk>,
437437
<&cpg_clocks R8A7740_CLK_B>;
438438
#clock-cells = <1>;
439439
renesas,clock-indices = <

‎arch/arm/boot/dts/r8a7790.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,9 @@
666666
#clock-cells = <0>;
667667
clock-output-names = "sd2";
668668
};
669-
sd3_clk: sd3_clk@e615007c {
669+
sd3_clk: sd3_clk@e615026c {
670670
compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
671-
reg = <0 0xe615007c 0 4>;
671+
reg = <0 0xe615026c 0 4>;
672672
clocks = <&pll1_div2_clk>;
673673
#clock-cells = <0>;
674674
clock-output-names = "sd3";

‎arch/arm/boot/dts/sun6i-a31.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,10 @@
361361
clocks = <&ahb1_gates 6>;
362362
resets = <&ahb1_rst 6>;
363363
#dma-cells = <1>;
364+
365+
/* DMA controller requires AHB1 clocked from PLL6 */
366+
assigned-clocks = <&ahb1_mux>;
367+
assigned-clock-parents = <&pll6>;
364368
};
365369

366370
mmc0: mmc@01c0f000 {

‎arch/arm/boot/dts/tegra114-dalmore.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
aliases {
1616
rtc0 = "/i2c@7000d000/tps65913@58";
1717
rtc1 = "/rtc@7000e000";
18+
serial0 = &uartd;
1819
};
1920

2021
memory {

‎arch/arm/boot/dts/tegra114-roth.dts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
linux,initrd-end = <0x82800000>;
1616
};
1717

18+
aliases {
19+
serial0 = &uartd;
20+
};
21+
1822
firmware {
1923
trusted-foundations {
2024
compatible = "tlm,trusted-foundations";
@@ -916,8 +920,6 @@
916920
regulator-name = "vddio-sdmmc3";
917921
regulator-min-microvolt = <1800000>;
918922
regulator-max-microvolt = <3300000>;
919-
regulator-always-on;
920-
regulator-boot-on;
921923
};
922924

923925
ldousb {
@@ -962,7 +964,7 @@
962964
sdhci@78000400 {
963965
status = "okay";
964966
bus-width = <4>;
965-
vmmc-supply = <&vddio_sdmmc3>;
967+
vqmmc-supply = <&vddio_sdmmc3>;
966968
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
967969
power-gpios = <&gpio TEGRA_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
968970
};
@@ -971,7 +973,6 @@
971973
sdhci@78000600 {
972974
status = "okay";
973975
bus-width = <8>;
974-
vmmc-supply = <&vdd_1v8>;
975976
non-removable;
976977
};
977978

‎arch/arm/boot/dts/tegra114-tn7.dts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
linux,initrd-end = <0x82800000>;
1616
};
1717

18+
aliases {
19+
serial0 = &uartd;
20+
};
21+
1822
firmware {
1923
trusted-foundations {
2024
compatible = "tlm,trusted-foundations";
@@ -240,7 +244,6 @@
240244
sdhci@78000600 {
241245
status = "okay";
242246
bus-width = <8>;
243-
vmmc-supply = <&vdd_1v8>;
244247
non-removable;
245248
};
246249

‎arch/arm/boot/dts/tegra114.dtsi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
compatible = "nvidia,tegra114";
1010
interrupt-parent = <&gic>;
1111

12-
aliases {
13-
serial0 = &uarta;
14-
serial1 = &uartb;
15-
serial2 = &uartc;
16-
serial3 = &uartd;
17-
};
18-
1912
host1x@50000000 {
2013
compatible = "nvidia,tegra114-host1x", "simple-bus";
2114
reg = <0x50000000 0x00028000>;

‎arch/arm/boot/dts/tegra124-jetson-tk1.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@0,7000d000/pmic@40";
1212
rtc1 = "/rtc@0,7000e000";
13+
serial0 = &uartd;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra124-nyan-big.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@0,7000d000/pmic@40";
1212
rtc1 = "/rtc@0,7000e000";
13+
serial0 = &uarta;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra124-venice2.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@0,7000d000/pmic@40";
1212
rtc1 = "/rtc@0,7000e000";
13+
serial0 = &uarta;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra124.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
* the APB DMA based serial driver, the comptible is
287287
* "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".
288288
*/
289-
serial@0,70006000 {
289+
uarta: serial@0,70006000 {
290290
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
291291
reg = <0x0 0x70006000 0x0 0x40>;
292292
reg-shift = <2>;
@@ -299,7 +299,7 @@
299299
status = "disabled";
300300
};
301301

302-
serial@0,70006040 {
302+
uartb: serial@0,70006040 {
303303
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
304304
reg = <0x0 0x70006040 0x0 0x40>;
305305
reg-shift = <2>;
@@ -312,7 +312,7 @@
312312
status = "disabled";
313313
};
314314

315-
serial@0,70006200 {
315+
uartc: serial@0,70006200 {
316316
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
317317
reg = <0x0 0x70006200 0x0 0x40>;
318318
reg-shift = <2>;
@@ -325,7 +325,7 @@
325325
status = "disabled";
326326
};
327327

328-
serial@0,70006300 {
328+
uartd: serial@0,70006300 {
329329
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
330330
reg = <0x0 0x70006300 0x0 0x40>;
331331
reg-shift = <2>;

‎arch/arm/boot/dts/tegra20-harmony.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@7000d000/tps6586x@34";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uartd;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra20-iris-512.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
model = "Toradex Colibri T20 512MB on Iris";
77
compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
88

9+
aliases {
10+
serial0 = &uarta;
11+
serial1 = &uartd;
12+
};
13+
914
host1x@50000000 {
1015
hdmi@54280000 {
1116
status = "okay";

‎arch/arm/boot/dts/tegra20-medcom-wide.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
model = "Avionic Design Medcom-Wide board";
77
compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";
88

9+
aliases {
10+
serial0 = &uartd;
11+
};
12+
913
pwm@7000a000 {
1014
status = "okay";
1115
};

‎arch/arm/boot/dts/tegra20-paz00.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
aliases {
1111
rtc0 = "/i2c@7000d000/tps6586x@34";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uarta;
14+
serial1 = &uartc;
1315
};
1416

1517
memory {

‎arch/arm/boot/dts/tegra20-seaboard.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@7000d000/tps6586x@34";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uartd;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra20-tamonten.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
aliases {
88
rtc0 = "/i2c@7000d000/tps6586x@34";
99
rtc1 = "/rtc@7000e000";
10+
serial0 = &uartd;
1011
};
1112

1213
memory {

‎arch/arm/boot/dts/tegra20-trimslice.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@7000c500/rtc@56";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uarta;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra20-ventana.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@7000d000/tps6586x@34";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uartd;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra20-whistler.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
aliases {
1111
rtc0 = "/i2c@7000d000/max8907@3c";
1212
rtc1 = "/rtc@7000e000";
13+
serial0 = &uarta;
1314
};
1415

1516
memory {

‎arch/arm/boot/dts/tegra20.dtsi

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@
99
compatible = "nvidia,tegra20";
1010
interrupt-parent = <&intc>;
1111

12-
aliases {
13-
serial0 = &uarta;
14-
serial1 = &uartb;
15-
serial2 = &uartc;
16-
serial3 = &uartd;
17-
serial4 = &uarte;
18-
};
19-
2012
host1x@50000000 {
2113
compatible = "nvidia,tegra20-host1x", "simple-bus";
2214
reg = <0x50000000 0x00024000>;

‎arch/arm/boot/dts/tegra30-apalis-eval.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
rtc0 = "/i2c@7000c000/rtc@68";
1212
rtc1 = "/i2c@7000d000/tps65911@2d";
1313
rtc2 = "/rtc@7000e000";
14+
serial0 = &uarta;
15+
serial1 = &uartb;
16+
serial2 = &uartc;
17+
serial3 = &uartd;
1418
};
1519

1620
pcie-controller@00003000 {

‎arch/arm/boot/dts/tegra30-beaver.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
aliases {
1010
rtc0 = "/i2c@7000d000/tps65911@2d";
1111
rtc1 = "/rtc@7000e000";
12+
serial0 = &uarta;
1213
};
1314

1415
memory {

‎arch/arm/boot/dts/tegra30-cardhu.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
aliases {
3131
rtc0 = "/i2c@7000d000/tps65911@2d";
3232
rtc1 = "/rtc@7000e000";
33+
serial0 = &uarta;
34+
serial1 = &uartc;
3335
};
3436

3537
memory {

‎arch/arm/boot/dts/tegra30-colibri-eval-v3.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
rtc0 = "/i2c@7000c000/rtc@68";
1111
rtc1 = "/i2c@7000d000/tps65911@2d";
1212
rtc2 = "/rtc@7000e000";
13+
serial0 = &uarta;
14+
serial1 = &uartb;
15+
serial2 = &uartd;
1316
};
1417

1518
host1x@50000000 {

‎arch/arm/boot/dts/tegra30.dtsi

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@
99
compatible = "nvidia,tegra30";
1010
interrupt-parent = <&intc>;
1111

12-
aliases {
13-
serial0 = &uarta;
14-
serial1 = &uartb;
15-
serial2 = &uartc;
16-
serial3 = &uartd;
17-
serial4 = &uarte;
18-
};
19-
2012
pcie-controller@00003000 {
2113
compatible = "nvidia,tegra30-pcie";
2214
device_type = "pci";

‎arch/arm/configs/exynos_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@ CONFIG_MMC_DW_IDMAC=y
142142
CONFIG_MMC_DW_EXYNOS=y
143143
CONFIG_RTC_CLASS=y
144144
CONFIG_RTC_DRV_MAX77686=y
145+
CONFIG_RTC_DRV_MAX77802=y
145146
CONFIG_RTC_DRV_S5M=y
146147
CONFIG_RTC_DRV_S3C=y
147148
CONFIG_DMADEVICES=y
148149
CONFIG_PL330_DMA=y
149150
CONFIG_COMMON_CLK_MAX77686=y
151+
CONFIG_COMMON_CLK_MAX77802=y
150152
CONFIG_COMMON_CLK_S2MPS11=y
151153
CONFIG_EXYNOS_IOMMU=y
152154
CONFIG_IIO=y

0 commit comments

Comments
 (0)