1. 18 6月, 2012 1 次提交
  2. 17 6月, 2012 10 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · fb09185a
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 41a328b9
      Linus Torvalds 提交于
      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
    • A
      ARM: Kirkwood: Fix clk problems modular ethernet driver · 128789a8
      Andrew Lunn 提交于
      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: NSimon Baatz <gmbnomis@gmail.com>
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Tested-by: NSimon Baatz <gmbnomis@gmail.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      128789a8
    • A
      arm: versatile: fix and enable PCI I/O space · 9b0f7e39
      Arnd Bergmann 提交于
      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: NArnd Bergmann <arnd@arndb.de>
      [rob: update to 3.5-rc2 and io.h cleanup related changes]
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Tested-by: NRobert Schwebel <r.schwebel@pengutronix.de>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      9b0f7e39
    • O
      Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes · 7dea9e73
      Olof Johansson 提交于
      * 'fixes' of git://github.com/hzhuang1/linux:
        ARM: mmp: fix missing cascade_irq in irq handler
        ARM: dts: update memory size on brownstone
      7dea9e73
    • L
      Linux 3.5-rc3 · 485802a6
      Linus Torvalds 提交于
      485802a6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d8659832
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · c458175e
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6 · 88c144b1
      Linus Torvalds 提交于
      Pull fbdev fixes from Florian Tobias Schandinat:
      
       - two fixes for s3c-fb by Jingoo Han (including a fix for a potential
         division by zero)
      
       - a couple of randconfig fixes by Arnd Bergmann
      
       - a cleanup for bfin_adv7393fb by Emil Goode
      
      * tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
        video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
        video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
        drivers/tosa: driver needs I2C and SPI to compile
        drivers/savagefb: use mdelay instead of udelay
        video/console: automatically select a font
        video/ili9320: do not mark exported functions __devexit
        drivers/video: use correct __devexit_p annotation
        video: bfin_adv7393fb: Convert to kstrtouint_from_user
      88c144b1
    • C
      tile: fix bug in get_user() for 4-byte values · 6699c8cd
      Chris Metcalf 提交于
      The definition of 32-bit values in the 64-bit tilegx architecture is that
      they should be sign-extended regardless of whether they are considered
      signed or unsigned by the compiler.  Accordingly, we need to use an
      "ld4s" rather than "ld4u" to load and sign-extend for get_user().
      
      This fixes glibc bug 14238 (see http://sourceware.org/bugzilla),
      introduced during the 3.5 merge window.
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      6699c8cd
  3. 16 6月, 2012 29 次提交