Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

d027db13 · Linus Torvalds <[email protected]> · 2012-12-12 12:05:15 -08:00

Pull ARM SoC updates from Olof Johansson:
 "This contains the bulk of new SoC development for this merge window.

  Two new platforms have been added, the sunxi platforms (Allwinner A1x
  SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
  series of ARMv7 platforms from them, where the hope is that we can
  keep the platform code generic enough to have them all share one mach
  directory.  The new Broadcom platform is contributed by Christian
  Daudt.

  Highbank has grown support for Calxeda's next generation of hardware,
  ECX-2000.

  clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
  also taken on maintainership of the platform.

  Beyond this there has been a bunch of work from a number of people on
  converting more platforms to IRQ domains, pinctrl conversion, cleanup
  and general feature enablement across most of the active platforms."

Fix up trivial conflicts as per Olof.

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
  mfd: vexpress-sysreg: Remove LEDs code
  irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
  clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
  irq: versatile: delete dangling variable
  ARM: sunxi: add missing include for mdelay()
  ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
  ARM: dts: add node for PL330 MDMA1 controller for exynos4
  ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
  ARM: EXYNOS: add UART3 to DEBUG_LL ports
  ARM: S3C24XX: Add clkdev entry for camif-upll clock
  ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
  ARM: sunxi: Add missing sun4i.dtsi file
  pinctrl: samsung: Do not initialise statics to 0
  ARM i.MX6: remove gate_mask from pllv3
  ARM i.MX6: Fix ethernet PLL clocks
  ARM i.MX6: rename PLLs according to datasheet
  ARM i.MX6: Add pwm support
  ARM i.MX51: Add pwm support
  ARM i.MX53: Add pwm support
  ARM: mx5: Replace clk_register_clkdev with clock DT lookup
  ...

Commit: d027db132b395dabfac208e52a7e510e441bb9d2
Parents: d01e4afd · 5faf7cbb

Merge commit. Changes below are compared with the first parent: d01e4afd.

Changes

270 files changed · +10139 −10616

File	Status	Add	Del	Content
Documentation/arm/sunxi/README	added	+19	−0	View file
Documentation/devicetree/bindings/arm/bcm/bcm11351.txt	added	+9	−0	View file
Documentation/devicetree/bindings/arm/calxeda.txt	modified	+10	−3	View file
Documentation/devicetree/bindings/arm/vexpress-sysreg.txt	added	+50	−0	View file
Documentation/devicetree/bindings/arm/vexpress.txt	modified	+88	−10	View file
Documentation/devicetree/bindings/clock/imx5-clock.txt	added	+191	−0	View file
Documentation/devicetree/bindings/clock/imx6q-clock.txt	modified	+7	−2	View file
Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt	added	+104	−0	View file
Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt	modified	+94	−25	View file
Documentation/devicetree/bindings/timer/allwinner,sunxi-timer.txt	added	+17	−0	View file
Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt	added	+13	−0	View file
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt	added	+13	−0	View file
MAINTAINERS	modified	+12	−0	View file
arch/arm/Kconfig	modified	+14	−3	View file
arch/arm/Kconfig.debug	modified	+26	−0	View file
arch/arm/Makefile	modified	+2	−0	View file
arch/arm/boot/compressed/Makefile	modified	+0	−5	View file
arch/arm/boot/dts/Makefile	modified	+7	−2	View file
arch/arm/boot/dts/bcm11351-brt.dts	added	+30	−0	View file
arch/arm/boot/dts/bcm11351.dtsi	added	+50	−0	View file
arch/arm/boot/dts/bcm2835-rpi-b.dts	modified	+15	−0	View file
arch/arm/boot/dts/bcm2835.dtsi	modified	+28	−0	View file
arch/arm/boot/dts/ecx-2000.dts	added	+104	−0	View file
arch/arm/boot/dts/ecx-common.dtsi	added	+237	−0	View file
arch/arm/boot/dts/exynos4.dtsi	modified	+6	−0	View file
arch/arm/boot/dts/exynos4210-pinctrl.dtsi	modified	+278	−0	View file
arch/arm/boot/dts/exynos4210.dtsi	modified	+1	−240	View file
arch/arm/boot/dts/exynos5440-ssdk5440.dts	added	+46	−0	View file
arch/arm/boot/dts/exynos5440.dtsi	added	+159	−0	View file
arch/arm/boot/dts/highbank.dts	modified	+3	−209	View file
arch/arm/boot/dts/imx27-3ds.dts	modified	+0	−4	View file
arch/arm/boot/dts/imx51-babbage.dts	modified	+16	−0	View file
arch/arm/boot/dts/imx51.dtsi	modified	+124	−0	View file
arch/arm/boot/dts/imx53.dtsi	modified	+73	−0	View file
arch/arm/boot/dts/imx6q.dtsi	modified	+34	−0	View file
arch/arm/boot/dts/sh7377.dtsi	deleted	+0	−21	View before deletion
arch/arm/boot/dts/sun4i-cubieboard.dts	added	+38	−0	View file
arch/arm/boot/dts/sun4i.dtsi	added	+19	−0	View file
arch/arm/boot/dts/sun5i-olinuxino.dts	added	+30	−0	View file
arch/arm/boot/dts/sun5i.dtsi	added	+20	−0	View file
arch/arm/boot/dts/sunxi.dtsi	added	+80	−0	View file
arch/arm/boot/dts/tegra20.dtsi	modified	+9	−0	View file
arch/arm/boot/dts/tegra30.dtsi	modified	+9	−0	View file
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi	modified	+137	−9	View file
arch/arm/boot/dts/vexpress-v2m.dtsi	modified	+137	−9	View file
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts	modified	+118	−3	View file
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts	modified	+183	−3	View file
arch/arm/boot/dts/vexpress-v2p-ca5s.dts	modified	+81	−3	View file
arch/arm/boot/dts/vexpress-v2p-ca9.dts	modified	+133	−3	View file
arch/arm/configs/armadillo800eva_defconfig	modified	+1	−0	View file
arch/arm/configs/bcm2835_defconfig	modified	+0	−2	View file
arch/arm/configs/bcm_defconfig	added	+114	−0	View file
arch/arm/configs/clps711x_defconfig	added	+90	−0	View file
arch/arm/configs/edb7211_defconfig	deleted	+0	−27	View before deletion
arch/arm/configs/fortunet_defconfig	deleted	+0	−28	View before deletion
arch/arm/configs/marzen_defconfig	modified	+2	−0	View file
arch/arm/configs/tegra_defconfig	modified	+19	−2	View file
arch/arm/include/asm/hardware/sp810.h	modified	+0	−6	View file
arch/arm/include/asm/mach/map.h	modified	+7	−0	View file
arch/arm/include/debug/sunxi.S	added	+27	−0	View file
arch/arm/kernel/debug.S	modified	+14	−0	View file
arch/arm/kernel/smp_twd.c	modified	+2	−4	View file
arch/arm/mach-bcm/Kconfig	added	+19	−0	View file
arch/arm/mach-bcm/Makefile	added	+13	−0	View file
arch/arm/mach-bcm/board_bcm.c	added	+57	−0	View file
arch/arm/mach-bcm2835/bcm2835.c	modified	+46	−0	View file
arch/arm/mach-bcm2835/include/mach/gpio.h	added	+1	−0	View file
arch/arm/mach-clps711x/Kconfig	modified	+0	−2	View file
arch/arm/mach-clps711x/Makefile	modified	+6	−6	View file
arch/arm/mach-clps711x/Makefile.boot	modified	+0	−1	View file
arch/arm/mach-clps711x/autcpu12.c	deleted	+0	−92	View before deletion
arch/arm/mach-clps711x/board-autcpu12.c	added	+179	−0	View file
arch/arm/mach-clps711x/board-cdb89712.c	added	+147	−0	View file
arch/arm/mach-clps711x/clep7312.c → arch/arm/mach-clps711x/board-clep7312.c	renamed	+2	−2	View file
arch/arm/mach-clps711x/board-edb7211.c	added	+180	−0	View file
arch/arm/mach-clps711x/fortunet.c → arch/arm/mach-clps711x/board-fortunet.c	renamed	+2	−0	View file
arch/arm/mach-clps711x/board-p720t.c	added	+232	−0	View file
arch/arm/mach-clps711x/cdb89712.c	deleted	+0	−63	View before deletion
arch/arm/mach-clps711x/common.c	modified	+135	−46	View file
arch/arm/mach-clps711x/common.h	modified	+6	−1	View file
arch/arm/mach-clps711x/edb7211-arch.c	deleted	+0	−66	View before deletion
arch/arm/mach-clps711x/edb7211-mm.c	deleted	+0	−82	View before deletion
arch/arm/mach-clps711x/include/mach/autcpu12.h	modified	+2	−21	View file
arch/arm/mach-clps711x/include/mach/clps711x.h	modified	+27	−0	View file
arch/arm/mach-clps711x/include/mach/entry-macro.S	deleted	+0	−51	View before deletion
arch/arm/mach-clps711x/include/mach/hardware.h	modified	+10	−57	View file
arch/arm/mach-clps711x/include/mach/irqs.h	deleted	+0	−50	View before deletion
arch/arm/mach-clps711x/include/mach/syspld.h	modified	+2	−7	View file
arch/arm/mach-clps711x/p720t.c	deleted	+0	−181	View before deletion
arch/arm/mach-davinci/board-dm355-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm355-leopard.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm365-evm.c	modified	+2	−2	View file
arch/arm/mach-davinci/board-dm644x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-neuros-osd2.c	modified	+1	−1	View file
arch/arm/mach-davinci/da850.c	modified	+9	−8	View file
arch/arm/mach-davinci/devices-da8xx.c	modified	+74	−3	View file
arch/arm/mach-davinci/dm355.c	modified	+0	−6	View file
arch/arm/mach-davinci/dm365.c	modified	+0	−6	View file
arch/arm/mach-davinci/dm644x.c	modified	+0	−6	View file
arch/arm/mach-davinci/dm646x.c	modified	+0	−6	View file
arch/arm/mach-davinci/include/mach/common.h	modified	+0	−2	View file
arch/arm/mach-davinci/include/mach/da8xx.h	modified	+3	−0	View file
arch/arm/mach-davinci/include/mach/serial.h	modified	+1	−0	View file
arch/arm/mach-davinci/include/mach/sram.h	modified	+3	−0	View file
arch/arm/mach-davinci/serial.c	modified	+27	−12	View file
arch/arm/mach-davinci/sram.c	modified	+20	−3	View file
arch/arm/mach-davinci/time.c	modified	+2	−2	View file
arch/arm/mach-exynos/Kconfig	modified	+10	−1	View file
arch/arm/mach-exynos/Makefile	modified	+1	−1	View file
arch/arm/mach-exynos/common.c	modified	+73	−6	View file
arch/arm/mach-exynos/include/mach/irqs.h	modified	+5	−0	View file
arch/arm/mach-exynos/include/mach/map.h	modified	+5	−0	View file
arch/arm/mach-exynos/include/mach/regs-pmu.h	modified	+1	−0	View file
arch/arm/mach-exynos/mach-exynos4-dt.c	modified	+1	−0	View file
arch/arm/mach-exynos/mach-exynos5-dt.c	modified	+25	−9	View file
arch/arm/mach-exynos/mct.c	modified	+9	−2	View file
arch/arm/mach-exynos/platsmp.c	modified	+24	−6	View file
arch/arm/mach-exynos/setup-i2c0.c	modified	+1	−1	View file
arch/arm/mach-highbank/Kconfig	modified	+1	−1	View file
arch/arm/mach-highbank/Makefile	modified	+0	−1	View file
arch/arm/mach-highbank/core.h	modified	+5	−5	View file
arch/arm/mach-highbank/highbank.c	modified	+12	−21	View file
arch/arm/mach-highbank/hotplug.c	modified	+2	−4	View file
arch/arm/mach-highbank/lluart.c	deleted	+0	−34	View before deletion
arch/arm/mach-highbank/platsmp.c	modified	+3	−4	View file
arch/arm/mach-highbank/pm.c	modified	+0	−3	View file
arch/arm/mach-highbank/sysregs.h	modified	+19	−0	View file
arch/arm/mach-highbank/system.c	modified	+0	−2	View file
arch/arm/mach-imx/Kconfig	modified	+2	−0	View file
arch/arm/mach-imx/clk-imx27.c	modified	+15	−3	View file
arch/arm/mach-imx/clk-imx51-imx53.c	modified	+24	−20	View file
arch/arm/mach-imx/clk-imx6q.c	modified	+30	−12	View file
arch/arm/mach-imx/clk-pllv3.c	modified	+4	−68	View file
arch/arm/mach-imx/clk.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx27.h	modified	+3	−1	View file
arch/arm/mach-imx/devices/Kconfig	modified	+3	−0	View file
arch/arm/mach-imx/devices/Makefile	modified	+1	−0	View file
arch/arm/mach-imx/devices/devices-common.h	modified	+8	−1	View file
arch/arm/mach-imx/devices/platform-mx2-camera.c	modified	+0	−17	View file
arch/arm/mach-imx/imx51-dt.c	modified	+1	−27	View file
arch/arm/mach-imx/mach-imx53.c	modified	+1	−30	View file
arch/arm/mach-imx/mm-imx5.c	modified	+20	−0	View file
arch/arm/mach-integrator/include/mach/irqs.h	modified	+54	−55	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+1	−4	View file
arch/arm/mach-integrator/integrator_cp.c	modified	+2	−4	View file
arch/arm/mach-lpc32xx/clock.c	modified	+8	−0	View file
arch/arm/mach-lpc32xx/include/mach/platform.h	modified	+1	−0	View file
arch/arm/mach-lpc32xx/irq.c	modified	+5	−18	View file
arch/arm/mach-s3c24xx/Kconfig	modified	+1	−0	View file
arch/arm/mach-s3c24xx/clock-s3c2440.c	modified	+1	−0	View file
arch/arm/mach-shmobile/Kconfig	modified	+0	−12	View file
arch/arm/mach-shmobile/Makefile	modified	+0	−6	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+1	−1	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+1	−1	View file
arch/arm/mach-shmobile/clock-r8a7740.c	modified	+34	−0	View file
arch/arm/mach-shmobile/clock-r8a7779.c	modified	+22	−1	View file
arch/arm/mach-shmobile/clock-sh7367.c	deleted	+0	−355	View before deletion
arch/arm/mach-shmobile/clock-sh7372.c	modified	+12	−82	View file
arch/arm/mach-shmobile/clock-sh7377.c	deleted	+0	−366	View before deletion
arch/arm/mach-shmobile/include/mach/common.h	modified	+0	−18	View file
arch/arm/mach-shmobile/include/mach/r8a7779.h	modified	+1	−1	View file
arch/arm/mach-shmobile/include/mach/sh7367.h	deleted	+0	−332	View before deletion
arch/arm/mach-shmobile/include/mach/sh7372.h	modified	+4	−2	View file
arch/arm/mach-shmobile/include/mach/sh7377.h	deleted	+0	−360	View before deletion
arch/arm/mach-shmobile/intc-sh7367.c	deleted	+0	−413	View before deletion
arch/arm/mach-shmobile/intc-sh7377.c	deleted	+0	−592	View before deletion
arch/arm/mach-shmobile/pfc-r8a7779.c	modified	+8	−8	View file
arch/arm/mach-shmobile/pfc-sh7367.c	deleted	+0	−1727	View before deletion
arch/arm/mach-shmobile/pfc-sh7377.c	deleted	+0	−1688	View before deletion
arch/arm/mach-shmobile/setup-r8a7740.c	modified	+17	−1	View file
arch/arm/mach-shmobile/setup-r8a7779.c	modified	+77	−0	View file
arch/arm/mach-shmobile/setup-sh7367.c	deleted	+0	−481	View before deletion
arch/arm/mach-shmobile/setup-sh7372.c	modified	+20	−0	View file
arch/arm/mach-shmobile/setup-sh7377.c	deleted	+0	−549	View before deletion
arch/arm/mach-shmobile/smp-emev2.c	modified	+2	−20	View file
arch/arm/mach-shmobile/smp-r8a7779.c	modified	+3	−22	View file
arch/arm/mach-shmobile/smp-sh73a0.c	modified	+2	−21	View file
arch/arm/mach-sunxi/Kconfig	added	+9	−0	View file
arch/arm/mach-sunxi/Makefile	added	+1	−0	View file
arch/arm/mach-sunxi/Makefile.boot	added	+1	−0	View file
arch/arm/mach-sunxi/sunxi.c	added	+96	−0	View file
arch/arm/mach-sunxi/sunxi.h	added	+20	−0	View file
arch/arm/mach-tegra/Makefile	modified	+11	−2	View file
arch/arm/mach-tegra/board-dt-tegra20.c	modified	+23	−0	View file
arch/arm/mach-tegra/board-dt-tegra30.c	modified	+25	−0	View file
arch/arm/mach-tegra/common.c	modified	+14	−8	View file
arch/arm/mach-tegra/cpuidle-tegra20.c	added	+66	−0	View file
arch/arm/mach-tegra/cpuidle-tegra30.c	added	+188	−0	View file
arch/arm/mach-tegra/cpuidle.c	modified	+13	−70	View file
arch/arm/mach-tegra/cpuidle.h	added	+32	−0	View file
arch/arm/mach-tegra/flowctrl.c	modified	+47	−0	View file
arch/arm/mach-tegra/flowctrl.h	modified	+8	−0	View file
arch/arm/mach-tegra/fuse.c	modified	+38	−11	View file
arch/arm/mach-tegra/fuse.h	modified	+16	−0	View file
arch/arm/mach-tegra/headsmp.S	modified	+71	−0	View file
arch/arm/mach-tegra/pm.c	added	+216	−0	View file
arch/arm/mach-tegra/pm.h	added	+35	−0	View file
arch/arm/mach-tegra/reset.c	modified	+6	−0	View file
arch/arm/mach-tegra/reset.h	modified	+9	−0	View file
arch/arm/mach-tegra/sleep-t20.S → arch/arm/mach-tegra/sleep-tegra20.S	renamed	+0	−0	View file
arch/arm/mach-tegra/sleep-t30.S → arch/arm/mach-tegra/sleep-tegra30.S	renamed	+66	−0	View file
arch/arm/mach-tegra/sleep.S	modified	+78	−0	View file
arch/arm/mach-tegra/sleep.h	modified	+37	−0	View file
arch/arm/mach-tegra/tegra20_clocks_data.c	modified	+8	−3	View file
arch/arm/mach-tegra/tegra20_speedo.c	added	+109	−0	View file
arch/arm/mach-tegra/tegra30_clocks.c	modified	+214	−0	View file
arch/arm/mach-tegra/tegra30_clocks.h	modified	+1	−0	View file
arch/arm/mach-tegra/tegra30_clocks_data.c	modified	+49	−2	View file
arch/arm/mach-tegra/tegra30_speedo.c	added	+292	−0	View file
arch/arm/mach-tegra/tegra_cpu_car.h	modified	+37	−0	View file
arch/arm/mach-ux500/board-mop500.c	modified	+11	−2	View file
arch/arm/mach-ux500/cpu-db8500.c	modified	+3	−0	View file
arch/arm/mach-versatile/core.c	modified	+1	−1	View file
arch/arm/mach-vexpress/Kconfig	modified	+3	−1	View file
arch/arm/mach-vexpress/Makefile	modified	+1	−1	View file
arch/arm/mach-vexpress/ct-ca9x4.c	modified	+14	−27	View file
arch/arm/mach-vexpress/include/mach/motherboard.h	modified	+0	−81	View file
arch/arm/mach-vexpress/platsmp.c	modified	+2	−1	View file
arch/arm/mach-vexpress/v2m.c	modified	+89	−260	View file
arch/arm/mm/mmu.c	modified	+16	−0	View file
arch/arm/plat-mxc/devices/platform-mx2-emma.c	added	+40	−0	View file
arch/arm/plat-samsung/Kconfig	modified	+6	−0	View file
arch/arm/plat-samsung/Makefile	modified	+1	−0	View file
arch/arm/plat-samsung/include/plat/cpu.h	modified	+8	−0	View file
arch/arm/plat-samsung/setup-camif.c	added	+70	−0	View file
arch/arm/plat-versatile/Kconfig	modified	+0	−9	View file
arch/arm/plat-versatile/Makefile	modified	+0	−1	View file
drivers/clk/Makefile	modified	+1	−0	View file
drivers/clk/clk-sunxi.c	added	+30	−0	View file
drivers/clocksource/Kconfig	modified	+3	−0	View file
drivers/clocksource/Makefile	modified	+1	−0	View file
drivers/clocksource/sunxi_timer.c	added	+171	−0	View file
drivers/cpuidle/Kconfig	modified	+10	−0	View file
drivers/cpuidle/Makefile	modified	+2	−0	View file
drivers/cpuidle/cpuidle-calxeda.c	added	+161	−0	View file
drivers/irqchip/Kconfig	modified	+8	−1	View file
drivers/irqchip/Makefile	modified	+2	−0	View file
drivers/irqchip/irq-sunxi.c	added	+151	−0	View file
arch/arm/plat-versatile/fpga-irq.c → drivers/irqchip/irq-versatile-fpga.c	renamed	+24	−31	View file
drivers/media/platform/soc_camera/mx2_camera.c	modified	+29	−10	View file
drivers/mfd/Kconfig	modified	+6	−0	View file
drivers/mfd/Makefile	modified	+1	−0	View file
drivers/mfd/vexpress-config.c	added	+277	−0	View file
drivers/mfd/vexpress-sysreg.c	added	+475	−0	View file
drivers/mtd/maps/Kconfig	modified	+0	−7	View file
drivers/mtd/maps/Makefile	modified	+0	−1	View file
drivers/mtd/maps/cdb89712.c	deleted	+0	−278	View before deletion
drivers/mtd/nand/Kconfig	modified	+0	−13	View file
drivers/mtd/nand/Makefile	modified	+0	−2	View file
drivers/mtd/nand/autcpu12.c	deleted	+0	−237	View before deletion
drivers/mtd/nand/spia.c	deleted	+0	−176	View before deletion
drivers/pinctrl/Kconfig	modified	+5	−0	View file
drivers/pinctrl/Makefile	modified	+1	−0	View file
drivers/pinctrl/pinctrl-exynos.c	modified	+288	−189	View file
drivers/pinctrl/pinctrl-exynos.h	modified	+30	−140	View file
drivers/pinctrl/pinctrl-exynos5440.c	added	+919	−0	View file
drivers/pinctrl/pinctrl-samsung.c	modified	+149	−58	View file
drivers/pinctrl/pinctrl-samsung.h	modified	+16	−14	View file
drivers/sh/clk/cpg.c	modified	+86	−0	View file
drivers/tty/serial/samsung.c	modified	+2	−1	View file
drivers/uio/Kconfig	modified	+1	−0	View file
drivers/uio/uio_pruss.c	modified	+17	−7	View file
drivers/video/clps711xfb.c	modified	+19	−137	View file
include/linux/clk/sunxi.h	added	+22	−0	View file
include/linux/irqchip/sunxi.h	added	+27	−0	View file
arch/arm/plat-versatile/include/plat/fpga-irq.h → include/linux/irqchip/versatile-fpga.h	renamed	+0	−0	View file
include/linux/platform_data/uio_pruss.h	modified	+2	−1	View file
include/linux/sh_clk.h	modified	+9	−0	View file
include/linux/sunxi_timer.h	added	+24	−0	View file
include/linux/vexpress.h	added	+121	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/sunxi/README

View file

diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
new file mode 100644
index 0000000..87a1e8f
--- /dev/null
+++ b/Documentation/arm/sunxi/README
@@ -0,0 +1,19 @@
+ARM Allwinner SoCs
+==================
+
+This document lists all the ARM Allwinner SoCs that are currently
+supported in mainline by the Linux kernel. This document will also
+provide links to documentation and or datasheet for these SoCs.
+
+SunXi family
+------------
+
+  Flavors:
+        Allwinner A10 (sun4i)
+                Datasheet       : http://dl.linux-sunxi.org/A10/A10%20Datasheet%20-%20v1.21%20%282012-04-06%29.pdf
+
+        Allwinner A13 (sun5i)
+                Datasheet       : http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+
+  Core: Cortex A8
+  Linux kernel mach directory: arch/arm/mach-sunxi
\ No newline at end of file

Documentation/devicetree/bindings/arm/bcm/bcm11351.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt b/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
new file mode 100644
index 0000000..fb7b5cd
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
@@ -0,0 +1,9 @@
+Broadcom BCM11351 device tree bindings
+-------------------------------------------
+
+Boards with the bcm281xx SoC family (which includes bcm11130, bcm11140,
+bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties:
+
+Required root node property:
+
+compatible = "bcm,bcm11351";

Documentation/devicetree/bindings/arm/calxeda.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/calxeda.txt b/Documentation/devicetree/bindings/arm/calxeda.txt
index 4755caa..25fcf96 100644
--- a/Documentation/devicetree/bindings/arm/calxeda.txt
+++ b/Documentation/devicetree/bindings/arm/calxeda.txt
@@ -1,8 +1,15 @@
-Calxeda Highbank Platforms Device Tree Bindings
+Calxeda Platforms Device Tree Bindings
 -----------------------------------------------
 
-Boards with Calxeda Cortex-A9 based Highbank SOC shall have the following
-properties.
+Boards with Calxeda Cortex-A9 based ECX-1000 (Highbank) SOC shall have the
+following properties.
 
 Required root node properties:
     - compatible = "calxeda,highbank";
+
+
+Boards with Calxeda Cortex-A15 based ECX-2000 SOC shall have the following
+properties.
+
+Required root node properties:
+    - compatible = "calxeda,ecx-2000";

Documentation/devicetree/bindings/arm/vexpress-sysreg.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
new file mode 100644
index 0000000..9cf3f25
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
@@ -0,0 +1,50 @@
+ARM Versatile Express system registers
+--------------------------------------
+
+This is a system control registers block, providing multiple low level
+platform functions like board detection and identification, software
+interrupt generation, MMC and NOR Flash control etc.
+
+Required node properties:
+- compatible value : = "arm,vexpress,sysreg";
+- reg : physical base address and the size of the registers window
+- gpio-controller : specifies that the node is a GPIO controller
+- #gpio-cells : size of the GPIO specifier, should be 2:
+  - first cell is the pseudo-GPIO line number:
+    0 - MMC CARDIN
+    1 - MMC WPROT
+    2 - NOR FLASH WPn
+  - second cell can take standard GPIO flags (currently ignored).
+
+Example:
+	v2m_sysreg: sysreg@10000000 {
+ 		compatible = "arm,vexpress-sysreg";
+ 		reg = <0x10000000 0x1000>;
+		gpio-controller;
+		#gpio-cells = <2>;
+ 	};
+
+This block also can also act a bridge to the platform's configuration
+bus via "system control" interface, addressing devices with site number,
+position in the board stack, config controller, function and device
+numbers - see motherboard's TRM for more details.
+
+The node describing a config device must refer to the sysreg node via
+"arm,vexpress,config-bridge" phandle (can be also defined in the node's
+parent) and relies on the board topology properties - see main vexpress
+node documentation for more details. It must must also define the
+following property:
+- arm,vexpress-sysreg,func : must contain two cells:
+  - first cell defines function number (eg. 1 for clock generator,
+    2 for voltage regulators etc.)
+  - device number (eg. osc 0, osc 1 etc.)
+
+Example:
+	mcc {
+		arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+		osc@0 {
+			compatible = "arm,vexpress-osc";
+			arm,vexpress-sysreg,func = <1 0>;
+		};
+	};

Documentation/devicetree/bindings/arm/vexpress.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/vexpress.txt b/Documentation/devicetree/bindings/arm/vexpress.txt
index ec8b50c..ae49161 100644
--- a/Documentation/devicetree/bindings/arm/vexpress.txt
+++ b/Documentation/devicetree/bindings/arm/vexpress.txt
@@ -11,6 +11,10 @@ the motherboard file using a /include/ directive. As the motherboard
 can be initialized in one of two different configurations ("memory
 maps"), care must be taken to include the correct one.
 
+
+Root node
+---------
+
 Required properties in the root node:
 - compatible value:
 	compatible = "arm,vexpress,<model>", "arm,vexpress";
@@ -45,6 +49,10 @@ Optional properties in the root node:
   - Coretile Express A9x4 (V2P-CA9) HBI-0225:
 	arm,hbi = <0x225>;
 
+
+CPU nodes
+---------
+
 Top-level standard "cpus" node is required. It must contain a node
 with device_type = "cpu" property for every available core, eg.:
 
@@ -59,6 +67,52 @@ with device_type = "cpu" property for every available core, eg.:
 		};
 	};
 
+
+Configuration infrastructure
+----------------------------
+
+The platform has an elaborated configuration system, consisting of
+microcontrollers residing on the mother- and daughterboards known
+as Motherboard/Daughterboard Configuration Controller (MCC and DCC).
+The controllers are responsible for the platform initialization
+(reset generation, flash programming, FPGA bitfiles loading etc.)
+but also control clock generators, voltage regulators, gather
+environmental data like temperature, power consumption etc. Even
+the video output switch (FPGA) is controlled that way.
+
+Nodes describing devices controlled by this infrastructure should
+point at the bridge device node:
+- bridge phandle:
+	arm,vexpress,config-bridge = <phandle>;
+This property can be also defined in a parent node (eg. for a DCC)
+and is effective for all children.
+
+
+Platform topology
+-----------------
+
+As Versatile Express can be configured in number of physically
+different setups, the device tree should describe platform topology.
+Root node and main motherboard node must define the following
+property, describing physical location of the children nodes:
+- site number:
+	arm,vexpress,site = <number>;
+  where 0 means motherboard, 1 or 2 are daugtherboard sites,
+  0xf means "master" site (site containing main CPU tile)
+- when daughterboards are stacked on one site, their position
+  in the stack be be described with:
+	arm,vexpress,position = <number>;
+- when describing tiles consisting more than one DCC, its number
+  can be described with:
+	arm,vexpress,dcc = <number>;
+
+Any of the numbers above defaults to zero if not defined in
+the node or any of its parent.
+
+
+Motherboard
+-----------
+
 The motherboard description file provides a single "motherboard" node
 using 2 address cells corresponding to the Static Memory Bus used
 between the motherboard and the tile. The first cell defines the Chip
@@ -87,22 +141,30 @@ can be used to obtain required phandle in the tile's "aliases" node:
 - SP804 timers:
 	v2m_timer01 and v2m_timer23
 
-Current Linux implementation requires a "arm,v2m_timer" alias
-pointing at one of the motherboard's SP804 timers, if it is to be
-used as the system timer. This alias should be defined in the
-motherboard files.
+The tile description should define a "smb" node, describing the
+Static Memory Bus between the tile and motherboard. It must define
+the following properties:
+- "simple-bus" compatible value (to ensure creation of the children)
+	compatible = "simple-bus";
+- mapping of the SMB CS/offset addresses into main address space:
+	#address-cells = <2>;
+	#size-cells = <1>;
+	ranges = <...>;
+- interrupts mapping:
+	#interrupt-cells = <1>;
+	interrupt-map-mask = <0 0 63>;
+	interrupt-map = <...>;
 
-The tile description must define "ranges", "interrupt-map-mask" and
-"interrupt-map" properties to translate the motherboard's address
-and interrupt space into one used by the tile's processor.
 
-Abbreviated example:
+Example of a VE tile description (simplified)
+---------------------------------------------
 
 /dts-v1/;
 
 / {
 	model = "V2P-CA5s";
 	arm,hbi = <0x225>;
+	arm,vexpress,site = <0xf>;
 	compatible = "arm,vexpress-v2p-ca5s", "arm,vexpress";
 	interrupt-parent = <&gic>;
 	#address-cells = <1>;
@@ -134,13 +196,29 @@ Abbreviated example:
 		      <0x2c000100 0x100>;
 	};
 
-	motherboard {
+	dcc {
+		compatible = "simple-bus";
+		arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+		osc@0 {
+			compatible = "arm,vexpress-osc";
+		};
+	};
+
+	smb {
+		compatible = "simple-bus";
+
+		#address-cells = <2>;
+		#size-cells = <1>;
 		/* CS0 is visible at 0x08000000 */
 		ranges = <0 0 0x08000000 0x04000000>;
+
+		#interrupt-cells = <1>;
 		interrupt-map-mask = <0 0 63>;
 		/* Active high IRQ 0 is connected to GIC's SPI0 */
 		interrupt-map = <0 0 0 &gic 0 0 4>;
+
+		/include/ "vexpress-v2m-rs1.dtsi"
 	};
 };
 
-/include/ "vexpress-v2m-rs1.dtsi"

Documentation/devicetree/bindings/clock/imx5-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/imx5-clock.txt b/Documentation/devicetree/bindings/clock/imx5-clock.txt
new file mode 100644
index 0000000..04ad478
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/imx5-clock.txt
@@ -0,0 +1,191 @@
+* Clock bindings for Freescale i.MX5
+
+Required properties:
+- compatible: Should be "fsl,<soc>-ccm" , where <soc> can be imx51 or imx53
+- reg: Address and length of the register set
+- interrupts: Should contain CCM interrupt
+- #clock-cells: Should be <1>
+
+The clock consumer should specify the desired clock by having the clock
+ID in its "clocks" phandle cell.  The following is a full list of i.MX5
+clocks and IDs.
+
+	Clock			ID
+	---------------------------
+	dummy			0
+	ckil			1
+	osc			2
+	ckih1			3
+	ckih2			4
+	ahb			5
+	ipg			6
+	axi_a			7
+	axi_b			8
+	uart_pred		9
+	uart_root		10
+	esdhc_a_pred		11
+	esdhc_b_pred		12
+	esdhc_c_s		13
+	esdhc_d_s		14
+	emi_sel			15
+	emi_slow_podf		16
+	nfc_podf		17
+	ecspi_pred		18
+	ecspi_podf		19
+	usboh3_pred		20
+	usboh3_podf		21
+	usb_phy_pred		22
+	usb_phy_podf		23
+	cpu_podf		24
+	di_pred			25
+	tve_di			26
+	tve_s			27
+	uart1_ipg_gate		28
+	uart1_per_gate		29
+	uart2_ipg_gate		30
+	uart2_per_gate		31
+	uart3_ipg_gate		32
+	uart3_per_gate		33
+	i2c1_gate		34
+	i2c2_gate		35
+	gpt_ipg_gate		36
+	pwm1_ipg_gate		37
+	pwm1_hf_gate		38
+	pwm2_ipg_gate		39
+	pwm2_hf_gate		40
+	gpt_hf_gate		41
+	fec_gate		42
+	usboh3_per_gate		43
+	esdhc1_ipg_gate		44
+	esdhc2_ipg_gate		45
+	esdhc3_ipg_gate		46
+	esdhc4_ipg_gate		47
+	ssi1_ipg_gate		48
+	ssi2_ipg_gate		49
+	ssi3_ipg_gate		50
+	ecspi1_ipg_gate		51
+	ecspi1_per_gate		52
+	ecspi2_ipg_gate		53
+	ecspi2_per_gate		54
+	cspi_ipg_gate		55
+	sdma_gate		56
+	emi_slow_gate		57
+	ipu_s			58
+	ipu_gate		59
+	nfc_gate		60
+	ipu_di1_gate		61
+	vpu_s			62
+	vpu_gate		63
+	vpu_reference_gate	64
+	uart4_ipg_gate		65
+	uart4_per_gate		66
+	uart5_ipg_gate		67
+	uart5_per_gate		68
+	tve_gate		69
+	tve_pred		70
+	esdhc1_per_gate		71
+	esdhc2_per_gate		72
+	esdhc3_per_gate		73
+	esdhc4_per_gate		74
+	usb_phy_gate		75
+	hsi2c_gate		76
+	mipi_hsc1_gate		77
+	mipi_hsc2_gate		78
+	mipi_esc_gate		79
+	mipi_hsp_gate		80
+	ldb_di1_div_3_5		81
+	ldb_di1_div		82
+	ldb_di0_div_3_5		83
+	ldb_di0_div		84
+	ldb_di1_gate		85
+	can2_serial_gate	86
+	can2_ipg_gate		87
+	i2c3_gate		88
+	lp_apm			89
+	periph_apm		90
+	main_bus		91
+	ahb_max			92
+	aips_tz1		93
+	aips_tz2		94
+	tmax1			95
+	tmax2			96
+	tmax3			97
+	spba			98
+	uart_sel		99
+	esdhc_a_sel		100
+	esdhc_b_sel		101
+	esdhc_a_podf		102
+	esdhc_b_podf		103
+	ecspi_sel		104
+	usboh3_sel		105
+	usb_phy_sel		106
+	iim_gate		107
+	usboh3_gate		108
+	emi_fast_gate		109
+	ipu_di0_gate		110
+	gpc_dvfs		111
+	pll1_sw			112
+	pll2_sw			113
+	pll3_sw			114
+	ipu_di0_sel		115
+	ipu_di1_sel		116
+	tve_ext_sel		117
+	mx51_mipi		118
+	pll4_sw			119
+	ldb_di1_sel		120
+	di_pll4_podf		121
+	ldb_di0_sel		122
+	ldb_di0_gate		123
+	usb_phy1_gate		124
+	usb_phy2_gate		125
+	per_lp_apm		126
+	per_pred1		127
+	per_pred2		128
+	per_podf		129
+	per_root		130
+	ssi_apm			131
+	ssi1_root_sel		132
+	ssi2_root_sel		133
+	ssi3_root_sel		134
+	ssi_ext1_sel		135
+	ssi_ext2_sel		136
+	ssi_ext1_com_sel	137
+	ssi_ext2_com_sel	138
+	ssi1_root_pred		139
+	ssi1_root_podf		140
+	ssi2_root_pred		141
+	ssi2_root_podf		142
+	ssi_ext1_pred		143
+	ssi_ext1_podf		144
+	ssi_ext2_pred		145
+	ssi_ext2_podf		146
+	ssi1_root_gate		147
+	ssi2_root_gate		148
+	ssi3_root_gate		149
+	ssi_ext1_gate		150
+	ssi_ext2_gate		151
+	epit1_ipg_gate		152
+	epit1_hf_gate		153
+	epit2_ipg_gate		154
+	epit2_hf_gate		155
+	can_sel			156
+	can1_serial_gate	157
+	can1_ipg_gate		158
+
+Examples (for mx53):
+
+clks: ccm@53fd4000{
+	compatible = "fsl,imx53-ccm";
+	reg = <0x53fd4000 0x4000>;
+	interrupts = <0 71 0x04 0 72 0x04>;
+	#clock-cells = <1>;
+};
+
+can1: can@53fc8000 {
+	compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
+	reg = <0x53fc8000 0x4000>;
+	interrupts = <82>;
+	clocks = <&clks 158>, <&clks 157>;
+	clock-names = "ipg", "per";
+	status = "disabled";
+};

Documentation/devicetree/bindings/clock/imx6q-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index 492bd99..d77b4e6 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -187,9 +187,9 @@ clocks and IDs.
 	pll3_usb_otg		172
 	pll4_audio		173
 	pll5_video		174
-	pll6_mlb		175
+	pll8_mlb		175
 	pll7_usb_host		176
-	pll8_enet		177
+	pll6_enet		177
 	ssi1_ipg		178
 	ssi2_ipg		179
 	ssi3_ipg		180
@@ -198,6 +198,11 @@ clocks and IDs.
 	usbphy2			183
 	ldb_di0_div_3_5		184
 	ldb_di1_div_3_5		185
+	sata_ref		186
+	sata_ref_100m		187
+	pcie_ref		188
+	pcie_ref_125m		189
+	enet_ref		190
 
 Examples:
 

Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt
new file mode 100644
index 0000000..7f9fb85
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt
@@ -0,0 +1,104 @@
+Allwinner Sunxi Interrupt Controller
+
+Required properties:
+
+- compatible : should be "allwinner,sunxi-ic"
+- reg : Specifies base physical address and size of the registers.
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt source. The value shall be 1.
+
+The interrupt sources are as follows:
+
+0: ENMI
+1: UART0
+2: UART1
+3: UART2
+4: UART3
+5: IR0
+6: IR1
+7: I2C0
+8: I2C1
+9: I2C2
+10: SPI0
+11: SPI1
+12: SPI2
+13: SPDIF
+14: AC97
+15: TS
+16: I2S
+17: UART4
+18: UART5
+19: UART6
+20: UART7
+21: KEYPAD
+22: TIMER0
+23: TIMER1
+24: TIMER2
+25: TIMER3
+26: CAN
+27: DMA
+28: PIO
+29: TOUCH_PANEL
+30: AUDIO_CODEC
+31: LRADC
+32: SDMC0
+33: SDMC1
+34: SDMC2
+35: SDMC3
+36: MEMSTICK
+37: NAND
+38: USB0
+39: USB1
+40: USB2
+41: SCR
+42: CSI0
+43: CSI1
+44: LCDCTRL0
+45: LCDCTRL1
+46: MP
+47: DEFEBE0
+48: DEFEBE1
+49: PMU
+50: SPI3
+51: TZASC
+52: PATA
+53: VE
+54: SS
+55: EMAC
+56: SATA
+57: GPS
+58: HDMI
+59: TVE
+60: ACE
+61: TVD
+62: PS2_0
+63: PS2_1
+64: USB3
+65: USB4
+66: PLE_PFM
+67: TIMER4
+68: TIMER5
+69: GPU_GP
+70: GPU_GPMMU
+71: GPU_PP0
+72: GPU_PPMMU0
+73: GPU_PMU
+74: GPU_RSV0
+75: GPU_RSV1
+76: GPU_RSV2
+77: GPU_RSV3
+78: GPU_RSV4
+79: GPU_RSV5
+80: GPU_RSV6
+82: SYNC_TIMER0
+83: SYNC_TIMER1
+
+Example:
+
+intc: interrupt-controller {