---

yaml --- r: 313284 b: refs/heads/master c: 5349f2a h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · d06b104 · d06b104
1 parent 775120a
commit d06b104
Show file tree

Hide file tree

Showing 97 changed files with 672 additions and 2,793 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de7351cb5a628101eb5931302f9dd73c335ef22
+refs/heads/master: 5349f2a89e6a31c8d39c4ec2618b9dd6e421c415
diff --git a/trunk/Documentation/devicetree/bindings/arm/olimex.txt b/trunk/Documentation/devicetree/bindings/arm/olimex.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/omap/omap.txt b/trunk/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -47,6 +47,3 @@ Boards:
 
 - AM335X EVM : Software Developement Board for AM335x
   compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"
-
-- AM335X Bone : Low cost community board
-  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"
diff --git a/...bindings/arm/tegra/nvidia,tegra20-emc.txt → ...ion/devicetree/bindings/arm/tegra/emc.txt b/...bindings/arm/tegra/nvidia,tegra20-emc.txt → ...ion/devicetree/bindings/arm/tegra/emc.txt
@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and
 
 Example:
 
-	memory-controller@7000f400 {
+	emc@7000f400 {
 		#address-cells = < 1 >;
 		#size-cells = < 0 >;
 		compatible = "nvidia,tegra20-emc";

diff --git a/trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt b/trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	memory-controller@0x7000f000 {
+	mc {
 		compatible = "nvidia,tegra20-mc";
 		reg = <0x7000f000 0x024
 		       0x7000f03c 0x3c4>;

diff --git a/trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt b/trunk/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	memory-controller {
+	mc {
 		compatible = "nvidia,tegra30-mc";
 		reg = <0x7000f000 0x010
 		       0x7000f03c 0x1b4

diff --git a/trunk/Documentation/devicetree/bindings/fb/mxsfb.txt b/trunk/Documentation/devicetree/bindings/fb/mxsfb.txt
diff --git a/...ree/bindings/gpio/nvidia,tegra20-gpio.txt → .../devicetree/bindings/gpio/gpio_nvidia.txt b/...ree/bindings/gpio/nvidia,tegra20-gpio.txt → .../devicetree/bindings/gpio/gpio_nvidia.txt
diff --git a/...ree/bindings/input/nvidia,tegra20-kbc.txt → ...n/devicetree/bindings/input/tegra-kbc.txt b/...ree/bindings/input/nvidia,tegra20-kbc.txt → ...n/devicetree/bindings/input/tegra-kbc.txt
diff --git a/...ree/bindings/mmc/nvidia,tegra20-sdhci.txt → .../devicetree/bindings/mmc/nvidia-sdhci.txt b/...ree/bindings/mmc/nvidia,tegra20-sdhci.txt → .../devicetree/bindings/mmc/nvidia-sdhci.txt
diff --git a/.../devicetree/bindings/nvec/nvidia,nvec.txt → .../devicetree/bindings/nvec/nvec_nvidia.txt b/.../devicetree/bindings/nvec/nvidia,nvec.txt → .../devicetree/bindings/nvec/nvec_nvidia.txt
diff --git a/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
diff --git a/...ings/sound/nvidia,tegra-audio-alc5632.txt → ...ee/bindings/sound/tegra-audio-alc5632.txt b/...ings/sound/nvidia,tegra-audio-alc5632.txt → ...ee/bindings/sound/tegra-audio-alc5632.txt
diff --git a/...gs/sound/nvidia,tegra-audio-trimslice.txt → .../bindings/sound/tegra-audio-trimslice.txt b/...gs/sound/nvidia,tegra-audio-trimslice.txt → .../bindings/sound/tegra-audio-trimslice.txt
diff --git a/...dings/sound/nvidia,tegra-audio-wm8753.txt → ...ree/bindings/sound/tegra-audio-wm8753.txt b/...dings/sound/nvidia,tegra-audio-wm8753.txt → ...ree/bindings/sound/tegra-audio-wm8753.txt
diff --git a/...dings/sound/nvidia,tegra-audio-wm8903.txt → ...ree/bindings/sound/tegra-audio-wm8903.txt b/...dings/sound/nvidia,tegra-audio-wm8903.txt → ...ree/bindings/sound/tegra-audio-wm8903.txt
diff --git a/...ree/bindings/sound/nvidia,tegra20-das.txt → ...devicetree/bindings/sound/tegra20-das.txt b/...ree/bindings/sound/nvidia,tegra20-das.txt → ...devicetree/bindings/sound/tegra20-das.txt
diff --git a/...ree/bindings/sound/nvidia,tegra20-i2s.txt → ...devicetree/bindings/sound/tegra20-i2s.txt b/...ree/bindings/sound/nvidia,tegra20-i2s.txt → ...devicetree/bindings/sound/tegra20-i2s.txt
diff --git a/...etree/bindings/spi/nvidia,tegra20-spi.txt → ...on/devicetree/bindings/spi/spi_nvidia.txt b/...etree/bindings/spi/nvidia,tegra20-spi.txt → ...on/devicetree/bindings/spi/spi_nvidia.txt
diff --git a/trunk/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt b/trunk/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt
diff --git a/...tree/bindings/usb/nvidia,tegra20-ehci.txt → ...ion/devicetree/bindings/usb/tegra-usb.txt b/...tree/bindings/usb/nvidia,tegra20-ehci.txt → ...ion/devicetree/bindings/usb/tegra-usb.txt
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/omap-wdt.txt
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -913,7 +913,7 @@ config ARCH_NOMADIK
 	select ARM_AMBA
 	select ARM_VIC
 	select CPU_ARM926T
-	select COMMON_CLK
+	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select MIGHT_HAVE_CACHE_L2X0
@@ -1021,6 +1021,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-lpc32xx/Kconfig"
+
 source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"

diff --git a/trunk/arch/arm/boot/dts/aks-cdu.dts b/trunk/arch/arm/boot/dts/aks-cdu.dts
diff --git a/trunk/arch/arm/boot/dts/am335x-bone.dts b/trunk/arch/arm/boot/dts/am335x-bone.dts
diff --git a/trunk/arch/arm/boot/dts/am335x-evm.dts b/trunk/arch/arm/boot/dts/am335x-evm.dts