Merge branch 'next/soc' into HEAD

Browse source

Conflicts:
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	drivers/clocksource/Makefile

...

This commit is contained in:

Olof Johansson 2012-10-01 14:19:17 -07:00

parent f7b967bffe b6e3b5c2fe

commit 6d55d5968a

86 changed files with 10542 additions and 5039 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

Documentation/devicetree/bindings/arm/bcm2835.txt

View file

110

Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

View file

22

Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

10

MAINTAINERS

View file

18

arch/arm/Kconfig

View file

1

arch/arm/Makefile

View file

12

arch/arm/boot/dts/bcm2835-rpi-b.dts

View file

39

arch/arm/boot/dts/bcm2835.dtsi

View file

95

arch/arm/configs/bcm2835_defconfig

View file

1

arch/arm/configs/kzm9d_defconfig

View file

1

arch/arm/configs/kzm9g_defconfig

View file

1

arch/arm/mach-bcm2835/Makefile

View file

5

arch/arm/mach-bcm2835/Makefile.boot

View file

64

arch/arm/mach-bcm2835/bcm2835.c

View file

29

arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h

View file

21

arch/arm/mach-bcm2835/include/mach/debug-macro.S

View file

26

arch/arm/mach-bcm2835/include/mach/timex.h

View file

45

arch/arm/mach-bcm2835/include/mach/uncompress.h

View file

4

arch/arm/mach-exynos/Kconfig

View file

31

arch/arm/mach-exynos/clock-exynos4.c

View file

32

arch/arm/mach-exynos/clock-exynos5.c

View file

11

arch/arm/mach-imx/clk-imx35.c

View file

14

arch/arm/mach-imx/clk-imx51-imx53.c

View file

2

arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h

View file

7

arch/arm/mach-lpc32xx/irq.c

View file

42

arch/arm/mach-lpc32xx/phy3250.c

View file

1

arch/arm/mach-omap2/Makefile

View file

4

arch/arm/mach-omap2/clkt_dpll.c

View file

2

arch/arm/mach-omap2/clock33xx_data.c

View file

4

arch/arm/mach-omap2/dpll3xxx.c

View file

2

arch/arm/mach-omap2/io.c

View file

178

arch/arm/mach-omap2/omap_hwmod.c

View file

3381

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

View file

File diff suppressed because it is too large Load diff

14

arch/arm/mach-s3c24xx/clock-s3c2440.c

View file

8

arch/arm/mach-shmobile/board-kzm9g.c

View file

11

arch/arm/mach-shmobile/clock-r8a7779.c

View file

21

arch/arm/mach-shmobile/setup-emev2.c

View file

21

arch/arm/mach-shmobile/setup-sh73a0.c

View file

6

arch/arm/mach-tegra/Makefile

View file

1

arch/arm/mach-tegra/board-dt-tegra20.c

View file

576

arch/arm/mach-tegra/clock.c

View file

40

arch/arm/mach-tegra/clock.h

View file

4

arch/arm/mach-tegra/common.c

View file

48

arch/arm/mach-tegra/cpu-tegra.c

View file

6

arch/arm/mach-tegra/headsmp.S

View file

118

arch/arm/mach-tegra/hotplug.c

View file

3

arch/arm/mach-tegra/include/mach/clk.h

View file

29

arch/arm/mach-tegra/platsmp.c

View file

82

arch/arm/mach-tegra/sleep-t20.S

View file

107

arch/arm/mach-tegra/sleep-t30.S

View file

33

arch/arm/mach-tegra/sleep.S

View file

85

arch/arm/mach-tegra/sleep.h

View file

1625

arch/arm/mach-tegra/tegra20_clocks.c

View file

42

arch/arm/mach-tegra/tegra20_clocks.h

View file

1144

arch/arm/mach-tegra/tegra20_clocks_data.c

View file

2484

arch/arm/mach-tegra/tegra2_clocks.c

View file

2611

arch/arm/mach-tegra/tegra30_clocks.c

View file

File diff suppressed because it is too large Load diff

53

arch/arm/mach-tegra/tegra30_clocks.h

View file

1372

arch/arm/mach-tegra/tegra30_clocks_data.c

View file

87

arch/arm/mach-tegra/tegra_cpu_car.h

View file

2

arch/arm/mach-ux500/cache-l2x0.c

View file

2

arch/arm/mach-ux500/cpu-db8500.c

View file

2

arch/arm/mach-ux500/cpu.c

View file

54

arch/arm/mach-ux500/include/mach/id.h

View file

4

arch/arm/mach-ux500/platsmp.c

View file

2

arch/arm/mach-ux500/timer.c

View file

5

arch/arm/plat-mxc/include/mach/iomux-mx3.h

View file

89

arch/arm/plat-mxc/ssi-fiq.S

View file

2

arch/arm/plat-omap/include/plat/omap_device.h

View file

1

arch/arm/plat-omap/include/plat/omap_hwmod.h

View file

56

arch/arm/plat-omap/omap_device.c

View file

8

arch/arm/plat-samsung/clock.c

View file

3

arch/arm/plat-samsung/devs.c

View file

2

drivers/Kconfig

View file

2

drivers/Makefile

View file

1

drivers/clk/Makefile

View file

59

drivers/clk/clk-bcm2835.c

View file

1

drivers/clocksource/Makefile

View file

161

drivers/clocksource/bcm2835_timer.c

View file

1

drivers/irqchip/Kconfig

View file

1

drivers/irqchip/Makefile

View file

223

drivers/irqchip/irq-bcm2835.c

View file

22

include/linux/bcm2835_timer.h

View file

24

include/linux/clk/bcm2835.h

View file

29

include/linux/irqchip/bcm2835.h

View file