Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 08c191d

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19 A few last minute fixes for v3.19, all driver specific. None of them stand out particularly - it's all the standard people who are affected will care stuff. The Samsung fix is a DT only fix for the audio controller, it's being merged via the ASoC tree due to process messups (the submitter sent it at the end of a tangentally related series rather than separately to the ARM folks) in order to make sure that it gets to people sooner.
2 parents 4161b45 + c503ca5 commit 08c191d

File tree

226 files changed

+2384
-1312
lines changed

Some content is hidden

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

226 files changed

+2384
-1312
lines changed

‎Documentation/devicetree/bindings/i2c/i2c-st.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ i2c0: i2c@fed40000 {
3131
compatible = "st,comms-ssc4-i2c";
3232
reg = <0xfed40000 0x110>;
3333
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
34-
clocks = <&CLK_S_ICN_REG_0>;
34+
clocks = <&clk_s_a0_ls CLK_ICN_REG>;
3535
clock-names = "ssc";
3636
clock-frequency = <400000>;
3737
pinctrl-names = "default";

‎Documentation/devicetree/bindings/i2c/trivial-devices.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM
4747
dallas,ds4510 CPU Supervisor with Nonvolatile Memory and Programmable I/O
4848
dallas,ds75 Digital Thermometer and Thermostat
4949
dlg,da9053 DA9053: flexible system level PMIC with multicore support
50+
dlg,da9063 DA9063: system PMIC for quad-core application processors
5051
epson,rx8025 High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
5152
epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE
5253
fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

‎MAINTAINERS‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd*
708708
F: drivers/staging/iio/*/ad*
709709
F: staging/iio/trigger/iio-trig-bfin-timer.c
710710

711+
ANDROID DRIVERS
712+
M: Greg Kroah-Hartman <[email protected]>
713+
M: Arve Hj�nnev�g <[email protected]>
714+
M: Riley Andrews <[email protected]>
715+
T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
716+
L: [email protected]
717+
S: Supported
718+
F: drivers/android/
719+
F: drivers/staging/android/
720+
711721
AOA (Apple Onboard Audio) ALSA DRIVER
712722
M: Johannes Berg <[email protected]>
713723
L: [email protected]
@@ -4943,6 +4953,16 @@ F: Documentation/input/multi-touch-protocol.txt
49434953
F: drivers/input/input-mt.c
49444954
K: \b(ABS|SYN)_MT_
49454955

4956+
INTEL ASoC BDW/HSW DRIVERS
4957+
M: Jie Yang <[email protected]>
4958+
L: [email protected]
4959+
S: Supported
4960+
F: sound/soc/intel/sst-haswell*
4961+
F: sound/soc/intel/sst-dsp*
4962+
F: sound/soc/intel/sst-firmware.c
4963+
F: sound/soc/intel/broadwell.c
4964+
F: sound/soc/intel/haswell.c
4965+
49464966
INTEL C600 SERIES SAS CONTROLLER DRIVER
49474967
M: Intel SCU Linux support <[email protected]>
49484968
M: Artur Paszkiewicz <[email protected]>
@@ -10166,6 +10186,7 @@ USERSPACE I/O (UIO)
1016610186
M: "Hans J. Koch" <[email protected]>
1016710187
M: Greg Kroah-Hartman <[email protected]>
1016810188
S: Maintained
10189+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
1016910190
F: Documentation/DocBook/uio-howto.tmpl
1017010191
F: drivers/uio/
1017110192
F: include/linux/uio*.h

‎Makefile‎

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

77
# *DOCUMENTATION*

‎arch/alpha/mm/fault.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
156156
if (unlikely(fault & VM_FAULT_ERROR)) {
157157
if (fault & VM_FAULT_OOM)
158158
goto out_of_memory;
159+
else if (fault & VM_FAULT_SIGSEGV)
160+
goto bad_area;
159161
else if (fault & VM_FAULT_SIGBUS)
160162
goto do_sigbus;
161163
BUG();

‎arch/arc/mm/fault.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)
161161

162162
if (fault & VM_FAULT_OOM)
163163
goto out_of_memory;
164+
else if (fault & VM_FAULT_SIGSEGV)
165+
goto bad_area;
164166
else if (fault & VM_FAULT_SIGBUS)
165167
goto do_sigbus;
166168

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
};
369369

370370
i2s1: i2s@13960000 {
371-
compatible = "samsung,s5pv210-i2s";
371+
compatible = "samsung,s3c6410-i2s";
372372
reg = <0x13960000 0x100>;
373373
clocks = <&clock CLK_I2S1>;
374374
clock-names = "iis";
@@ -378,7 +378,7 @@
378378
};
379379

380380
i2s2: i2s@13970000 {
381-
compatible = "samsung,s5pv210-i2s";
381+
compatible = "samsung,s3c6410-i2s";
382382
reg = <0x13970000 0x100>;
383383
clocks = <&clock CLK_I2S2>;
384384
clock-names = "iis";

‎arch/arm/boot/dts/imx6sx-sdb.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@
166166
#address-cells = <1>;
167167
#size-cells = <0>;
168168

169-
ethphy1: ethernet-phy@0 {
170-
reg = <0>;
169+
ethphy1: ethernet-phy@1 {
170+
reg = <1>;
171171
};
172172

173-
ethphy2: ethernet-phy@1 {
174-
reg = <1>;
173+
ethphy2: ethernet-phy@2 {
174+
reg = <2>;
175175
};
176176
};
177177
};

‎arch/arm/boot/dts/sun4i-a10.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717

1818
aliases {
1919
ethernet0 = &emac;
20-
serial0 = &uart0;
21-
serial1 = &uart1;
22-
serial2 = &uart2;
23-
serial3 = &uart3;
24-
serial4 = &uart4;
25-
serial5 = &uart5;
26-
serial6 = &uart6;
27-
serial7 = &uart7;
2820
};
2921

3022
chosen {
@@ -39,6 +31,14 @@
3931
<&ahb_gates 44>;
4032
status = "disabled";
4133
};
34+
35+
framebuffer@1 {
36+
compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
37+
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
38+
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
39+
<&ahb_gates 44>, <&ahb_gates 46>;
40+
status = "disabled";
41+
};
4242
};
4343

4444
cpus {
@@ -438,8 +438,8 @@
438438
reg-names = "phy_ctrl", "pmu1", "pmu2";
439439
clocks = <&usb_clk 8>;
440440
clock-names = "usb_phy";
441-
resets = <&usb_clk 1>, <&usb_clk 2>;
442-
reset-names = "usb1_reset", "usb2_reset";
441+
resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
442+
reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
443443
status = "disabled";
444444
};
445445

‎arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555
model = "Olimex A10s-Olinuxino Micro";
5656
compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";
5757

58+
aliases {
59+
serial0 = &uart0;
60+
serial1 = &uart2;
61+
serial2 = &uart3;
62+
};
63+
5864
soc@01c00000 {
5965
emac: ethernet@01c0b000 {
6066
pinctrl-names = "default";

0 commit comments

Comments
 (0)