Skip to content

Commit 03a618d

Browse files
otaviootavio
authored
Merge pull request torvalds#202 from zandrey/5.4-2.2.x-imx
Update 5.4-2.2.x-imx to v5.4.86
2 parents 350a71f + 8c8c2d4 commit 03a618d

File tree

449 files changed

+2672
-1466
lines changed

Some content is hidden

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

449 files changed

+2672
-1466
lines changed

‎Documentation/x86/topology.rst

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Package
4141
Packages contain a number of cores plus shared resources, e.g. DRAM
4242
controller, shared caches etc.
4343

44+
Modern systems may also use the term 'Die' for package.
45+
4446
AMD nomenclature for package is 'Node'.
4547

4648
Package-related topology information in the kernel:
@@ -53,11 +55,18 @@ Package-related topology information in the kernel:
5355

5456
The number of dies in a package. This information is retrieved via CPUID.
5557

58+
- cpuinfo_x86.cpu_die_id:
59+
60+
The physical ID of the die. This information is retrieved via CPUID.
61+
5662
- cpuinfo_x86.phys_proc_id:
5763

5864
The physical ID of the package. This information is retrieved via CPUID
5965
and deduced from the APIC IDs of the cores in the package.
6066

67+
Modern systems use this value for the socket. There may be multiple
68+
packages within a socket. This value may differ from cpu_die_id.
69+
6170
- cpuinfo_x86.logical_proc_id:
6271

6372
The logical ID of the package. As we do not trust BIOSes to enumerate the

‎Makefile

+1-1
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 = 85
4+
SUBLEVEL = 86
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

‎arch/Kconfig

+16
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,22 @@ config UPROBES
131131
managed by the kernel and kept transparent to the probed
132132
application. )
133133

134+
config HAVE_64BIT_ALIGNED_ACCESS
135+
def_bool 64BIT && !HAVE_EFFICIENT_UNALIGNED_ACCESS
136+
help
137+
Some architectures require 64 bit accesses to be 64 bit
138+
aligned, which also requires structs containing 64 bit values
139+
to be 64 bit aligned too. This includes some 32 bit
140+
architectures which can do 64 bit accesses, as well as 64 bit
141+
architectures without unaligned access.
142+
143+
This symbol should be selected by an architecture if 64 bit
144+
accesses are required to be 64 bit aligned in this way even
145+
though it is not a 64 bit architecture.
146+
147+
See Documentation/unaligned-memory-access.txt for more
148+
information on the topic of unaligned memory accesses.
149+
134150
config HAVE_EFFICIENT_UNALIGNED_ACCESS
135151
bool
136152
help

‎arch/arm/boot/dts/armada-xp-98dx3236.dtsi

-5
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,6 @@
266266
reg = <0x11000 0x100>;
267267
};
268268

269-
&i2c1 {
270-
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
271-
reg = <0x11100 0x100>;
272-
};
273-
274269
&mpic {
275270
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
276271
};

‎arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts

-5
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@
8181
status = "okay";
8282
};
8383

84-
&vuart {
85-
// VUART Host Console
86-
status = "okay";
87-
};
88-
8984
&uart1 {
9085
// Host Console
9186
status = "okay";

‎arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#size-cells = <1>;
2323
ranges;
2424

25-
vga_memory: framebuffer@7f000000 {
25+
vga_memory: framebuffer@9f000000 {
2626
no-map;
27-
reg = <0x7f000000 0x01000000>;
27+
reg = <0x9f000000 0x01000000>; /* 16M */
2828
};
2929
};
3030

‎arch/arm/boot/dts/at91-sama5d3_xplained.dts

+7
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@
242242
atmel,pins =
243243
<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PE9, conflicts with A9 */
244244
};
245+
pinctrl_usb_default: usb_default {
246+
atmel,pins =
247+
<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
248+
AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
249+
};
245250
};
246251
};
247252
};
@@ -259,6 +264,8 @@
259264
&pioE 3 GPIO_ACTIVE_LOW
260265
&pioE 4 GPIO_ACTIVE_LOW
261266
>;
267+
pinctrl-names = "default";
268+
pinctrl-0 = <&pinctrl_usb_default>;
262269
status = "okay";
263270
};
264271

‎arch/arm/boot/dts/at91-sama5d4_xplained.dts

+7
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@
133133
atmel,pins =
134134
<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
135135
};
136+
pinctrl_usb_default: usb_default {
137+
atmel,pins =
138+
<AT91_PIOE 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
139+
AT91_PIOE 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
140+
};
136141
pinctrl_key_gpio: key_gpio_0 {
137142
atmel,pins =
138143
<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
@@ -158,6 +163,8 @@
158163
&pioE 11 GPIO_ACTIVE_HIGH
159164
&pioE 14 GPIO_ACTIVE_HIGH
160165
>;
166+
pinctrl-names = "default";
167+
pinctrl-0 = <&pinctrl_usb_default>;
161168
status = "okay";
162169
};
163170

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

+11-8
Original file line numberDiff line numberDiff line change
@@ -278,23 +278,26 @@
278278
atmel,adc-use-res = "highres";
279279

280280
trigger0 {
281-
trigger-name = "timer-counter-0";
281+
trigger-name = "external-rising";
282282
trigger-value = <0x1>;
283+
trigger-external;
283284
};
285+
284286
trigger1 {
285-
trigger-name = "timer-counter-1";
286-
trigger-value = <0x3>;
287+
trigger-name = "external-falling";
288+
trigger-value = <0x2>;
289+
trigger-external;
287290
};
288291

289292
trigger2 {
290-
trigger-name = "timer-counter-2";
291-
trigger-value = <0x5>;
293+
trigger-name = "external-any";
294+
trigger-value = <0x3>;
295+
trigger-external;
292296
};
293297

294298
trigger3 {
295-
trigger-name = "external";
296-
trigger-value = <0x13>;
297-
trigger-external;
299+
trigger-name = "continuous";
300+
trigger-value = <0x6>;
298301
};
299302
};
300303

‎arch/arm/boot/dts/exynos5410-odroidxu.dts

+4-2
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@
327327
regulator-name = "vddq_lcd";
328328
regulator-min-microvolt = <1800000>;
329329
regulator-max-microvolt = <1800000>;
330+
/* Supplies also GPK and GPJ */
331+
regulator-always-on;
330332
};
331333

332334
ldo8_reg: LDO8 {
@@ -637,11 +639,11 @@
637639
};
638640

639641
&usbdrd_dwc3_0 {
640-
dr_mode = "host";
642+
dr_mode = "peripheral";
641643
};
642644

643645
&usbdrd_dwc3_1 {
644-
dr_mode = "peripheral";
646+
dr_mode = "host";
645647
};
646648

647649
&usbdrd3_0 {

‎arch/arm/boot/dts/exynos5410-pinctrl.dtsi

+28
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,34 @@
560560
interrupt-controller;
561561
#interrupt-cells = <2>;
562562
};
563+
564+
usb3_1_oc: usb3-1-oc {
565+
samsung,pins = "gpk2-4", "gpk2-5";
566+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
567+
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
568+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
569+
};
570+
571+
usb3_1_vbusctrl: usb3-1-vbusctrl {
572+
samsung,pins = "gpk2-6", "gpk2-7";
573+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
574+
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
575+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
576+
};
577+
578+
usb3_0_oc: usb3-0-oc {
579+
samsung,pins = "gpk3-0", "gpk3-1";
580+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
581+
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
582+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
583+
};
584+
585+
usb3_0_vbusctrl: usb3-0-vbusctrl {
586+
samsung,pins = "gpk3-2", "gpk3-3";
587+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
588+
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
589+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
590+
};
563591
};
564592

565593
&pinctrl_2 {

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

+4
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@
398398
&usbdrd3_0 {
399399
clocks = <&clock CLK_USBD300>;
400400
clock-names = "usbdrd30";
401+
pinctrl-names = "default";
402+
pinctrl-0 = <&usb3_0_oc>, <&usb3_0_vbusctrl>;
401403
};
402404

403405
&usbdrd_phy0 {
@@ -409,6 +411,8 @@
409411
&usbdrd3_1 {
410412
clocks = <&clock CLK_USBD301>;
411413
clock-names = "usbdrd30";
414+
pinctrl-names = "default";
415+
pinctrl-0 = <&usb3_1_oc>, <&usb3_1_vbusctrl>;
412416
};
413417

414418
&usbdrd_dwc3_1 {

‎arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@
551551

552552
pinctrl_i2c3: i2c3grp {
553553
fsl,pins = <
554-
MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
554+
MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
555555
MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
556556
>;
557557
};

‎arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030
167167
MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030
168168
MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
169-
MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
170169
>;
171170
};
172171

‎arch/arm/boot/dts/meson8b-odroidc1.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
reg = <0>;
220220

221221
reset-assert-us = <10000>;
222-
reset-deassert-us = <30000>;
222+
reset-deassert-us = <80000>;
223223
reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
224224

225225
interrupt-parent = <&gpio_intc>;

‎arch/arm/boot/dts/meson8m2-mxiii-plus.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
reg = <0>;
8484

8585
reset-assert-us = <10000>;
86-
reset-deassert-us = <30000>;
86+
reset-deassert-us = <80000>;
8787
reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
8888
};
8989
};

‎arch/arm/boot/dts/omap4-panda-es.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
button_pins: pinmux_button_pins {
4848
pinctrl-single,pins = <
49-
OMAP4_IOPAD(0x11b, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
49+
OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
5050
>;
5151
};
5252
};

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,7 @@
648648
clocks = <&pmc PMC_TYPE_PERIPHERAL 51>;
649649
#address-cells = <1>;
650650
#size-cells = <1>;
651+
no-memory-wc;
651652
ranges = <0 0xf8044000 0x1420>;
652653
};
653654

@@ -716,7 +717,7 @@
716717

717718
can0: can@f8054000 {
718719
compatible = "bosch,m_can";
719-
reg = <0xf8054000 0x4000>, <0x210000 0x4000>;
720+
reg = <0xf8054000 0x4000>, <0x210000 0x1c00>;
720721
reg-names = "m_can", "message_ram";
721722
interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
722723
<64 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -938,7 +939,7 @@
938939

939940
can1: can@fc050000 {
940941
compatible = "bosch,m_can";
941-
reg = <0xfc050000 0x4000>, <0x210000 0x4000>;
942+
reg = <0xfc050000 0x4000>, <0x210000 0x3800>;
942943
reg-names = "m_can", "message_ram";
943944
interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
944945
<65 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -948,7 +949,7 @@
948949
assigned-clocks = <&pmc PMC_TYPE_GCK 57>;
949950
assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>;
950951
assigned-clock-rates = <40000000>;
951-
bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>;
952+
bosch,mram-cfg = <0x1c00 0 0 64 0 0 32 32>;
952953
status = "disabled";
953954
};
954955

‎arch/arm/boot/dts/sun7i-a20-bananapi.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
pinctrl-names = "default";
133133
pinctrl-0 = <&gmac_rgmii_pins>;
134134
phy-handle = <&phy1>;
135-
phy-mode = "rgmii";
135+
phy-mode = "rgmii-id";
136136
phy-supply = <&reg_gmac_3v3>;
137137
status = "okay";
138138
};

‎arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 Adam Sampson <ats@offog.org>
2+
* Copyright 2015-2020 Adam Sampson <ats@offog.org>
33
*
44
* This file is dual-licensed: you can use it either under the terms
55
* of the GPL or the X11 license, at your option. Note that this dual
@@ -115,7 +115,7 @@
115115
pinctrl-names = "default";
116116
pinctrl-0 = <&gmac_rgmii_pins>;
117117
phy-handle = <&phy1>;
118-
phy-mode = "rgmii";
118+
phy-mode = "rgmii-id";
119119
status = "okay";
120120
};
121121

‎arch/arm/boot/dts/sun8i-v3s.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423
gic: interrupt-controller@1c81000 {
424424
compatible = "arm,gic-400";
425425
reg = <0x01c81000 0x1000>,
426-
<0x01c82000 0x1000>,
426+
<0x01c82000 0x2000>,
427427
<0x01c84000 0x2000>,
428428
<0x01c86000 0x2000>;
429429
interrupt-controller;

‎arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts

+6-6
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
pinctrl-names = "default";
121121
pinctrl-0 = <&gmac_rgmii_pins>;
122122
phy-handle = <&phy1>;
123-
phy-mode = "rgmii";
123+
phy-mode = "rgmii-id";
124124
phy-supply = <&reg_dc1sw>;
125125
status = "okay";
126126
};
@@ -198,16 +198,16 @@
198198
};
199199

200200
&reg_dc1sw {
201-
regulator-min-microvolt = <3000000>;
202-
regulator-max-microvolt = <3000000>;
201+
regulator-min-microvolt = <3300000>;
202+
regulator-max-microvolt = <3300000>;
203203
regulator-name = "vcc-gmac-phy";
204204
};
205205

206206
&reg_dcdc1 {
207207
regulator-always-on;
208-
regulator-min-microvolt = <3000000>;
209-
regulator-max-microvolt = <3000000>;
210-
regulator-name = "vcc-3v0";
208+
regulator-min-microvolt = <3300000>;
209+
regulator-max-microvolt = <3300000>;
210+
regulator-name = "vcc-3v3";
211211
};
212212

213213
&reg_dcdc2 {

0 commit comments

Comments
 (0)