Skip to content

Commit 5e3cdec

Browse files
tiwaitiwai
committed
ASoC: Updates for v5.0/v4.20 As ever there's a lot of small and driver specific changes going on here, but we do also have some relatively large changes in the core thanks to the hard work of Charles and Morimoto-san: - More component transitions from Morimoto-san, I think we're about finished with this. Thanks for all the hard work! - Morimoto-san also added a bunch of for_each_foo macros - A bunch of cleanups and fixes for DAPM from Charles. - MCLK support for several different devices, including CS42L51, STM32 SAI, and MAX98373. - Support for Allwinner A64 CODEC analog, Intel boards with DA7219 and MAX98927, Meson AXG PDM inputs, Nuvoton NAU8822, Renesas R8A7744 and TI PCM3060.
2 parents b5a2293 + 65dfb6d commit 5e3cdec

File tree

1,680 files changed

+24348
-11200
lines changed

Some content is hidden

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

1,680 files changed

+24348
-11200
lines changed

‎Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,12 @@ KernelVersion: 3.0
7373
Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7474
Description:
7575
Number of sectors written by the frontend.
76+
77+
What: /sys/bus/xen-backend/devices/*/state
78+
Date: August 2018
79+
KernelVersion: 4.19
80+
Contact: Joe Jin <joe.jin@oracle.com>
81+
Description:
82+
The state of the device. One of: 'Unknown',
83+
'Initialising', 'Initialised', 'Connected', 'Closing',
84+
'Closed', 'Reconfiguring', 'Reconfigured'.

‎Documentation/ABI/stable/sysfs-devices-system-xen_memory

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7575
Description:
7676
Amount (in KiB) of low (or normal) memory in the
7777
balloon.
78+
79+
What: /sys/devices/system/xen_memory/xen_memory0/scrub_pages
80+
Date: September 2018
81+
KernelVersion: 4.20
82+
Contact: xen-devel@lists.xenproject.org
83+
Description:
84+
Control scrubbing pages before returning them to Xen for others domains
85+
use. Can be set with xen_scrub_pages cmdline
86+
parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

‎Documentation/ABI/testing/sysfs-driver-xen-blkback

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,13 @@ Description:
1515
blkback. If the frontend tries to use more than
1616
max_persistent_grants, the LRU kicks in and starts
1717
removing 5% of max_persistent_grants every 100ms.
18+
19+
What: /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds
20+
Date: August 2018
21+
KernelVersion: 4.19
22+
Contact: Roger Pau Monné <roger.pau@citrix.com>
23+
Description:
24+
How long a persistent grant is allowed to remain
25+
allocated without being in use. The time is in
26+
seconds, 0 means indefinitely long.
27+
The default is 60 seconds.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3523,6 +3523,12 @@
35233523
ramdisk_size= [RAM] Sizes of RAM disks in kilobytes
35243524
See Documentation/blockdev/ramdisk.txt.
35253525

3526+
random.trust_cpu={on,off}
3527+
[KNL] Enable or disable trusting the use of the
3528+
CPU's random number generator (if available) to
3529+
fully seed the kernel's CRNG. Default is controlled
3530+
by CONFIG_RANDOM_TRUST_CPU.
3531+
35263532
ras=option[,option,...] [KNL] RAS-specific options
35273533

35283534
cec_disable [X86]
@@ -4994,6 +5000,12 @@
49945000
Disables the PV optimizations forcing the HVM guest to
49955001
run as generic HVM guest with no PV drivers.
49965002

5003+
xen_scrub_pages= [XEN]
5004+
Boolean option to control scrubbing pages before giving them back
5005+
to Xen, for use by other domains. Can be also changed at runtime
5006+
with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
5007+
Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
5008+
49975009
xirc2ps_cs= [NET,PCMCIA]
49985010
Format:
49995011
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

‎Documentation/arm64/sve.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
200200
thread.
201201

202202
* Changing the vector length causes all of P0..P15, FFR and all bits of
203-
Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
203+
Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
204204
unspecified. Calling PR_SVE_SET_VL with vl equal to the thread's current
205205
vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC
206206
flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References
500500
[2] arch/arm64/include/uapi/asm/ptrace.h
501501
AArch64 Linux ptrace ABI definitions
502502

503-
[3] linux/Documentation/arm64/cpu-feature-registers.txt
503+
[3] Documentation/arm64/cpu-feature-registers.txt
504504

505505
[4] ARM IHI0055C
506506
http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf

‎Documentation/device-mapper/dm-raid.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,7 @@ Version History
348348
1.13.1 Fix deadlock caused by early md_stop_writes(). Also fix size an
349349
state races.
350350
1.13.2 Fix raid redundancy validation and avoid keeping raid set frozen
351+
1.14.0 Fix reshape race on small devices. Fix stripe adding reshape
352+
deadlock/potential data corruption. Update superblock when
353+
specific devices are requested via rebuild. Fix RAID leg
354+
rebuild errors.

‎Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
Required properties:
44
- compatible :
55
- "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc
6-
- "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc
76
- reg : address and length of the lpi2c master registers
87
- interrupts : lpi2c interrupt
98
- clocks : lpi2c clock specifier
109

1110
Examples:
1211

1312
lpi2c7: lpi2c7@40a50000 {
14-
compatible = "fsl,imx8dv-lpi2c";
13+
compatible = "fsl,imx7ulp-lpi2c";
1514
reg = <0x40A50000 0x10000>;
1615
interrupt-parent = <&intc>;
1716
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

‎Documentation/devicetree/bindings/input/gpio-keys.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Device-Tree bindings for input/gpio_keys.c keyboard driver
1+
Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver
22

33
Required properties:
44
- compatible = "gpio-keys";

‎Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The RISC-V supervisor ISA manual specifies three interrupt sources that are
1111
attached to every HLIC: software interrupts, the timer interrupt, and external
1212
interrupts. Software interrupts are used to send IPIs between cores. The
1313
timer interrupt comes from an architecturally mandated real-time timer that is
14-
controller via Supervisor Binary Interface (SBI) calls and CSR reads. External
14+
controlled via Supervisor Binary Interface (SBI) calls and CSR reads. External
1515
interrupts connect all other device interrupts to the HLIC, which are routed
1616
via the platform-level interrupt controller (PLIC).
1717

@@ -25,7 +25,15 @@ in the system.
2525

2626
Required properties:
2727
- compatible : "riscv,cpu-intc"
28-
- #interrupt-cells : should be <1>
28+
- #interrupt-cells : should be <1>. The interrupt sources are defined by the
29+
RISC-V supervisor ISA manual, with only the following three interrupts being
30+
defined for supervisor mode:
31+
- Source 1 is the supervisor software interrupt, which can be sent by an SBI
32+
call and is reserved for use by software.
33+
- Source 5 is the supervisor timer interrupt, which can be configured by
34+
SBI calls and implements a one-shot timer.
35+
- Source 9 is the supervisor external interrupt, which chains to all other
36+
device interrupts.
2937
- interrupt-controller : Identifies the node as an interrupt controller
3038

3139
Furthermore, this interrupt-controller MUST be embedded inside the cpu
@@ -38,7 +46,7 @@ An example device tree entry for a HLIC is show below.
3846
...
3947
cpu1-intc: interrupt-controller {
4048
#interrupt-cells = <1>;
41-
compatible = "riscv,cpu-intc", "sifive,fu540-c000-cpu-intc";
49+
compatible = "sifive,fu540-c000-cpu-intc", "riscv,cpu-intc";
4250
interrupt-controller;
4351
};
4452
};

‎Documentation/devicetree/bindings/net/cpsw.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ Required properties:
1919
- slaves : Specifies number for slaves
2020
- active_slave : Specifies the slave to use for time stamping,
2121
ethtool and SIOCGMIIPHY
22+
- cpsw-phy-sel : Specifies the phandle to the CPSW phy mode selection
23+
device. See also cpsw-phy-sel.txt for it's binding.
24+
Note that in legacy cases cpsw-phy-sel may be
25+
a child device instead of a phandle.
2226

2327
Optional properties:
2428
- ti,hwmods : Must be "cpgmac0"
@@ -75,6 +79,7 @@ Examples:
7579
cpts_clock_mult = <0x80000000>;
7680
cpts_clock_shift = <29>;
7781
syscon = <&cm>;
82+
cpsw-phy-sel = <&phy_sel>;
7883
cpsw_emac0: slave@0 {
7984
phy_id = <&davinci_mdio>, <0>;
8085
phy-mode = "rgmii-txid";
@@ -103,6 +108,7 @@ Examples:
103108
cpts_clock_mult = <0x80000000>;
104109
cpts_clock_shift = <29>;
105110
syscon = <&cm>;
111+
cpsw-phy-sel = <&phy_sel>;
106112
cpsw_emac0: slave@0 {
107113
phy_id = <&davinci_mdio>, <0>;
108114
phy-mode = "rgmii-txid";

‎Documentation/devicetree/bindings/net/macb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required properties:
1010
Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
1111
the Cadence GEM, or the generic form: "cdns,gem".
1212
Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
13+
Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
1314
Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
1415
Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
1516
Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

‎Documentation/devicetree/bindings/net/sh_eth.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Required properties:
1616
"renesas,ether-r8a7794" if the device is a part of R8A7794 SoC.
1717
"renesas,gether-r8a77980" if the device is a part of R8A77980 SoC.
1818
"renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
19+
"renesas,ether-r7s9210" if the device is a part of R7S9210 SoC.
1920
"renesas,rcar-gen1-ether" for a generic R-Car Gen1 device.
2021
"renesas,rcar-gen2-ether" for a generic R-Car Gen2 or RZ/G1
2122
device.

‎Documentation/devicetree/bindings/sound/adi,adau1977.txt

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
Analog Devices ADAU1977/ADAU1978/ADAU1979
2+
3+
Datasheets:
4+
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf
5+
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf
6+
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf
7+
8+
This driver supports both the I2C and SPI bus.
9+
10+
Required properties:
11+
- compatible: Should contain one of the following:
12+
"adi,adau1977"
13+
"adi,adau1978"
14+
"adi,adau1979"
15+
16+
- AVDD-supply: analog power supply for the device, please consult
17+
Documentation/devicetree/bindings/regulator/regulator.txt
18+
19+
Optional properties:
20+
- reset-gpio: the reset pin for the chip, for more details consult
21+
Documentation/devicetree/bindings/gpio/gpio.txt
22+
23+
- DVDD-supply: supply voltage for the digital core, please consult
24+
Documentation/devicetree/bindings/regulator/regulator.txt
25+
26+
For required properties on SPI, please consult
27+
Documentation/devicetree/bindings/spi/spi-bus.txt
28+
29+
Required properties on I2C:
30+
31+
- reg: The i2c address. Value depends on the state of ADDR0
32+
and ADDR1, as wired in hardware.
33+
34+
Examples:
35+
36+
adau1977_spi: adau1977@0 {
37+
compatible = "adi,adau1977";
38+
spi-max-frequency = <600000>;
39+
40+
AVDD-supply = <&regulator>;
41+
DVDD-supply = <&regulator_digital>;
42+
43+
reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;
44+
};
45+
46+
adau1977_i2c: adau1977@11 {
47+
compatible = "adi,adau1977";
48+
reg = <0x11>;
49+
50+
AVDD-supply = <&regulator>;
51+
DVDD-supply = <&regulator_digital>;
52+
53+
reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;
54+
};

‎Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
* Amlogic Audio PDM input
2+
3+
Required properties:
4+
- compatible: 'amlogic,axg-pdm'
5+
- reg: physical base address of the controller and length of memory
6+
mapped region.
7+
- clocks: list of clock phandle, one for each entry clock-names.
8+
- clock-names: should contain the following:
9+
* "pclk" : peripheral clock.
10+
* "dclk" : pdm digital clock
11+
* "sysclk" : dsp system clock
12+
- #sound-dai-cells: must be 0.
13+
14+
Example of PDM on the A113 SoC:
15+
16+
pdm: audio-controller@ff632000 {
17+
compatible = "amlogic,axg-pdm";
18+
reg = <0x0 0xff632000 0x0 0x34>;
19+
#sound-dai-cells = <0>;
20+
clocks = <&clkc_audio AUD_CLKID_PDM>,
21+
<&clkc_audio AUD_CLKID_PDM_DCLK>,
22+
<&clkc_audio AUD_CLKID_PDM_SYSCLK>;
23+
clock-names = "pclk", "dclk", "sysclk";
24+
};

‎Documentation/devicetree/bindings/sound/cs42l51.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
CS42L51 audio CODEC
2+
3+
Optional properties:
4+
5+
- clocks : a list of phandles + clock-specifiers, one for each entry in
6+
clock-names
7+
8+
- clock-names : must contain "MCLK"
9+
10+
Example:
11+
12+
cs42l51: cs42l51@4a {
13+
compatible = "cirrus,cs42l51";
14+
reg = <0x4a>;
15+
clocks = <&mclk_prov>;
16+
clock-names = "MCLK";
17+
};

‎Documentation/devicetree/bindings/sound/maxim,max98088.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
MAX98088 audio CODEC
2+
3+
This device supports I2C only.
4+
5+
Required properties:
6+
7+
- compatible: "maxim,max98088" or "maxim,max98089".
8+
- reg: The I2C address of the device.
9+
10+
Optional properties:
11+
12+
- clocks: the clock provider of MCLK, see ../clock/clock-bindings.txt section
13+
"consumer" for more information.
14+
- clock-names: must be set to "mclk"
15+
16+
Example:
17+
18+
max98089: codec@10 {
19+
compatible = "maxim,max98089";
20+
reg = <0x10>;
21+
clocks = <&clks IMX6QDL_CLK_CKO2>;
22+
clock-names = "mclk";
23+
};

‎Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Mikroe-PROTO audio board
2+
3+
Required properties:
4+
- compatible: "mikroe,mikroe-proto"
5+
- dai-format: Must be "i2s".
6+
- i2s-controller: The phandle of the I2S controller.
7+
- audio-codec: The phandle of the WM8731 audio codec.
8+
Optional properties:
9+
- model: The user-visible name of this sound complex.
10+
- bitclock-master: Indicates dai-link bit clock master; for details see simple-card.txt (1).
11+
- frame-master: Indicates dai-link frame master; for details see simple-card.txt (1).
12+
13+
(1) : There must be the same master for both bit and frame clocks.
14+
15+
Example:
16+
sound {
17+
compatible = "mikroe,mikroe-proto";
18+
model = "wm8731 @ sama5d2_xplained";
19+
i2s-controller = <&i2s0>;
20+
audio-codec = <&wm8731>;
21+
dai-format = "i2s";
22+
};
23+
};

‎Documentation/devicetree/bindings/sound/nau8822.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
NAU8822 audio CODEC
2+
3+
This device supports I2C only.
4+
5+
Required properties:
6+
7+
- compatible : "nuvoton,nau8822"
8+
9+
- reg : the I2C address of the device.
10+
11+
Example:
12+
13+
codec: nau8822@1a {
14+
compatible = "nuvoton,nau8822";
15+
reg = <0x1a>;
16+
};

‎Documentation/devicetree/bindings/sound/pcm3060.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
PCM3060 audio CODEC
2+
3+
This driver supports both I2C and SPI.
4+
5+
Required properties:
6+
7+
- compatible: "ti,pcm3060"
8+
9+
- reg : the I2C address of the device for I2C, the chip select
10+
number for SPI.
11+
12+
Examples:
13+
14+
pcm3060: pcm3060@46 {
15+
compatible = "ti,pcm3060";
16+
reg = <0x46>;
17+
};

0 commit comments

Comments
 (0)