Skip to content

Commit 41f7407

Browse files
mdrjrmdrjr
committed
Merge tag 'v5.4.134' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroid-5.4.y
This is the 5.4.134 stable release Change-Id: Icecc0ed03f312bbbaef2b52f584571f5bc9a339e
2 parents ad8f96c + 9afc0c2 commit 41f7407

File tree

155 files changed

+978
-498
lines changed

Some content is hidden

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

155 files changed

+978
-498
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 133
4+
SUBLEVEL = 134
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

‎arch/arm/boot/dts/am335x-cm-t335.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ status = "okay";
516516
status = "okay";
517517
pinctrl-names = "default";
518518
pinctrl-0 = <&spi0_pins>;
519-
ti,pindir-d0-out-d1-in = <1>;
519+
ti,pindir-d0-out-d1-in;
520520
/* WLS1271 WiFi */
521521
wlcore: wlcore@1 {
522522
compatible = "ti,wl1271";

‎arch/arm/boot/dts/am43x-epos-evm.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,15 +848,15 @@
848848
pinctrl-names = "default", "sleep";
849849
pinctrl-0 = <&spi0_pins_default>;
850850
pinctrl-1 = <&spi0_pins_sleep>;
851-
ti,pindir-d0-out-d1-in = <1>;
851+
ti,pindir-d0-out-d1-in;
852852
};
853853

854854
&spi1 {
855855
status = "okay";
856856
pinctrl-names = "default", "sleep";
857857
pinctrl-0 = <&spi1_pins_default>;
858858
pinctrl-1 = <&spi1_pins_sleep>;
859-
ti,pindir-d0-out-d1-in = <1>;
859+
ti,pindir-d0-out-d1-in;
860860
};
861861

862862
&usb2_phy1 {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -494,27 +494,27 @@
494494
<0x1811b408 0x004>,
495495
<0x180293a0 0x01c>;
496496
reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
497-
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
497+
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
498+
<GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
499+
<GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
498500
<GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
499501
<GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
500502
<GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
501-
<GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
502-
<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
503-
<GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
504-
interrupt-names = "spi_lr_fullness_reached",
503+
<GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
504+
interrupt-names = "mspi_done",
505+
"mspi_halted",
506+
"spi_lr_fullness_reached",
505507
"spi_lr_session_aborted",
506508
"spi_lr_impatient",
507509
"spi_lr_session_done",
508-
"spi_lr_overhead",
509-
"mspi_done",
510-
"mspi_halted";
510+
"spi_lr_overread";
511511
clocks = <&iprocmed>;
512512
clock-names = "iprocmed";
513513
num-cs = <2>;
514514
#address-cells = <1>;
515515
#size-cells = <0>;
516516

517-
spi_nor: spi-nor@0 {
517+
spi_nor: flash@0 {
518518
compatible = "jedec,spi-nor";
519519
reg = <0>;
520520
spi-max-frequency = <20000000>;

‎arch/arm/boot/dts/exynos5422-odroidhc1.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
label = "blue:heartbeat";
2323
pwms = <&pwm 2 2000000 0>;
2424
pwm-names = "pwm2";
25-
max_brightness = <255>;
25+
max-brightness = <255>;
2626
linux,default-trigger = "heartbeat";
2727
};
2828
};

‎arch/arm/boot/dts/exynos5422-odroidxu4.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
label = "blue:heartbeat";
2626
pwms = <&pwm 2 2000000 0>;
2727
pwm-names = "pwm2";
28-
max_brightness = <255>;
28+
max-brightness = <255>;
2929
linux,default-trigger = "heartbeat";
3030
};
3131
};

‎arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
* Green LED is much brighter than the others
2323
* so limit its max brightness
2424
*/
25-
max_brightness = <127>;
25+
max-brightness = <127>;
2626
linux,default-trigger = "mmc0";
2727
};
2828

2929
blueled {
3030
label = "blue:heartbeat";
3131
pwms = <&pwm 2 2000000 0>;
3232
pwm-names = "pwm2";
33-
max_brightness = <255>;
33+
max-brightness = <255>;
3434
linux,default-trigger = "heartbeat";
3535
};
3636
};

‎arch/arm/boot/dts/gemini-rut1xx.dts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@
125125
};
126126
};
127127

128-
ethernet@60000000 {
129-
status = "okay";
130-
131-
ethernet-port@0 {
132-
phy-mode = "rgmii";
133-
phy-handle = <&phy0>;
134-
};
135-
ethernet-port@1 {
136-
/* Not used in this platform */
137-
};
138-
};
139-
140128
usb@68000000 {
141129
status = "okay";
142130
};

‎arch/arm/boot/dts/imx6q-dhcom-som.dtsi

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,30 +98,40 @@
9898
reg = <0>;
9999
max-speed = <100>;
100100
reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
101-
reset-delay-us = <1000>;
102-
reset-post-delay-us = <1000>;
101+
reset-assert-us = <1000>;
102+
reset-deassert-us = <1000>;
103+
smsc,disable-energy-detect; /* Make plugin detection reliable */
103104
};
104105
};
105106
};
106107

107108
&i2c1 {
108109
clock-frequency = <100000>;
109-
pinctrl-names = "default";
110+
pinctrl-names = "default", "gpio";
110111
pinctrl-0 = <&pinctrl_i2c1>;
112+
pinctrl-1 = <&pinctrl_i2c1_gpio>;
113+
scl-gpios = <&gpio3 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
114+
sda-gpios = <&gpio3 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
111115
status = "okay";
112116
};
113117

114118
&i2c2 {
115119
clock-frequency = <100000>;
116-
pinctrl-names = "default";
120+
pinctrl-names = "default", "gpio";
117121
pinctrl-0 = <&pinctrl_i2c2>;
122+
pinctrl-1 = <&pinctrl_i2c2_gpio>;
123+
scl-gpios = <&gpio4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
124+
sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
118125
status = "okay";
119126
};
120127

121128
&i2c3 {
122129
clock-frequency = <100000>;
123-
pinctrl-names = "default";
130+
pinctrl-names = "default", "gpio";
124131
pinctrl-0 = <&pinctrl_i2c3>;
132+
pinctrl-1 = <&pinctrl_i2c3_gpio>;
133+
scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
134+
sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
125135
status = "okay";
126136

127137
ltc3676: pmic@3c {
@@ -287,20 +297,41 @@
287297
>;
288298
};
289299

300+
pinctrl_i2c1_gpio: i2c1-gpio-grp {
301+
fsl,pins = <
302+
MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x4001b8b1
303+
MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x4001b8b1
304+
>;
305+
};
306+
290307
pinctrl_i2c2: i2c2-grp {
291308
fsl,pins = <
292309
MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
293310
MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
294311
>;
295312
};
296313

314+
pinctrl_i2c2_gpio: i2c2-gpio-grp {
315+
fsl,pins = <
316+
MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x4001b8b1
317+
MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x4001b8b1
318+
>;
319+
};
320+
297321
pinctrl_i2c3: i2c3-grp {
298322
fsl,pins = <
299323
MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
300324
MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
301325
>;
302326
};
303327

328+
pinctrl_i2c3_gpio: i2c3-gpio-grp {
329+
fsl,pins = <
330+
MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1
331+
MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1
332+
>;
333+
};
334+
304335
pinctrl_pmic_hw300: pmic-hw300-grp {
305336
fsl,pins = <
306337
MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x1B0B0

‎arch/arm/boot/dts/r8a7779-marzen.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
status = "okay";
147147

148148
clocks = <&mstp1_clks R8A7779_CLK_DU>, <&x3_clk>;
149-
clock-names = "du", "dclkin.0";
149+
clock-names = "du.0", "dclkin.0";
150150

151151
ports {
152152
port@0 {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@
463463
reg = <0xfff80000 0x40000>;
464464
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
465465
clocks = <&mstp1_clks R8A7779_CLK_DU>;
466+
clock-names = "du.0";
466467
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
467468
status = "disabled";
468469

‎arch/arm/mach-exynos/exynos.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ void __init exynos_sysram_init(void)
4646
sysram_base_addr = of_iomap(node, 0);
4747
sysram_base_phys = of_translate_address(node,
4848
of_get_address(node, 0, NULL, NULL));
49+
of_node_put(node);
4950
break;
5051
}
5152

5253
for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram-ns") {
5354
if (!of_device_is_available(node))
5455
continue;
5556
sysram_ns_base_addr = of_iomap(node, 0);
57+
of_node_put(node);
5658
break;
5759
}
5860
}

‎arch/arm/probes/kprobes/test-thumb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,21 +441,21 @@ void kprobe_thumb32_test_cases(void)
441441
"3: mvn r0, r0 \n\t"
442442
"2: nop \n\t")
443443

444-
TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,"]",
444+
TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,", lsl #1]",
445445
"9: \n\t"
446446
".short (2f-1b-4)>>1 \n\t"
447447
".short (3f-1b-4)>>1 \n\t"
448448
"3: mvn r0, r0 \n\t"
449449
"2: nop \n\t")
450450

451-
TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,"]",
451+
TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,", lsl #1]",
452452
"9: \n\t"
453453
".short (2f-1b-4)>>1 \n\t"
454454
".short (3f-1b-4)>>1 \n\t"
455455
"3: mvn r0, r0 \n\t"
456456
"2: nop \n\t")
457457

458-
TEST_RRX("tbh [r",1,9f, ", r",14,1,"]",
458+
TEST_RRX("tbh [r",1,9f, ", r",14,1,", lsl #1]",
459459
"9: \n\t"
460460
".short (2f-1b-4)>>1 \n\t"
461461
".short (3f-1b-4)>>1 \n\t"
@@ -468,10 +468,10 @@ void kprobe_thumb32_test_cases(void)
468468

469469
TEST_UNSUPPORTED("strexb r0, r1, [r2]")
470470
TEST_UNSUPPORTED("strexh r0, r1, [r2]")
471-
TEST_UNSUPPORTED("strexd r0, r1, [r2]")
471+
TEST_UNSUPPORTED("strexd r0, r1, r2, [r2]")
472472
TEST_UNSUPPORTED("ldrexb r0, [r1]")
473473
TEST_UNSUPPORTED("ldrexh r0, [r1]")
474-
TEST_UNSUPPORTED("ldrexd r0, [r1]")
474+
TEST_UNSUPPORTED("ldrexd r0, r1, [r1]")
475475

476476
TEST_GROUP("Data-processing (shifted register) and (modified immediate)")
477477

‎arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
memory@48000000 {
6060
device_type = "memory";
6161
/* first 128MB is reserved for secure area. */
62-
reg = <0x0 0x48000000 0x0 0x38000000>;
62+
reg = <0x0 0x48000000 0x0 0x78000000>;
6363
};
6464

6565
osc5_clk: osc5-clock {

‎arch/hexagon/kernel/vmlinux.lds.S

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,8 @@ SECTIONS
6060

6161
_end = .;
6262

63-
/DISCARD/ : {
64-
EXIT_TEXT
65-
EXIT_DATA
66-
EXIT_CALL
67-
}
68-
6963
STABS_DEBUG
7064
DWARF_DEBUG
7165

66+
DISCARDS
7267
}

‎arch/mips/boot/compressed/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
3333
KCOV_INSTRUMENT := n
3434

3535
# decompressor objects (linked with vmlinuz)
36-
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
36+
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/bswapsi.o
3737

3838
ifdef CONFIG_DEBUG_ZBOOT
3939
vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT) += $(obj)/dbg.o
@@ -47,7 +47,7 @@ extra-y += uart-ath79.c
4747
$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c
4848
$(call cmd,shipped)
4949

50-
vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o
50+
vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
5151

5252
extra-y += ashldi3.c
5353
$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE

‎arch/mips/boot/compressed/decompress.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Author: Wu Zhangjin <[email protected]>
88
*/
99

10+
#define DISABLE_BRANCH_PROFILING
11+
1012
#include <linux/types.h>
1113
#include <linux/kernel.h>
1214
#include <linux/string.h>

‎arch/mips/include/asm/vdso/vdso.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static inline const struct vdso_data *get_vdso_data(void)
6767

6868
static inline void __iomem *get_gic(const struct vdso_data *data)
6969
{
70-
return (void __iomem *)data - PAGE_SIZE;
70+
return (void __iomem *)((unsigned long)data & PAGE_MASK) - PAGE_SIZE;
7171
}
7272

7373
#endif /* CONFIG_CLKSRC_MIPS_GIC */

0 commit comments

Comments
 (0)