History

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

Linus Torvalds committed 13 years ago

Commit 4208c472 parents 88829df 08ddbb02 files · +73 −7Browse files

Unified · Split

2 files
  1. MAINTAINERS +69 −2
  2. arch/arm/boot/dts/integratorcp.dts +4 −5
MAINTAINERS+69−2
@@ -1009,6 +1009,7 @@ ARM/Marvell Armada 370 and Armada XP SOC support · 1008 unmodified lines
10091009 M: Jason Cooper <jason@lakedaemon.net>
10101010 M: Andrew Lunn <andrew@lunn.ch>
10111011 M: Gregory Clement <gregory.clement@free-electrons.com>
1012+M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10121013 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10131014 S: Maintained
10141015 F: arch/arm/mach-mvebu/
@@ -1016,6 +1017,7 @@ F: arch/arm/mach-mvebu/ · 1 unmodified line
10161017 ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
10171018 M: Jason Cooper <jason@lakedaemon.net>
10181019 M: Andrew Lunn <andrew@lunn.ch>
1020+M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10191021 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10201022 S: Maintained
10211023 F: arch/arm/mach-dove/
@@ -1148,6 +1150,13 @@ F: drivers/net/ethernet/i825xx/ether1* · 126 unmodified lines
11481150 F: drivers/net/ethernet/seeq/ether3*
11491151 F: drivers/scsi/arm/
11501152
1153+ARM/Rockchip SoC support
1154+M: Heiko Stuebner <heiko@sntech.de>
1155+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1156+S: Maintained
1157+F: arch/arm/mach-rockchip/
1158+F: drivers/*/*rockchip*
1159+
11511160 ARM/SHARK MACHINE SUPPORT
11521161 M: Alexander Schulz <alex@shark-linux.de>
11531162 W: http://www.shark-linux.de/shark.html
@@ -2822,7 +2831,7 @@ M: Terje Bergström <tbergstrom@nvidia.com> · 1668 unmodified lines
28222831 L: dri-devel@lists.freedesktop.org
28232832 L: linux-tegra@vger.kernel.org
28242833 T: git git://anongit.freedesktop.org/tegra/linux.git
2825−S: Maintained
2834+S: Supported
28262835 F: drivers/gpu/host1x/
28272836 F: include/uapi/drm/tegra_drm.h
28282837 F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -8302,14 +8311,72 @@ L: linux-media@vger.kernel.org · 5473 unmodified lines
83028311 S: Maintained
83038312 F: drivers/media/rc/ttusbir.c
83048313
8305−TEGRA SUPPORT
8314+TEGRA ARCHITECTURE SUPPORT
83068315 M: Stephen Warren <swarren@wwwdotorg.org>
8316+M: Thierry Reding <thierry.reding@gmail.com>
83078317 L: linux-tegra@vger.kernel.org
83088318 Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
83098319 T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
83108320 S: Supported
83118321 N: [^a-z]tegra
83128322
8323+TEGRA ASOC DRIVER
8324+M: Stephen Warren <swarren@wwwdotorg.org>
8325+S: Supported
8326+F: sound/soc/tegra/
8327+
8328+TEGRA CLOCK DRIVER
8329+M: Peter De Schrijver <pdeschrijver@nvidia.com>
8330+M: Prashant Gaikwad <pgaikwad@nvidia.com>
8331+S: Supported
8332+F: drivers/clk/tegra/
8333+
8334+TEGRA DMA DRIVER
8335+M: Laxman Dewangan <ldewangan@nvidia.com>
8336+S: Supported
8337+F: drivers/dma/tegra20-apb-dma.c
8338+
8339+TEGRA GPIO DRIVER
8340+M: Stephen Warren <swarren@wwwdotorg.org>
8341+S: Supported
8342+F: drivers/gpio/gpio-tegra.c
8343+
8344+TEGRA I2C DRIVER
8345+M: Laxman Dewangan <ldewangan@nvidia.com>
8346+S: Supported
8347+F: drivers/i2c/busses/i2c-tegra.c
8348+
8349+TEGRA IOMMU DRIVERS
8350+M: Hiroshi Doyu <hdoyu@nvidia.com>
8351+S: Supported
8352+F: drivers/iommu/tegra*
8353+
8354+TEGRA KBC DRIVER
8355+M: Rakesh Iyer <riyer@nvidia.com>
8356+M: Laxman Dewangan <ldewangan@nvidia.com>
8357+S: Supported
8358+F: drivers/input/keyboard/tegra-kbc.c
8359+
8360+TEGRA PINCTRL DRIVER
8361+M: Stephen Warren <swarren@wwwdotorg.org>
8362+S: Supported
8363+F: drivers/pinctrl/pinctrl-tegra*
8364+
8365+TEGRA PWM DRIVER
8366+M: Thierry Reding <thierry.reding@gmail.com>
8367+S: Supported
8368+F: drivers/pwm/pwm-tegra.c
8369+
8370+TEGRA SERIAL DRIVER
8371+M: Laxman Dewangan <ldewangan@nvidia.com>
8372+S: Supported
8373+F: drivers/tty/serial/serial-tegra.c
8374+
8375+TEGRA SPI DRIVER
8376+M: Laxman Dewangan <ldewangan@nvidia.com>
8377+S: Supported
8378+F: drivers/spi/spi-tegra*
8379+
83138380 TEHUTI ETHERNET DRIVER
83148381 M: Andy Gospodarek <andy@greyhouse.net>
83158382 L: netdev@vger.kernel.org
arch/arm/boot/dts/integratorcp.dts+4−5
@@ -9,11 +9,6 @@ · 8 unmodified lines
99 model = "ARM Integrator/CP";
1010 compatible = "arm,integrator-cp";
1111
12− aliases {
13− arm,timer-primary = &timer2;
14− arm,timer-secondary = &timer1;
15− };
16−
1712 chosen {
1813 bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
1914 };
@@ -24,14 +19,18 @@ · 4 unmodified lines
2419 };
2520
2621 timer0: timer@13000000 {
22+ /* TIMER0 runs @ 25MHz */
2723 compatible = "arm,integrator-cp-timer";
24+ status = "disabled";
2825 };
2926
3027 timer1: timer@13000100 {
28+ /* TIMER1 runs @ 1MHz */
3129 compatible = "arm,integrator-cp-timer";
3230 };
3331
3432 timer2: timer@13000200 {
33+ /* TIMER2 runs @ 1MHz */
3534 compatible = "arm,integrator-cp-timer";
3635 };
3736