Skip to content

Commit ad09ef2

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.5 This is far too big a set of fixes for this late in the release cycle but the overwhelming bulk is essentially the same simple fix from Takashi for a cut'n'pasted 64 bit cleanliness issue in the userspace interface where drivers were accessing things using the wrong element in a union which worked OK on 32 bit platforms as the correct element happened to be aligned the same way but with 64 bit platforms ABIs are different and the two members of the union are laid out in different places. They aren't all tagged to stable since some of these chips have vanishingly little chance of being used in 64 bit systems. The other changes are: - A fix for Qualcomm devices to work on big endian systems. The original change is actually correct but triggered a bug in regmap which is too invasive to fix for this cycle and can be worked around by just letting regmap pick the default. - A fix for the Samsung I2S driver locking which wasn't using IRQ safe spinlocks when it needed to. - A fix for the new Intel Sky Lake driver forgetting that C pointer arithmetic takes the type of the pointer into consideration. - A revert of a change to the FSL SSI driver that broke some systems. - A fix for the cleanup path of the wm9713 driver. - A fix for some incorrect register definitions in the ADAU17x1 driver that caused misclocking in some configurations. - A fix for the tracepoints for jack detection to avoid using an internal field of the core jack structure which is no longer present in all configurations. - A fix for another of the new Intel drivers which tried to write to a string literal.
2 parents 790b415 + 02db17f commit ad09ef2

File tree

789 files changed

+9941
-5861
lines changed

Some content is hidden

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

789 files changed

+9941
-5861
lines changed

‎Documentation/cgroup-v2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and
77
conventions of cgroup v2. It describes all userland-visible aspects
88
of cgroup including core and specific controller behaviors. All
99
future changes must be reflected in this document. Documentation for
10-
v1 is available under Documentation/cgroup-legacy/.
10+
v1 is available under Documentation/cgroup-v1/.
1111

1212
CONTENTS
1313

‎Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following
3030
clock-output-names:
3131
- "xin24m" - crystal input - required,
3232
- "ext_i2s" - external I2S clock - optional,
33-
- "ext_gmac" - external GMAC clock - optional
33+
- "rmii_clkin" - external EMAC clock - optional
3434

3535
Example: Clock controller node:
3636

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ Main node required properties:
2424
1 = edge triggered
2525
4 = level triggered
2626

27-
Cells 4 and beyond are reserved for future use. When the 1st cell
28-
has a value of 0 or 1, cells 4 and beyond act as padding, and may be
29-
ignored. It is recommended that padding cells have a value of 0.
27+
Cells 4 and beyond are reserved for future use and must have a value
28+
of 0 if present.
3029

3130
- reg : Specifies base physical address(s) and size of the GIC
3231
registers, in the following order:

‎Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ Example:
8282
"ch16", "ch17", "ch18", "ch19",
8383
"ch20", "ch21", "ch22", "ch23",
8484
"ch24";
85-
clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;
86-
power-domains = <&cpg_clocks>;
85+
clocks = <&cpg CPG_MOD 812>;
86+
power-domains = <&cpg>;
8787
phy-mode = "rgmii-id";
8888
phy-handle = <&phy0>;
8989

‎Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ OHCI and EHCI controllers.
88
Required properties:
99
- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;
1010
"renesas,pci-r8a7791" for the R8A7791 SoC;
11+
"renesas,pci-r8a7793" for the R8A7793 SoC;
1112
"renesas,pci-r8a7794" for the R8A7794 SoC;
1213
"renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device
1314

‎Documentation/devicetree/bindings/pci/rcar-pci.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required properties:
44
compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
55
"renesas,pcie-r8a7790" for the R8A7790 SoC;
66
"renesas,pcie-r8a7791" for the R8A7791 SoC;
7+
"renesas,pcie-r8a7793" for the R8A7793 SoC;
78
"renesas,pcie-r8a7795" for the R8A7795 SoC;
89
"renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.
910

‎Documentation/devicetree/bindings/regulator/tps65217.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,59 +26,49 @@ Example:
2626
ti,pmic-shutdown-controller;
2727

2828
regulators {
29-
#address-cells = <1>;
30-
#size-cells = <0>;
31-
3229
dcdc1_reg: dcdc1 {
33-
reg = <0>;
3430
regulator-min-microvolt = <900000>;
3531
regulator-max-microvolt = <1800000>;
3632
regulator-boot-on;
3733
regulator-always-on;
3834
};
3935

4036
dcdc2_reg: dcdc2 {
41-
reg = <1>;
4237
regulator-min-microvolt = <900000>;
4338
regulator-max-microvolt = <3300000>;
4439
regulator-boot-on;
4540
regulator-always-on;
4641
};
4742

4843
dcdc3_reg: dcc3 {
49-
reg = <2>;
5044
regulator-min-microvolt = <900000>;
5145
regulator-max-microvolt = <1500000>;
5246
regulator-boot-on;
5347
regulator-always-on;
5448
};
5549

5650
ldo1_reg: ldo1 {
57-
reg = <3>;
5851
regulator-min-microvolt = <1000000>;
5952
regulator-max-microvolt = <3300000>;
6053
regulator-boot-on;
6154
regulator-always-on;
6255
};
6356

6457
ldo2_reg: ldo2 {
65-
reg = <4>;
6658
regulator-min-microvolt = <900000>;
6759
regulator-max-microvolt = <3300000>;
6860
regulator-boot-on;
6961
regulator-always-on;
7062
};
7163

7264
ldo3_reg: ldo3 {
73-
reg = <5>;
7465
regulator-min-microvolt = <1800000>;
7566
regulator-max-microvolt = <3300000>;
7667
regulator-boot-on;
7768
regulator-always-on;
7869
};
7970

8071
ldo4_reg: ldo4 {
81-
reg = <6>;
8272
regulator-min-microvolt = <1800000>;
8373
regulator-max-microvolt = <3300000>;
8474
regulator-boot-on;

‎Documentation/devicetree/bindings/rtc/s3c-rtc.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@ Required properties:
1414
interrupt number is the rtc alarm interrupt and second interrupt number
1515
is the rtc tick interrupt. The number of cells representing a interrupt
1616
depends on the parent interrupt controller.
17+
- clocks: Must contain a list of phandle and clock specifier for the rtc
18+
and source clocks.
19+
- clock-names: Must contain "rtc" and "rtc_src" entries sorted in the
20+
same order as the clocks property.
1721

1822
Example:
1923

2024
rtc@10070000 {
2125
compatible = "samsung,s3c6410-rtc";
2226
reg = <0x10070000 0x100>;
2327
interrupts = <44 0 45 0>;
28+
clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
29+
clock-names = "rtc", "rtc_src";
2430
};

‎Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Optional properties:
99
- fsl,uart-has-rtscts : Indicate the uart has rts and cts
1010
- fsl,irda-mode : Indicate the uart supports irda mode
1111
- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
12-
is DCE mode by default.
12+
in DCE mode by default.
1313

1414
Note: Each uart controller should have an alias correctly numbered
1515
in "aliases" node.

‎Documentation/devicetree/bindings/thermal/rcar-thermal.txt

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
* Renesas R-Car Thermal
22

33
Required properties:
4-
- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
5-
as fallback.
4+
- compatible : "renesas,thermal-<soctype>",
5+
"renesas,rcar-gen2-thermal" (with thermal-zone) or
6+
"renesas,rcar-thermal" (without thermal-zone) as fallback.
67
Examples with soctypes are:
78
- "renesas,thermal-r8a73a4" (R-Mobile APE6)
89
- "renesas,thermal-r8a7779" (R-Car H1)
@@ -36,3 +37,35 @@ thermal@e61f0000 {
3637
0xe61f0300 0x38>;
3738
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
3839
};
40+
41+
Example (with thermal-zone):
42+
43+
thermal-zones {
44+
cpu_thermal: cpu-thermal {
45+
polling-delay-passive = <1000>;
46+
polling-delay = <5000>;
47+
48+
thermal-sensors = <&thermal>;
49+
50+
trips {
51+
cpu-crit {
52+
temperature = <115000>;
53+
hysteresis = <0>;
54+
type = "critical";
55+
};
56+
};
57+
cooling-maps {
58+
};
59+
};
60+
};
61+
62+
thermal: thermal@e61f0000 {
63+
compatible = "renesas,thermal-r8a7790",
64+
"renesas,rcar-gen2-thermal",
65+
"renesas,rcar-thermal";
66+
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
67+
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
68+
clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
69+
power-domains = <&cpg_clocks>;
70+
#thermal-sensor-cells = <0>;
71+
};

‎Documentation/filesystems/efivarfs.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ filesystem.
1414
efivarfs is typically mounted like this,
1515

1616
mount -t efivarfs none /sys/firmware/efi/efivars
17+
18+
Due to the presence of numerous firmware bugs where removing non-standard
19+
UEFI variables causes the system firmware to fail to POST, efivarfs
20+
files that are not well-known standardized variables are created
21+
as immutable files. This doesn't prevent removal - "chattr -i" will work -
22+
but it does prevent this kind of failure from being accomplished
23+
accidentally.

‎Documentation/kernel-parameters.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,6 +4235,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
42354235
The default value of this parameter is determined by
42364236
the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
42374237

4238+
workqueue.debug_force_rr_cpu
4239+
Workqueue used to implicitly guarantee that work
4240+
items queued without explicit CPU specified are put
4241+
on the local CPU. This guarantee is no longer true
4242+
and while local CPU is still preferred work items
4243+
may be put on foreign CPUs. This debug option
4244+
forces round-robin CPU selection to flush out
4245+
usages which depend on the now broken guarantee.
4246+
When enabled, memory and cache locality will be
4247+
impacted.
4248+
42384249
x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
42394250
default x2apic cluster mode on platforms
42404251
supporting x2apic.

‎Documentation/timers/hpet.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
High Precision Event Timer Driver for Linux
22

33
The High Precision Event Timer (HPET) hardware follows a specification
4-
by Intel and Microsoft which can be found at
5-
6-
http://www.intel.com/hardwaredesign/hpetspec_1.pdf
4+
by Intel and Microsoft, revision 1.
75

86
Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision")
97
and up to 32 comparators. Normally three or more comparators are provided,

‎MAINTAINERS

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -920,17 +920,24 @@ M: Emilio López <[email protected]>
920920
S: Maintained
921921
F: drivers/clk/sunxi/
922922

923-
ARM/Amlogic MesonX SoC support
923+
ARM/Amlogic Meson SoC support
924924
M: Carlo Caione <[email protected]>
925925
L: [email protected] (moderated for non-subscribers)
926+
L: [email protected]
927+
W: http://linux-meson.com/
926928
S: Maintained
927-
F: drivers/media/rc/meson-ir.c
928-
N: meson[x68]
929+
F: arch/arm/mach-meson/
930+
F: arch/arm/boot/dts/meson*
931+
N: meson
929932

930933
ARM/Annapurna Labs ALPINE ARCHITECTURE
931934
M: Tsahee Zidenberg <[email protected]>
935+
M: Antoine Tenart <[email protected]>
932936
S: Maintained
933937
F: arch/arm/mach-alpine/
938+
F: arch/arm/boot/dts/alpine*
939+
F: arch/arm64/boot/dts/al/
940+
F: drivers/*/*alpine*
934941

935942
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
936943
M: Nicolas Ferre <[email protected]>
@@ -1442,8 +1449,8 @@ S: Maintained
14421449
ARM/RENESAS ARM64 ARCHITECTURE
14431450
M: Simon Horman <[email protected]>
14441451
M: Magnus Damm <[email protected]>
1445-
L: linux-sh@vger.kernel.org
1446-
Q: http://patchwork.kernel.org/project/linux-sh/list/
1452+
L: linux-renesas-soc@vger.kernel.org
1453+
Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
14471454
T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
14481455
S: Supported
14491456
F: arch/arm64/boot/dts/renesas/
@@ -2362,14 +2369,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
23622369
S: Maintained
23632370
N: bcm2835
23642371

2365-
BROADCOM BCM33XX MIPS ARCHITECTURE
2366-
M: Kevin Cernekee <[email protected]>
2367-
L: [email protected]
2368-
S: Maintained
2369-
F: arch/mips/bcm3384/*
2370-
F: arch/mips/include/asm/mach-bcm3384/*
2371-
F: arch/mips/kernel/*bmips*
2372-
23732372
BROADCOM BCM47XX MIPS ARCHITECTURE
23742373
M: Hauke Mehrtens <[email protected]>
23752374
M: Rafał Miłecki <[email protected]>
@@ -3452,7 +3451,6 @@ F: drivers/usb/dwc2/
34523451
DESIGNWARE USB3 DRD IP DRIVER
34533452
M: Felipe Balbi <[email protected]>
34543453
L: [email protected]
3455-
L: [email protected]
34563454
T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
34573455
S: Maintained
34583456
F: drivers/usb/dwc3/
@@ -6136,7 +6134,7 @@ F: include/uapi/linux/sunrpc/
61366134

61376135
KERNEL SELFTEST FRAMEWORK
61386136
M: Shuah Khan <[email protected]>
6139-
L: linux-api@vger.kernel.org
6137+
L: linux-kselftest@vger.kernel.org
61406138
T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
61416139
S: Maintained
61426140
F: tools/testing/selftests
@@ -7362,7 +7360,7 @@ F: drivers/tty/isicom.c
73627360
F: include/linux/isicom.h
73637361

73647362
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
7365-
M: Felipe Balbi <[email protected]>
7363+
M: Bin Liu <[email protected]>
73667364
L: [email protected]
73677365
T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
73687366
S: Maintained
@@ -7694,13 +7692,13 @@ S: Maintained
76947692
F: arch/nios2/
76957693

76967694
NOKIA N900 POWER SUPPLY DRIVERS
7697-
M: Pali Rohár <[email protected]>
7698-
S: Maintained
7695+
R: Pali Rohár <[email protected]>
76997696
F: include/linux/power/bq2415x_charger.h
77007697
F: include/linux/power/bq27xxx_battery.h
77017698
F: include/linux/power/isp1704_charger.h
77027699
F: drivers/power/bq2415x_charger.c
77037700
F: drivers/power/bq27xxx_battery.c
7701+
F: drivers/power/bq27xxx_battery_i2c.c
77047702
F: drivers/power/isp1704_charger.c
77057703
F: drivers/power/rx51_battery.c
77067704

@@ -7931,11 +7929,9 @@ F: drivers/media/platform/omap3isp/
79317929
F: drivers/staging/media/omap4iss/
79327930

79337931
OMAP USB SUPPORT
7934-
M: Felipe Balbi <[email protected]>
79357932
L: [email protected]
79367933
L: [email protected]
7937-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
7938-
S: Maintained
7934+
S: Orphan
79397935
F: drivers/usb/*/*omap*
79407936
F: arch/arm/*omap*/usb*
79417937

@@ -9566,6 +9562,12 @@ M: Andreas Noever <[email protected]>
95669562
S: Maintained
95679563
F: drivers/thunderbolt/
95689564

9565+
TI BQ27XXX POWER SUPPLY DRIVER
9566+
R: Andrew F. Davis <[email protected]>
9567+
F: include/linux/power/bq27xxx_battery.h
9568+
F: drivers/power/bq27xxx_battery.c
9569+
F: drivers/power/bq27xxx_battery_i2c.c
9570+
95699571
TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
95709572
M: John Stultz <[email protected]>
95719573
M: Thomas Gleixner <[email protected]>
@@ -9787,10 +9789,11 @@ S: Supported
97879789
F: drivers/scsi/be2iscsi/
97889790

97899791
Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
9790-
M: Sathya Perla <[email protected]>
9791-
M: Ajit Khaparde <[email protected]>
9792-
M: Padmanabh Ratnakar <[email protected]>
9793-
M: Sriharsha Basavapatna <[email protected]>
9792+
M: Sathya Perla <[email protected]>
9793+
M: Ajit Khaparde <[email protected]>
9794+
M: Padmanabh Ratnakar <[email protected]>
9795+
M: Sriharsha Basavapatna <[email protected]>
9796+
M: Somnath Kotur <[email protected]>
97949797
L: [email protected]
97959798
W: http://www.emulex.com
97969799
S: Supported
@@ -12020,7 +12023,6 @@ F: arch/arm64/xen/
1202012023
F: arch/arm64/include/asm/xen/
1202112024

1202212025
XEN NETWORK BACKEND DRIVER
12023-
M: Ian Campbell <[email protected]>
1202412026
M: Wei Liu <[email protected]>
1202512027
L: [email protected] (moderated for non-subscribers)
1202612028
L: [email protected]

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 5
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc6
55
NAME = Blurry Fish Butt
66

77
# *DOCUMENTATION*

0 commit comments

Comments
 (0)