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

Pull ARM SoC fixes and straggler patches from Olof Johansson:
 "A collection of fixes for fall out from 3.10 merge window, some build
  fixes and warning cleanups and a small handful of patches that were
  small and contained and made sense to still include in 3.10 (some of
  these have also been in -next since the merge window opened).

  Largest continous series is for OMAP, but there's a handful for other
  platforms.

  For i.MX, one of the patches are framebuffer fixups due to fallout
  during the merge window, and the other removes some stale and broken
  code."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
  ARM: exynos: dts: Fixed vbus-gpios
  ARM: EXYNOS5: Fix kernel dump in AFTR idle mode
  ARM: ux500: Rid ignored return value of regulator_enable() compiler warning
  ARM: ux500: read the correct soc_id number
  ARM: exynos: dts: cros5250: add cyapa trackpad
  video: mxsfb: Adapt to new videomode API
  ARM: imx: Select GENERIC_ALLOCATOR
  ARM: imx: compile fix for hotplug.c
  ARM: dts: don't assume boards are using twl4030 for omap3
  ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
  ARM: dts: Configure and fix the McSPI pins for 4430sdp
  ARM: dts: AM33XX: Add GPMC node
  ARM: dts: OMAP4460: Fix CPU OPP voltages
  ARM: dts: OMAP36xx: Fix CPU OPP voltages
  ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
  ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
  omap: mux: add AM/DM37x gpios
  ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
  ARM: OMAP2+: omap_device: use late_initcall_sync
  ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
  ...

2 files changed, 42 insertions, 42 deletions

diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index e7f8d7ed47eb..6a983c1d87cd 100644
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -56,20 +56,20 @@ Example for an AM33xx board:
                         nand-bus-width = <16>;
                         ti,nand-ecc-opt = "bch8";
 
-                        gpmc,sync-clk = <0>;
-                        gpmc,cs-on = <0>;
-                        gpmc,cs-rd-off = <44>;
-                        gpmc,cs-wr-off = <44>;
-                        gpmc,adv-on = <6>;
-                        gpmc,adv-rd-off = <34>;
-                        gpmc,adv-wr-off = <44>;
-                        gpmc,we-off = <40>;
-                        gpmc,oe-off = <54>;
-                        gpmc,access = <64>;
-                        gpmc,rd-cycle = <82>;
-                        gpmc,wr-cycle = <82>;
-                        gpmc,wr-access = <40>;
-                        gpmc,wr-data-mux-bus = <0>;
+                        gpmc,sync-clk-ps = <0>;
+                        gpmc,cs-on-ns = <0>;
+                        gpmc,cs-rd-off-ns = <44>;
+                        gpmc,cs-wr-off-ns = <44>;
+                        gpmc,adv-on-ns = <6>;
+                        gpmc,adv-rd-off-ns = <34>;
+                        gpmc,adv-wr-off-ns = <44>;
+                        gpmc,we-off-ns = <40>;
+                        gpmc,oe-off-ns = <54>;
+                        gpmc,access-ns = <64>;
+                        gpmc,rd-cycle-ns = <82>;
+                        gpmc,wr-cycle-ns = <82>;
+                        gpmc,wr-access-ns = <40>;
+                        gpmc,wr-data-mux-bus-ns = <0>;
 
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/Documentation/devicetree/bindings/net/gpmc-eth.txt b/Documentation/devicetree/bindings/net/gpmc-eth.txt
index 24cb4e46f675..ace4a64b3695 100644
--- a/Documentation/devicetree/bindings/net/gpmc-eth.txt
+++ b/Documentation/devicetree/bindings/net/gpmc-eth.txt
@@ -26,16 +26,16 @@ Required properties:
 - bank-width:           Address width of the device in bytes. GPMC supports 8-bit
                         and 16-bit devices and so must be either 1 or 2 bytes.
 - compatible:           Compatible string property for the ethernet child device.
-- gpmc,cs-on:           Chip-select assertion time
-- gpmc,cs-rd-off:       Chip-select de-assertion time for reads
-- gpmc,cs-wr-off:       Chip-select de-assertion time for writes
-- gpmc,oe-on:           Output-enable assertion time
-- gpmc,oe-off           Output-enable de-assertion time
-- gpmc,we-on:           Write-enable assertion time
-- gpmc,we-off:          Write-enable de-assertion time
-- gpmc,access:          Start cycle to first data capture (read access)
-- gpmc,rd-cycle:        Total read cycle time
-- gpmc,wr-cycle:        Total write cycle time
+- gpmc,cs-on-ns:        Chip-select assertion time
+- gpmc,cs-rd-off-ns:    Chip-select de-assertion time for reads
+- gpmc,cs-wr-off-ns:    Chip-select de-assertion time for writes
+- gpmc,oe-on-ns:        Output-enable assertion time
+- gpmc,oe-off-ns:       Output-enable de-assertion time
+- gpmc,we-on-ns:        Write-enable assertion time
+- gpmc,we-off-ns:       Write-enable de-assertion time
+- gpmc,access-ns:       Start cycle to first data capture (read access)
+- gpmc,rd-cycle-ns:     Total read cycle time
+- gpmc,wr-cycle-ns:     Total write cycle time
 - reg:                  Chip-select, base address (relative to chip-select)
                         and size of the memory mapped for the device.
                         Note that base address will be typically 0 as this
@@ -65,24 +65,24 @@ gpmc: gpmc@6e000000 {
                 bank-width = <2>;
 
                 gpmc,mux-add-data;
-                gpmc,cs-on = <0>;
-                gpmc,cs-rd-off = <186>;
-                gpmc,cs-wr-off = <186>;
-                gpmc,adv-on = <12>;
-                gpmc,adv-rd-off = <48>;
-                gpmc,adv-wr-off = <48>;
-                gpmc,oe-on = <54>;
-                gpmc,oe-off = <168>;
-                gpmc,we-on = <54>;
-                gpmc,we-off = <168>;
-                gpmc,rd-cycle = <186>;
-                gpmc,wr-cycle = <186>;
-                gpmc,access = <114>;
-                gpmc,page-burst-access = <6>;
-                gpmc,bus-turnaround = <12>;
-                gpmc,cycle2cycle-delay = <18>;
-                gpmc,wr-data-mux-bus = <90>;
-                gpmc,wr-access = <186>;
+                gpmc,cs-on-ns = <0>;
+                gpmc,cs-rd-off-ns = <186>;
+                gpmc,cs-wr-off-ns = <186>;
+                gpmc,adv-on-ns = <12>;
+                gpmc,adv-rd-off-ns = <48>;
+                gpmc,adv-wr-off-ns = <48>;
+                gpmc,oe-on-ns = <54>;
+                gpmc,oe-off-ns = <168>;
+                gpmc,we-on-ns = <54>;
+                gpmc,we-off-ns = <168>;
+                gpmc,rd-cycle-ns = <186>;
+                gpmc,wr-cycle-ns = <186>;
+                gpmc,access-ns = <114>;
+                gpmc,page-burst-access-ns = <6>;
+                gpmc,bus-turnaround-ns = <12>;
+                gpmc,cycle2cycle-delay-ns = <18>;
+                gpmc,wr-data-mux-bus-ns = <90>;
+                gpmc,wr-access-ns = <186>;
                 gpmc,cycle2cycle-samecsen;
                 gpmc,cycle2cycle-diffcsen;