Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"There's really only one bugfix in this branch, which is a fix for
timers on the integrator platform. Since Linus Walleij is
resurrecting support for the platform it seems valuable to get the fix
into 3.12 even though the regression has been around a while.
The rest are a handful of maintainers updates. If you prefer to hold
those until 3.13 then just merge the first patch on the branch which
is the fix"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: Add maintainers entry for Rockchip SoCs
MAINTAINERS: Tegra updates, and driver ownership
MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
ARM: integrator: deactivate timer0 on the Integrator/CP
+73
-7
+69
-2
MAINTAINERS
+69
-2
MAINTAINERS
···
1009
1009
M: Jason Cooper <jason@lakedaemon.net>
1010
1010
M: Andrew Lunn <andrew@lunn.ch>
1011
1011
M: Gregory Clement <gregory.clement@free-electrons.com>
1012
+
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1012
1013
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1013
1014
S: Maintained
1014
1015
F: arch/arm/mach-mvebu/
···
1017
1016
ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
1018
1017
M: Jason Cooper <jason@lakedaemon.net>
1019
1018
M: Andrew Lunn <andrew@lunn.ch>
1019
+
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1020
1020
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1021
1021
S: Maintained
1022
1022
F: arch/arm/mach-dove/
···
1149
1147
F: drivers/net/ethernet/i825xx/ether1*
1150
1148
F: drivers/net/ethernet/seeq/ether3*
1151
1149
F: drivers/scsi/arm/
1150
+
1151
+
ARM/Rockchip SoC support
1152
+
M: Heiko Stuebner <heiko@sntech.de>
1153
+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1154
+
S: Maintained
1155
+
F: arch/arm/mach-rockchip/
1156
+
F: drivers/*/*rockchip*
1152
1157
1153
1158
ARM/SHARK MACHINE SUPPORT
1154
1159
M: Alexander Schulz <alex@shark-linux.de>
···
2831
2822
L: dri-devel@lists.freedesktop.org
2832
2823
L: linux-tegra@vger.kernel.org
2833
2824
T: git git://anongit.freedesktop.org/tegra/linux.git
2834
-
S: Maintained
2825
+
S: Supported
2835
2826
F: drivers/gpu/host1x/
2836
2827
F: include/uapi/drm/tegra_drm.h
2837
2828
F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
···
8311
8302
S: Maintained
8312
8303
F: drivers/media/rc/ttusbir.c
8313
8304
8314
-
TEGRA SUPPORT
8305
+
TEGRA ARCHITECTURE SUPPORT
8315
8306
M: Stephen Warren <swarren@wwwdotorg.org>
8307
+
M: Thierry Reding <thierry.reding@gmail.com>
8316
8308
L: linux-tegra@vger.kernel.org
8317
8309
Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
8318
8310
T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
8319
8311
S: Supported
8320
8312
N: [^a-z]tegra
8313
+
8314
+
TEGRA ASOC DRIVER
8315
+
M: Stephen Warren <swarren@wwwdotorg.org>
8316
+
S: Supported
8317
+
F: sound/soc/tegra/
8318
+
8319
+
TEGRA CLOCK DRIVER
8320
+
M: Peter De Schrijver <pdeschrijver@nvidia.com>
8321
+
M: Prashant Gaikwad <pgaikwad@nvidia.com>
8322
+
S: Supported
8323
+
F: drivers/clk/tegra/
8324
+
8325
+
TEGRA DMA DRIVER
8326
+
M: Laxman Dewangan <ldewangan@nvidia.com>
8327
+
S: Supported
8328
+
F: drivers/dma/tegra20-apb-dma.c
8329
+
8330
+
TEGRA GPIO DRIVER
8331
+
M: Stephen Warren <swarren@wwwdotorg.org>
8332
+
S: Supported
8333
+
F: drivers/gpio/gpio-tegra.c
8334
+
8335
+
TEGRA I2C DRIVER
8336
+
M: Laxman Dewangan <ldewangan@nvidia.com>
8337
+
S: Supported
8338
+
F: drivers/i2c/busses/i2c-tegra.c
8339
+
8340
+
TEGRA IOMMU DRIVERS
8341
+
M: Hiroshi Doyu <hdoyu@nvidia.com>
8342
+
S: Supported
8343
+
F: drivers/iommu/tegra*
8344
+
8345
+
TEGRA KBC DRIVER
8346
+
M: Rakesh Iyer <riyer@nvidia.com>
8347
+
M: Laxman Dewangan <ldewangan@nvidia.com>
8348
+
S: Supported
8349
+
F: drivers/input/keyboard/tegra-kbc.c
8350
+
8351
+
TEGRA PINCTRL DRIVER
8352
+
M: Stephen Warren <swarren@wwwdotorg.org>
8353
+
S: Supported
8354
+
F: drivers/pinctrl/pinctrl-tegra*
8355
+
8356
+
TEGRA PWM DRIVER
8357
+
M: Thierry Reding <thierry.reding@gmail.com>
8358
+
S: Supported
8359
+
F: drivers/pwm/pwm-tegra.c
8360
+
8361
+
TEGRA SERIAL DRIVER
8362
+
M: Laxman Dewangan <ldewangan@nvidia.com>
8363
+
S: Supported
8364
+
F: drivers/tty/serial/serial-tegra.c
8365
+
8366
+
TEGRA SPI DRIVER
8367
+
M: Laxman Dewangan <ldewangan@nvidia.com>
8368
+
S: Supported
8369
+
F: drivers/spi/spi-tegra*
8321
8370
8322
8371
TEHUTI ETHERNET DRIVER
8323
8372
M: Andy Gospodarek <andy@greyhouse.net>
+4
-5
arch/arm/boot/dts/integratorcp.dts
+4
-5
arch/arm/boot/dts/integratorcp.dts
···
9
9
model = "ARM Integrator/CP";
10
10
compatible = "arm,integrator-cp";
11
11
12
-
aliases {
13
-
arm,timer-primary = &timer2;
14
-
arm,timer-secondary = &timer1;
15
-
};
16
-
17
12
chosen {
18
13
bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
19
14
};
···
19
24
};
20
25
21
26
timer0: timer@13000000 {
27
+
/* TIMER0 runs @ 25MHz */
22
28
compatible = "arm,integrator-cp-timer";
29
+
status = "disabled";
23
30
};
24
31
25
32
timer1: timer@13000100 {
33
+
/* TIMER1 runs @ 1MHz */
26
34
compatible = "arm,integrator-cp-timer";
27
35
};
28
36
29
37
timer2: timer@13000200 {
38
+
/* TIMER2 runs @ 1MHz */
30
39
compatible = "arm,integrator-cp-timer";
31
40
};
32
41