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
1009M: Jason Cooper <jason@lakedaemon.net>1009M: Jason Cooper <jason@lakedaemon.net>
1010M: Andrew Lunn <andrew@lunn.ch>1010M: Andrew Lunn <andrew@lunn.ch>
1011M: Gregory Clement <gregory.clement@free-electrons.com>1011M: Gregory Clement <gregory.clement@free-electrons.com>
1012M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1012L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)1013L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1013S: Maintained1014S: Maintained
1014F: arch/arm/mach-mvebu/1015F: arch/arm/mach-mvebu/
@@ -1016,6 +1017,7 @@ F: arch/arm/mach-mvebu/ · 1 unmodified line
1016ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support1017ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
1017M: Jason Cooper <jason@lakedaemon.net>1018M: Jason Cooper <jason@lakedaemon.net>
1018M: Andrew Lunn <andrew@lunn.ch>1019M: Andrew Lunn <andrew@lunn.ch>
1020M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1019L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)1021L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1020S: Maintained1022S: Maintained
1021F: arch/arm/mach-dove/1023F: arch/arm/mach-dove/
@@ -1148,6 +1150,13 @@ F: drivers/net/ethernet/i825xx/ether1* · 126 unmodified lines
1148F: drivers/net/ethernet/seeq/ether3*1150F: drivers/net/ethernet/seeq/ether3*
1149F: drivers/scsi/arm/1151F: drivers/scsi/arm/
1150 1152
1153ARM/Rockchip SoC support
1154M: Heiko Stuebner <heiko@sntech.de>
1155L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1156S: Maintained
1157F: arch/arm/mach-rockchip/
1158F: drivers/*/*rockchip*
1159
1151ARM/SHARK MACHINE SUPPORT1160ARM/SHARK MACHINE SUPPORT
1152M: Alexander Schulz <alex@shark-linux.de>1161M: Alexander Schulz <alex@shark-linux.de>
1153W: http://www.shark-linux.de/shark.html1162W: http://www.shark-linux.de/shark.html
@@ -2822,7 +2831,7 @@ M: Terje Bergström <tbergstrom@nvidia.com> · 1668 unmodified lines
2822L: dri-devel@lists.freedesktop.org2831L: dri-devel@lists.freedesktop.org
2823L: linux-tegra@vger.kernel.org2832L: linux-tegra@vger.kernel.org
2824T: git git://anongit.freedesktop.org/tegra/linux.git2833T: git git://anongit.freedesktop.org/tegra/linux.git
2825S: Maintained2834S: Supported
2826F: drivers/gpu/host1x/2835F: drivers/gpu/host1x/
2827F: include/uapi/drm/tegra_drm.h2836F: include/uapi/drm/tegra_drm.h
2828F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt2837F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -8302,14 +8311,72 @@ L: linux-media@vger.kernel.org · 5473 unmodified lines
8302S: Maintained8311S: Maintained
8303F: drivers/media/rc/ttusbir.c8312F: drivers/media/rc/ttusbir.c
8304 8313
8305TEGRA SUPPORT8314TEGRA ARCHITECTURE SUPPORT
8306M: Stephen Warren <swarren@wwwdotorg.org>8315M: Stephen Warren <swarren@wwwdotorg.org>
8316M: Thierry Reding <thierry.reding@gmail.com>
8307L: linux-tegra@vger.kernel.org8317L: linux-tegra@vger.kernel.org
8308Q: http://patchwork.ozlabs.org/project/linux-tegra/list/8318Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
8309T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git8319T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
8310S: Supported8320S: Supported
8311N: [^a-z]tegra8321N: [^a-z]tegra
8312 8322
8323TEGRA ASOC DRIVER
8324M: Stephen Warren <swarren@wwwdotorg.org>
8325S: Supported
8326F: sound/soc/tegra/
8327
8328TEGRA CLOCK DRIVER
8329M: Peter De Schrijver <pdeschrijver@nvidia.com>
8330M: Prashant Gaikwad <pgaikwad@nvidia.com>
8331S: Supported
8332F: drivers/clk/tegra/
8333
8334TEGRA DMA DRIVER
8335M: Laxman Dewangan <ldewangan@nvidia.com>
8336S: Supported
8337F: drivers/dma/tegra20-apb-dma.c
8338
8339TEGRA GPIO DRIVER
8340M: Stephen Warren <swarren@wwwdotorg.org>
8341S: Supported
8342F: drivers/gpio/gpio-tegra.c
8343
8344TEGRA I2C DRIVER
8345M: Laxman Dewangan <ldewangan@nvidia.com>
8346S: Supported
8347F: drivers/i2c/busses/i2c-tegra.c
8348
8349TEGRA IOMMU DRIVERS
8350M: Hiroshi Doyu <hdoyu@nvidia.com>
8351S: Supported
8352F: drivers/iommu/tegra*
8353
8354TEGRA KBC DRIVER
8355M: Rakesh Iyer <riyer@nvidia.com>
8356M: Laxman Dewangan <ldewangan@nvidia.com>
8357S: Supported
8358F: drivers/input/keyboard/tegra-kbc.c
8359
8360TEGRA PINCTRL DRIVER
8361M: Stephen Warren <swarren@wwwdotorg.org>
8362S: Supported
8363F: drivers/pinctrl/pinctrl-tegra*
8364
8365TEGRA PWM DRIVER
8366M: Thierry Reding <thierry.reding@gmail.com>
8367S: Supported
8368F: drivers/pwm/pwm-tegra.c
8369
8370TEGRA SERIAL DRIVER
8371M: Laxman Dewangan <ldewangan@nvidia.com>
8372S: Supported
8373F: drivers/tty/serial/serial-tegra.c
8374
8375TEGRA SPI DRIVER
8376M: Laxman Dewangan <ldewangan@nvidia.com>
8377S: Supported
8378F: drivers/spi/spi-tegra*
8379
8313TEHUTI ETHERNET DRIVER8380TEHUTI ETHERNET DRIVER
8314M: Andy Gospodarek <andy@greyhouse.net>8381M: Andy Gospodarek <andy@greyhouse.net>
8315L: netdev@vger.kernel.org8382L: netdev@vger.kernel.org
arch/arm/boot/dts/integratorcp.dts+4−5
@@ -9,11 +9,6 @@ · 8 unmodified lines
9 model = "ARM Integrator/CP";9 model = "ARM Integrator/CP";
10 compatible = "arm,integrator-cp";10 compatible = "arm,integrator-cp";
11 11
12 aliases {
13 arm,timer-primary = &timer2;
14 arm,timer-secondary = &timer1;
15 };
16
17 chosen {12 chosen {
18 bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";13 bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
19 };14 };
@@ -24,14 +19,18 @@ · 4 unmodified lines
24 };19 };
25 20
26 timer0: timer@13000000 {21 timer0: timer@13000000 {
22 /* TIMER0 runs @ 25MHz */
27 compatible = "arm,integrator-cp-timer";23 compatible = "arm,integrator-cp-timer";
24 status = "disabled";
28 };25 };
29 26
30 timer1: timer@13000100 {27 timer1: timer@13000100 {
28 /* TIMER1 runs @ 1MHz */
31 compatible = "arm,integrator-cp-timer";29 compatible = "arm,integrator-cp-timer";
32 };30 };
33 31
34 timer2: timer@13000200 {32 timer2: timer@13000200 {
33 /* TIMER2 runs @ 1MHz */
35 compatible = "arm,integrator-cp-timer";34 compatible = "arm,integrator-cp-timer";
36 };35 };
37 36