1. 15 Nov, 2012 3 commits
    • Arnd Bergmann's avatar
      Merge branch 'omap/cleanup-prcm-part2' into next/dt · cff9f37a
      Arnd Bergmann authored
      This resolves a nontrivial conflict where the omap_prcm_restart
      is removed in one branch but another use is added in another
      branch.
      
      Conflicts:
      	arch/arm/mach-omap2/cm33xx.c
      	arch/arm/mach-omap2/io.c
      	arch/arm/mach-omap2/prm_common.c
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      cff9f37a
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.8/dt-signed' of... · b599dc07
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      From Tony Lindgren <tony@atomide.com>:
      
      Device tree related changes for omaps updating the
      various .dts files, and timer related changes to allow
      configuring the timer via device tree.
      
      * tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (48 commits)
        usb: musb: dsps: dt binding - add resources, example
        ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
        ARM: dts: omap4-panda: Add pinmux configuration for HDMI
        ARM: dts: Makefile: Add the am335x-evmsk target in dtbs list
        ARM: dts: AM33XX: Add usbss node
        ARM: dts: AM33XX: Add push-buttons device tree data to am335x-evmsk
        ARM: dts: AM33XX: Add pinmux configuration for gpio-keys to EVMSK
        ARM: dts: AM33XX: Add user-leds device tree data to am335x-evmsk
        ARM: dts: AM33XX: Add pinmux configuration for gpio-leds to EVMSK
        ARM: dts: AM33XX: Add user-leds device tree data to am335x-bone
        ARM: dts: AM33XX: Add pinmux configuration for user-leds to BONE
        ARM: dts: AM33XX: Add volume-keys device tree data to am335x-evm
        ARM: dts: AM33XX: Add pinmux configuration for volume-keys to EVM
        ARM: dts: AM33XX: Add matrix keypad device tree data to am335x-evm
        ARM: dts: AM33XX: Add pinmux configuration for matrix keypad to EVM
        ARM: dts: omap5-evm: LPDDR2 memory device details for EVM
        ARM: dts: omap5: EMIF device tree data for OMAP5 boards
        ARM: dts: omap5-evm: Fix size of memory defined for EVM
        ARM: OMAP2+: Add device-tree support for 32kHz counter
        ARM: OMAP: Add DT support for timer driver
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      b599dc07
    • Arnd Bergmann's avatar
      Merge branch 'omap/headers4' into next/dt · b1f71bd0
      Arnd Bergmann authored
      These changes are needed for the following omap DT changes
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      b1f71bd0
  2. 12 Nov, 2012 1 commit
    • Peter Ujfalusi's avatar
      ARM: OMAP2: Fix compillation error in cm_common · cc4b1e24
      Peter Ujfalusi authored
      Fixes the following error:
        CC      arch/arm/mach-omap2/cm_common.o
      arch/arm/mach-omap2/cm_common.c: In function ‘cm_register’:
      arch/arm/mach-omap2/cm_common.c:42:11: error: ‘EINVAL’ undeclared (first use in this function)
      arch/arm/mach-omap2/cm_common.c:42:11: note: each undeclared identifier is reported only once for each function it appears in
      arch/arm/mach-omap2/cm_common.c:45:11: error: ‘EEXIST’ undeclared (first use in this function)
      arch/arm/mach-omap2/cm_common.c: In function ‘cm_unregister’:
      arch/arm/mach-omap2/cm_common.c:66:11: error: ‘EINVAL’ undeclared (first use in this function)
      make[1]: *** [arch/arm/mach-omap2/cm_common.o] Error 1
      make: *** [arch/arm/mach-omap2] Error 2
      Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
      Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      cc4b1e24
  3. 09 Nov, 2012 5 commits
  4. 08 Nov, 2012 15 commits
  5. 07 Nov, 2012 6 commits
  6. 06 Nov, 2012 10 commits