1. 23 Jun, 2012 3 commits
  2. 22 Jun, 2012 6 commits
    • Ricardo Neri's avatar
      ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled · dc57aef5
      Ricardo Neri authored
      As per the OMAP4 documentation, audio over HDMI must be transmitted in
      no-idle mode. This patch adds the HWMOD_SWSUP_SIDLE so that omap_hwmod uses
      no-idle/force-idle settings instead of smart-idle mode.
      
      This is required as the DSS interface clock is used as functional clock
      for the HDMI wrapper audio FIFO. If no-idle mode is not used, audio could
      be choppy, have bad quality or not be audible at all.
      Signed-off-by: default avatarRicardo Neri <ricardo.neri@ti.com>
      [b-cousson@ti.com: Update the subject and align the .flags
      location with the script template]
      Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      dc57aef5
    • Paul Walmsley's avatar
      ARM: OMAP2+: mux: fix sparse warning · 65e25976
      Paul Walmsley authored
      Commit bbd707ac ("ARM: omap2: use
      machine specific hook for late init") resulted in the addition of this
      sparse warning:
      
      arch/arm/mach-omap2/mux.c:791:12: warning: symbol 'omap_mux_late_init' was not declared. Should it be static?
      
      Fix by including the header file containing the prototype.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: Tony Lindgren <tony@atomide.com>
      65e25976
    • Paul Walmsley's avatar
      ARM: OMAP2+: CM: increase the module disable timeout · b8f15b7e
      Paul Walmsley authored
      Increase the timeout for disabling an IP block to five milliseconds.
      This is to handle the usb_host_fs idle latency, which takes almost
      four milliseconds after a host controller reset.
      
      This is the second of two patches needed to resolve the following
      boot warning:
      
      omap_hwmod: usb_host_fs: _wait_target_disable failed
      
      Thanks to Sergei Shtylyov <sshtylyov@mvista.com> for finding
      an unrelated hunk in a previous version of this patch.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Sergei Shtylyov <sshtylyov@mvista.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      b8f15b7e
    • Paul Walmsley's avatar
      ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks · 9a47d32d
      Paul Walmsley authored
      Until the OMAP4 code is converted to disable the use of the clock
      framework-based clockdomain enable/disable sequence, any clock used as
      a hwmod main_clk must have a clockdomain associated with it.  This
      patch populates some clock structure clockdomain names to resolve the
      following warnings during kernel init:
      
      omap_hwmod: dpll_mpu_m2_ck: missing clockdomain for dpll_mpu_m2_ck.
      omap_hwmod: trace_clk_div_ck: missing clockdomain for trace_clk_div_ck.
      omap_hwmod: l3_div_ck: missing clockdomain for l3_div_ck.
      omap_hwmod: ddrphy_ck: missing clockdomain for ddrphy_ck.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Rajendra Nayak <rnayak@ti.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      9a47d32d
    • Paul Walmsley's avatar
      ARM: OMAP4: hwmod data: fix 32k sync timer idle modes · 252a4c54
      Paul Walmsley authored
      The 32k sync timer IP block target idle modes in the hwmod data are
      incorrect.  The IP block does not support any smart-idle modes.
      Update the data to reflect the correct modes.
      
      This problem was initially identified and a diff fragment posted to
      the lists by Benoît Cousson <b-cousson@ti.com>.  A patch description
      bug in the first version was also identified by Benoît.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      252a4c54
    • Djamil Elaidi's avatar
      ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby · 561038f0
      Djamil Elaidi authored
      If an IP is configured in Smart-Standby-Wakeup, when disabling wakeup feature the
      IP will not go back to Smart-Standby, but will remain in Smart-Standby-Wakeup.
      Signed-off-by: default avatarDjamil Elaidi <d-elaidi@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      561038f0
  3. 20 Jun, 2012 4 commits
    • Russ Dill's avatar
      ARM: OMAP: Fix Beagleboard DVI reset gpio · aef2b896
      Russ Dill authored
      Commit e813a55e ("OMAP: board-files:
      remove custom PD GPIO handling for DVI output") moved TFP410 chip's
      powerdown-gpio handling from the board files to the tfp410 driver. One
      gpio_request_one(powerdown-gpio, ...) was mistakenly left unremoved in
      the Beagle board file. This causes the tfp410 driver to fail to request
      the gpio on Beagle, causing the driver to fail and thus the DVI output
      doesn't work.
      
      This patch removes several boot errors from board-omap3beagle.c:
      
       - gpio_request: gpio--22 (DVI reset) status -22
       - Unable to get DVI reset GPIO
      
      There is a combination of leftover code and revision confusion.
      Additionally, xM support is currently a hack.
      
      For original Beagleboard this removes the double initialization of GPIO
      170, properly configures it as an output, and wraps the initialization
      in an if block so that xM does not attempt to request it.
      
      For Beagleboard xM it removes reference to GPIO 129 which was part
      of rev A1 and A2 designs, but never functioned. It then properly assigns
      beagle_dvi_device.reset_gpio in beagle_twl_gpio_setup and removes the
      hack of initializing it high. Additionally, it uses
      gpio_set_value_cansleep since this GPIO is connected through i2c.
      
      Unfortunately, there is no way to tell the difference between xM A2 and
      A3. However, GPIO 129 does not function on rev A1 and A2, and the TWL
      GPIO used on A3 and beyond is not used on rev A1 and A2, there are no
      problems created by this fix.
      
      Tested on Beagleboard-xM Rev C1 and Beagleboard Rev B4.
      Signed-off-by: default avatarRuss Dill <Russ.Dill@ti.com>
      Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      aef2b896
    • Jon Hunter's avatar
      arm/dts: OMAP2: Fix interrupt controller binding · 95dca12d
      Jon Hunter authored
      When booting with device-tree on an OMAP2420H4, the kernel is hanging when
      initialising the interrupts and following kernel dumps is seen ...
      
      [    0.000000] ------------[ cut here ]------------
      [    0.000000] WARNING: at arch/arm/mach-omap2/irq.c:271 omap_intc_of_init+0x50/0xb4()
      [    0.000000] unable to get intc registers
      [    0.000000] Modules linked in:
      [    0.000000] [<c001befc>] (unwind_backtrace+0x0/0xf4) from [<c0040c34>] (warn_slowpath_common+0x4c/0x64)
      [    0.000000] [<c0040c34>] (warn_slowpath_common+0x4c/0x64) from [<c0040ce0>] (warn_slowpath_fmt+0x30/0x40)
      [    0.000000] [<c0040ce0>] (warn_slowpath_fmt+0x30/0x40) from [<c066b8a4>] (omap_intc_of_init+0x50/0xb4)
      [    0.000000] [<c066b8a4>] (omap_intc_of_init+0x50/0xb4) from [<c0688b70>] (of_irq_init+0x144/0x288)
      [    0.000000] [<c0688b70>] (of_irq_init+0x144/0x288) from [<c0663294>] (init_IRQ+0x14/0x1c)
      [    0.000000] [<c0663294>] (init_IRQ+0x14/0x1c) from [<c06607fc>] (start_kernel+0x198/0x304)
      [    0.000000] [<c06607fc>] (start_kernel+0x198/0x304) from [<80008044>] (0x80008044)
      [    0.000000] ---[ end trace 1b75b31a2719ed1c ]---
      [    0.000000] of_irq_init: children remain, but no parents
      
      The OMAP2 interrupt controller binding is missing the number of interrupts and
      interrupt controller register address. Adding these fixes the problem.
      Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      95dca12d
    • Tony Lindgren's avatar
      ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0 · 3d09b33f
      Tony Lindgren authored
      Here's one more gpio_to_irq conversion that we missed
      earlier. Tested with n800 in gadget mode using USB_ETH.
      
      Cc: Felipe Balbi <balbi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      3d09b33f
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix MUSB ifdefs for platform init code · 310018d5
      Tony Lindgren authored
      Commit 62285963 (usb: musb: drop a gigantic amount of ifdeferry)
      got rid of a bunch of ifdefs in the MUSB code. Looks like the
      platform init code is still using these dropped defines though,
      which in many cases results the board defaulting always to host
      mode.
      
      Currently the situation is that USB_MUSB_HDRC is the main
      Kconfig option with additional USB_GADGET_MUSB_HDRC so only
      these two should be used to select between host and OTG mode.
      
      Fix the situation for omaps. The following users should fix the
      platform init code in a similar way:
      
      Dropped Kconfig option          Current users
      
      USB_MUSB_OTG                    blackfin, davinci, not in Kconfigs
      USB_MUSB_PERIPHERAL             davinci, not in Kconfigs
      USB_MUSB_HOST                   davinci, not in Kconfigs
      USB_MUSB_HDRC_HCD               blackfin, not in Kconfigs
      USB_MUSB_OTG                    blackfin, not in Kconfigs
      
      Cc: Mike Frysinger <vapier@gentoo.org>
      Cc: Sekhar Nori <nsekhar@ti.com>
      Cc: linux-usb@vger.kernel.org
      Cc: Felipe Balbi <balbi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      310018d5
  4. 18 Jun, 2012 1 commit
  5. 17 Jun, 2012 10 commits
    • Todd Poynor's avatar
      ARM: OMAP: PM: Lock clocks list while generating summary · 6bc07d6a
      Todd Poynor authored
      Commit a5302572 (OMAP: Add debugfs
      node to show the summary of all clocks) introduced clock summary,
      however, we are interested in seeing snapshot of the clock state, not
      in dynamically changing clock configurations as the data provided by
      clock summary will then be useless for debugging configuration
      issues. So, hold the common lock when dumping the clock summary.
      
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
      [nm@ti.com: added commit message]
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      [paul@pwsan.com: minor edits to commit message]
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      6bc07d6a
    • Andrew Lunn's avatar
      ARM: iconnect: Remove include of removed linux/spi/orion_spi.h · 22cec7ca
      Andrew Lunn authored
      v3.5-rc1 fails to build when DT and iconnect is enabled because of
      this now none existant include file.
      
      Also remove the other two SPI include files, which are not needed
      with the move to DT.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Acked-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      22cec7ca
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · fb09185a
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Radeon is most of the work, one regression, one BUG fix in the new
        prime code, some fixes to init code to make streamout not lock up the
        hardware, and just some code to enable users to test HDMI audio on
        later hw (its off by default).
      
        Intel adds edp edid caching for some strange Dell Vostros that black
        screen on startup if keep reading their EDID, and a fix for a DP
        regression.
      
        Otherwise fix for via/sis and one to stop udl binding to multiple
        non-video usb."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: cache the EDID for eDP panels
        Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
        drm/i915: eDP aux needs vdd
        drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
        drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx
        drm/radeon: add some additional 6xx/7xx/EG register init
        drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
        drm sis: initialize object_idr
        drm via: initialize object_idr
        drm/radeon/prime: reserve/unreserve around pin
        drm/radeon: fix regression in dynpm due to multi-ring rework
        vga_switcheroo.h: fix pci_dev warning
        drm/udl: only bind to the video devices on the hub.
      fb09185a
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 41a328b9
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A bit larger set than usual, unfortunately -- I've been sitting on
        them longer than I meant to so it's really more like 2 -rc pull
        requests in one, volume-wise.
      
        Nearly everything is fixes for fallout from the merge window, or other
        fixes for bugs.  The one exception is the highbank L2-enablement
        patch, but it was contained enough that I picked it up anyway:
      
         - i.MX fixes, mostly for clock and pinctrl changes
         - OMAP fixes, mostly PM-related
         - A patch to enable L2 on highbank
         - A couple of fixes for PXA, Kirkwood, Versatile"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
        ARM: Kirkwood: Fix clk problems modular ethernet driver
        arm: versatile: fix and enable PCI I/O space
        ARM: highbank: Add smc calls to enable/disable the L2
        ARM i.MX imx21ads: Fix overlapping static i/o mappings
        ARM: imx6: exit coherency when shutting down a cpu
        ARM: mx51: Add pinctrl_provide_dummies()
        ARM: mx31: Add pinctrl_provide_dummies()
        ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code
        ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set
        ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected
        OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup
        ARM: mmp: fix missing cascade_irq in irq handler
        ARM: dts: update memory size on brownstone
        ARM i.MX27 Visstrim M10: fix gpio handling.
        ARM i.MX53: Fix PLL4 base address
        ARM i.MX pllv2: make round_rate accurate
        ARM i.MX pllv2: use standard register set unconditionally
        ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq
        ARM: imx: only call l2x0_init if it's available
        ARM: imx: only specify i2c device type once
        ...
      41a328b9
    • Andrew Lunn's avatar
      ARM: Kirkwood: Fix clk problems modular ethernet driver · 128789a8
      Andrew Lunn authored
      When the ethernet driver was built as a module, it would lock the
      machine when loaded. At boot the ethernet clks are unused, so get
      turned off.  Later, when the module is loaded, the probe function
      would access the hardware before the clock was restarted, and the
      machine would lock. It has also been determined that when the clk is
      turned off, the interface forgets its MAC address, which for most
      systems, is set by the boot loader.
      
      When the machine setup file creates a platform device for the
      interface, prepare and enable the clock for the interface. This will
      ensure it is not turned off. However, if the setup file only
      instantiates one platform device, the other will have its clk
      disabled, thus maybe saving a little power.
      Report-by: default avatarSimon Baatz <gmbnomis@gmail.com>
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Tested-by: default avatarSimon Baatz <gmbnomis@gmail.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      128789a8
    • Arnd Bergmann's avatar
      arm: versatile: fix and enable PCI I/O space · 9b0f7e39
      Arnd Bergmann authored
      With commit 4d5fc58d (ARM: remove bunch of now unused
      mach/io.h files), the I/O space setup was completely broken on
      versatile. This patch fixes that and prepares for further
      I/O space clean-up.
      
      I/O space handling on the versatile platform is currently
      broken in multiple ways. Most importantly, the ports do
      not get mapped into the virtual address space at all.
      
      Also, there is some amount of confusion between PCI I/O
      space and other statically mapped MMIO registers in the
      platform code:
      
      * The __io_address() macro that is used to access the
        platform register maps to the same __io macro that gets
        used for I/O space.
      
      * The IO_SPACE_LIMIT is set to a value that is much larger
        than the total available space.
      
      * The I/O resource of the PCI bus is set to the physical
        address of the mapping, which is way outside of the
        actual I/O space limit as well as the address range that
        gets decoded by traditional PCI cards.
      
      * No attempt is made to stay outside of the ISA port range
        that some device drivers try access.
      
      * No resource gets requested as a child of ioport_resource,
        but an IORESOURCE_IO type mapping gets requested
        as a child of iomem_resource.
      
      This patch attempts to correct all of the above. This makes
      it possible to use virtio-pci based virtual devices as well
      as actual PCI cards including those with legacy ISA port
      ranges like VGA.
      
      Some of the issues seem to be duplicated on other platforms.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [rob: update to 3.5-rc2 and io.h cleanup related changes]
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Tested-by: default avatarRobert Schwebel <r.schwebel@pengutronix.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9b0f7e39
    • Olof Johansson's avatar
      Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes · 7dea9e73
      Olof Johansson authored
      * 'fixes' of git://github.com/hzhuang1/linux:
        ARM: mmp: fix missing cascade_irq in irq handler
        ARM: dts: update memory size on brownstone
      7dea9e73
    • Linus Torvalds's avatar
      Linux 3.5-rc3 · 485802a6
      Linus Torvalds authored
      485802a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d8659832
      Linus Torvalds authored
      Pull btrfs compile warning fixes from Chris Mason.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: cast devid to unsigned long long for printk %llu
        Btrfs: init old_generation in get_old_root
      d8659832
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · c458175e
      Linus Torvalds authored
      Pull arch/tile update from Chris Metcalf:
       "This one-line bug fix unbreaks glibc robust mutexes (among other
        things no doubt), from code merged in during the 3.5 merge window but
        which we had been running internally at Tilera for almost a year."
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: fix bug in get_user() for 4-byte values
      c458175e
  6. 16 Jun, 2012 16 commits