1. 25 7月, 2012 2 次提交
    • R
      i2c: iop3xx: use standard gpiolib functions · 701eb264
      Rob Herring 提交于
      Instead of using the custom iop3xx gpio functions, use the gpiolib
      variants. This should be functionally the same since the gpiolib
      just calls the iop3xx gpio functions. This is needed in preparation
      of removing iop3xx mach/io.h headers.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
      Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
      Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
      Cc: linux-i2c@vger.kernel.org
      701eb264
    • R
      i2c: iop3xx: clean-up trailing whitespace · 67ac88ff
      Rob Herring 提交于
      Remove a bunch of trailing whitespace. No functional changes.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
      Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
      Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
      Cc: linux-i2c@vger.kernel.org
      67ac88ff
  2. 15 7月, 2012 8 次提交
  3. 14 7月, 2012 14 次提交
  4. 13 7月, 2012 10 次提交
  5. 12 7月, 2012 6 次提交
    • M
      ARM: EXYNOS: register devices in 'need_restore' state for pm_domains · ebc35c72
      Marek Szyprowski 提交于
      Commit ca1d72f0 ('PM / Domains: Make it possible to add devices to
      inactive domains') introduced possibility to add devices to inactive
      power domains and added pm_genpd_dev_need_restore() function which lets
      platform core to notify power domain core that the specified device must
      be restored (with its runtime_resume() callback) before first use.
      
      This patch adds the pm_genpd_dev_need_restore() call what brings back
      the suspend/resume behaviour for the client devices known from the
      previous power domain driver (removed by commit 91cfbd4e - 'ARM:
      EXYNOS: Hook up power domains to generic power domain infrastructure').
      Client device drivers relay on that suspend/resume behaviour, thus this
      patch fixes runtime pm operation for client devices.
      Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      Reviewed-by: NKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      ebc35c72
    • M
      ARM: EXYNOS: read initial state of power domain from hw registers · 76eb5567
      Marek Szyprowski 提交于
      Some bootloaders disable unused power domains to reduce power
      consuption. Power domain driver can easily read the actual state from
      the hardware registers instead of assuming that their initial state is
      always 'on'.
      Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      Reviewed-by: NKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      76eb5567
    • C
      SH: Convert out[bwl] macros to inline functions · 44033109
      Corey Minyard 提交于
      The macros just called BUG(), but that results in unused variable
      warnings all over the place, like in the IPMI driver.  The build
      regression emails were annoying me, so here's the fix.  I have
      not even compile tested this, but it's rather obvious.
      
      [ port type mangled to unsigned long ]
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      44033109
    • L
      Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6 · 918227bb
      Linus Torvalds 提交于
      Pull fbdev fixes from Florian Tobias Schandinat:
       "Two fixes for OMAPDSS by Tomi Valkeinen:
         - one to avoid warnings when runtime PM is not enabled
         - one workaround to dependancy issues during suspend/resume"
      
      * tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6:
        OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n
        OMAPDSS: Use PM notifiers for system suspend
      918227bb
    • L
      Merge branch 'akpm' (Andrew's patch-bomb) · 00c3e276
      Linus Torvalds 提交于
      Merge random patches from Andrew Morton.
      
      * Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (32 commits)
        memblock: free allocated memblock_reserved_regions later
        mm: sparse: fix usemap allocation above node descriptor section
        mm: sparse: fix section usemap placement calculation
        xtensa: fix incorrect memset
        shmem: cleanup shmem_add_to_page_cache
        shmem: fix negative rss in memcg memory.stat
        tmpfs: revert SEEK_DATA and SEEK_HOLE
        drivers/rtc/rtc-twl.c: fix threaded IRQ to use IRQF_ONESHOT
        fat: fix non-atomic NFS i_pos read
        MAINTAINERS: add OMAP CPUfreq driver to OMAP Power Management section
        sgi-xp: nested calls to spin_lock_irqsave()
        fs: ramfs: file-nommu: add SetPageUptodate()
        drivers/rtc/rtc-mxc.c: fix irq enabled interrupts warning
        mm/memory_hotplug.c: release memory resources if hotadd_new_pgdat() fails
        h8300/uaccess: add mising __clear_user()
        h8300/uaccess: remove assignment to __gu_val in unhandled case of get_user()
        h8300/time: add missing #include <asm/irq_regs.h>
        h8300/signal: fix typo "statis"
        h8300/pgtable: add missing #include <asm-generic/pgtable.h>
        drivers/rtc/rtc-ab8500.c: ensure correct probing of the AB8500 RTC when Device Tree is enabled
        ...
      00c3e276
    • Y
      memblock: free allocated memblock_reserved_regions later · 29f67386
      Yinghai Lu 提交于
      memblock_free_reserved_regions() calls memblock_free(), but
      memblock_free() would double reserved.regions too, so we could free the
      old range for reserved.regions.
      
      Also tj said there is another bug which could be related to this.
      
      | I don't think we're saving any noticeable
      | amount by doing this "free - give it to page allocator - reserve
      | again" dancing.  We should just allocate regions aligned to page
      | boundaries and free them later when memblock is no longer in use.
      
      in that case, when DEBUG_PAGEALLOC, will get panic:
      
           memblock_free: [0x0000102febc080-0x0000102febf080] memblock_free_reserved_regions+0x37/0x39
        BUG: unable to handle kernel paging request at ffff88102febd948
        IP: [<ffffffff836a5774>] __next_free_mem_range+0x9b/0x155
        PGD 4826063 PUD cf67a067 PMD cf7fa067 PTE 800000102febd160
        Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
        CPU 0
        Pid: 0, comm: swapper Not tainted 3.5.0-rc2-next-20120614-sasha #447
        RIP: 0010:[<ffffffff836a5774>]  [<ffffffff836a5774>] __next_free_mem_range+0x9b/0x155
      
      See the discussion at https://lkml.org/lkml/2012/6/13/469
      
      So try to allocate with PAGE_SIZE alignment and free it later.
      Reported-by: NSasha Levin <levinsasha928@gmail.com>
      Acked-by: NTejun Heo <tj@kernel.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NYinghai Lu <yinghai@kernel.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      29f67386