Skip to content
  1. Mar 03, 2013
    • James Hogan's avatar
      metag: System Calls · 26025bbf
      James Hogan authored
      
      
      Add metag system call and gateway page interfaces. The metag
      architecture port uses the generic system call numbers from
      asm-generic/unistd.h, as well as a user gateway page mapped at
      0x6ffff000 which contains fast atomic primitives (depending on SMP) and
      a fast method of accessing TLS data.
      
      System calls use the SWITCH instruction with the immediate 0x440001 to
      signal a system call.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      26025bbf
    • James Hogan's avatar
      metag: Internal and external irqchips · 5698c50d
      James Hogan authored
      
      
      Meta core internal interrupts (from HWSTATMETA and friends) are vectored
      onto the TR1 core trigger for the current thread. This is demultiplexed
      in irq-metag.c to individual Linux IRQs for each internal interrupt.
      
      External SoC interrupts (from HWSTATEXT and friends) are vectored onto
      the TR2 core trigger for the current thread. This is demultiplexed in
      irq-metag-ext.c to individual Linux IRQs for each external SoC interrupt.
      The external irqchip has devicetree bindings for configuring the number
      of irq banks and the type of masking available.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: Rob Landley <rob@landley.net>
      Cc: Dom Cobley <popcornmix@gmail.com>
      Cc: Simon Arlott <simon@fire.lp0.eu>
      Cc: Viresh Kumar <viresh.kumar@linaro.org>
      Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
      Cc: devicetree-discuss@lists.ozlabs.org
      Cc: linux-doc@vger.kernel.org
      5698c50d
    • James Hogan's avatar
      metag: IRQ handling · 63047ea3
      James Hogan authored
      
      
      Add core IRQ handling for metag. The code in irq.c exposes the TBX
      signal numbers as Linux IRQs.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      63047ea3
    • James Hogan's avatar
      metag: Traps · ac919f08
      James Hogan authored
      
      
      Add trap code for metag. At the lowest level Meta traps (and return from
      interrupt instruction - RTI) simply swap the PC and PCX registers and
      optionally toggle the interrupt status bit (ISTAT). Low level TBX code
      in tbipcx.S handles the core context save, determine the TBX signal
      number based on the core trigger that fired (using the TXSTATI status
      register), and call TBX signal handlers (mostly in traps.c) via a vector
      table.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      ac919f08
    • James Hogan's avatar
      metag: Time keeping · a2c5d4ed
      James Hogan authored
      
      
      Add time keeping code for metag. Meta hardware threads have 2 timers.
      The background timer (TXTIMER) is used as a free-running time base, and
      the interrupt timer (TXTIMERI) is used for the timer interrupt. Both
      counters traditionally count at approximately 1MHz.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: John Stultz <johnstul@us.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      a2c5d4ed
    • James Hogan's avatar
      metag: ptrace · bc3966bf
      James Hogan authored
      
      
      The ptrace interface for metag provides access to some core register
      sets using the PTRACE_GETREGSET and PTRACE_SETREGSET operations. The
      details of the internal context structures is abstracted into user API
      structures to both ease use and allow flexibility to change the internal
      context layouts. Copyin and copyout functions for these register sets
      are exposed to allow signal handling code to use them to copy to and
      from the signal context.
      
      struct user_gp_regs (NT_PRSTATUS) provides access to the core general
      purpose register context.
      
      struct user_cb_regs (NT_METAG_CBUF) provides access to the TXCATCH*
      registers which contains information abuot a memory fault, unaligned
      access error or watchpoint. This can be modified to alter the way the
      fault is replayed on resume ("catch replay"), or to prevent the replay
      taking place.
      
      struct user_rp_state (NT_METAG_RPIPE) provides access to the state of
      the Meta read pipeline which can be used to hide memory latencies in
      hand optimised data loops.
      
      Extended DSP register state, DSP RAM, and hardware breakpoint registers
      aren't yet exposed through ptrace.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Denys Vlasenko <vda.linux@googlemail.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
      bc3966bf
    • James Hogan's avatar
      metag: Device tree · 29dd78cf
      James Hogan authored
      
      
      Add device tree files to arch/metag.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Reviewed-by: default avatarVineet Gupta <vgupta@synopsys.com>
      29dd78cf
    • James Hogan's avatar
      metag: Signal handling · 262d96b0
      James Hogan authored
      
      
      Add signal handling code for metag.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      262d96b0
    • James Hogan's avatar
      metag: TCM support · c438b58e
      James Hogan authored
      
      
      Add some TCM support
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      c438b58e
    • James Hogan's avatar
      metag: Highmem support · bbc17704
      James Hogan authored
      
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      bbc17704
    • James Hogan's avatar
      metag: Huge TLB · e624e95b
      James Hogan authored
      
      
      Add huge TLB support to the metag architecture.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      e624e95b
    • James Hogan's avatar
      metag: Memory handling · 373cd784
      James Hogan authored
      
      
      Meta has instructions for accessing:
       - bytes        - GETB (1 byte)
       - words        - GETW (2 bytes)
       - doublewords  - GETD (4 bytes)
       - longwords    - GETL (8 bytes)
      
      All accesses must be aligned. Unaligned accesses can be detected and
      made to fault on Meta2, however it isn't possible to fix up unaligned
      writes so we don't bother fixing up reads either.
      
      This patch adds metag memory handling code including:
       - I/O memory (io.h, ioremap.c): Actually any virtual memory can be
         accessed with these helpers. A part of the non-MMUable address space
         is used for memory mapped I/O. The ioremap() function is implemented
         one to one for non-MMUable addresses.
       - User memory (uaccess.h, usercopy.c): User memory is directly
         accessible from privileged code.
       - Kernel memory (maccess.c): probe_kernel_write() needs to be
         overwridden to use the I/O functions when doing a simple aligned
         write to non-writecombined memory, otherwise the write may be split
         by the generic version.
      
      Note that due to the fact that a portion of the virtual address space is
      non-MMUable, and therefore always maps directly to the physical address
      space, metag specific I/O functions are made available (metag_in32,
      metag_out32 etc). These cast the address argument to a pointer so that
      they can be used with raw physical addresses. These accessors are only
      to be used for accessing fixed core Meta architecture registers in the
      non-MMU region, and not for any SoC/peripheral registers.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      373cd784
    • James Hogan's avatar
      metag: Memory management · f5df8e26
      James Hogan authored
      
      
      Add memory management files for metag.
      
      Meta's 32bit virtual address space is split into two halves:
       - local (0x08000000-0x7fffffff): traditionally local to a hardware
         thread and incoherent between hardware threads. Each hardware thread
         has it's own local MMU table. On Meta2 the local space can be
         globally coherent (GCOn) if the cache partitions coincide.
       - global (0x88000000-0xffff0000): coherent and traditionally global
         between hardware threads. On Meta2, each hardware thread has it's own
         global MMU table.
      
      The low 128MiB of each half is non-MMUable and maps directly to the
      physical address space:
       - 0x00010000-0x07ffffff: contains Meta core registers and maps SoC bus
       - 0x80000000-0x87ffffff: contains low latency global core memories
      
      Linux usually further splits the local virtual address space like this:
       - 0x08000000-0x3fffffff: user mappings
       - 0x40000000-0x7fffffff: kernel mappings
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      f5df8e26
    • James Hogan's avatar
      metag: Cache/TLB handling · 99ef7c2a
      James Hogan authored
      
      
      Add cache and TLB handling code for metag, including the required
      callbacks used by MM switches and DMA operations. Caches can be
      partitioned between the hardware threads and the global space, however
      this is usually configured by the bootloader so Linux doesn't make any
      changes to this configuration. TLBs aren't configurable, so only need
      consideration to flush them.
      
      On Meta1 the L1 cache was VIVT which required a full flush on MM switch.
      Meta2 has a VIPT L1 cache so it doesn't require the full flush on MM
      switch. Meta2 can also have a writeback L2 with hardware prefetch which
      requires some special handling. Support is optional, and the L2 can be
      detected and initialised by Linux.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      99ef7c2a
    • James Hogan's avatar
      metag: TBX source · 027f891f
      James Hogan authored
      
      
      Add source files from the Thread Binary Interface (TBI) library which
      provides useful low level operations and traps/context management.
      
      Among other things it handles interrupt/exception/syscall entry (in
      tbipcx.S).
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      027f891f
    • James Hogan's avatar
      metag: TBX header · 4ca151b2
      James Hogan authored
      
      
      Add the main header for the Thread Binary Interface (TBI) library which
      provides useful low level operations and trap/context management.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      4ca151b2
    • James Hogan's avatar
      metag: Boot · 85d9d7a9
      James Hogan authored
      
      
      Add boot code for metag. Due to the multi-threaded nature of Meta it is
      not uncommon for an RTOS or bare metal application to be started on
      other hardware threads by the bootloader. Since there is a single MMU
      switch which affects all threads, the MMU is traditionally configured by
      the bootloader prior to starting Linux. The bootloader passes a
      structure to Linux which among other things contains information about
      memory regions which have been mapped. Linux then assumes control of the
      local heap memory region.
      
      A kernel arguments string pointer or a flattened device tree pointer can
      be provided in the third argument.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      85d9d7a9
    • James Hogan's avatar
      metag: Header for core memory mapped registers · 87aa1328
      James Hogan authored
      
      
      Add the header <asm/metag_mem.h> describing addresses, fields, and bits
      of various core memory mapped registers in the low non-MMU region.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      87aa1328
    • James Hogan's avatar
      metag: Headers for core arch constants · af8a1049
      James Hogan authored
      
      
      Add a couple of header files containing core architecture constants.
      
      The first (<asm/metag_isa.h>) contains some constants relating to the
      instruction set, such as values to give to the CACHEW and CACHER
      instructions.
      
      The second (<asm/metag_regs.h>) contains constants for the core register
      units directly accessible to various instructions, and for the
      registers, fields, and bits in those units. The main units described are
      the control unit (CT.*), the trigger unit (TR.*), and the run-time trace
      unit (TT.*).
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      af8a1049
    • James Hogan's avatar
      metag: Add MAINTAINERS entry · 12285945
      James Hogan authored
      
      
      Add MAINTAINERS entry for the metag architecture port.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
      Cc: Cesar Eduardo Barros <cesarb@cesarb.net>
      Cc: Joe Perches <joe@perches.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      12285945
    • James Hogan's avatar
      trace/ring_buffer: handle 64bit aligned structs · 649508f6
      James Hogan authored
      
      
      Some 32 bit architectures require 64 bit values to be aligned (for
      example Meta which has 64 bit read/write instructions). These require 8
      byte alignment of event data too, so use
      !CONFIG_HAVE_64BIT_ALIGNED_ACCESS instead of !CONFIG_64BIT ||
      CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS to decide alignment, and align
      buffer_data_page::data accordingly.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Acked-by: Steven Rostedt <rostedt@goodmis.org> (previous version subtly different)
      649508f6
    • James Hogan's avatar
      Add HAVE_64BIT_ALIGNED_ACCESS · c19fa94a
      James Hogan authored
      
      
      On 64 bit architectures with no efficient unaligned access, padding and
      explicit alignment must be added in various places to prevent unaligned
      64bit accesses (such as taskstats and trace ring buffer).
      
      However this also needs to apply to 32 bit architectures with 64 bit
      accesses requiring alignment such as metag.
      
      This is solved by adding a new Kconfig symbol HAVE_64BIT_ALIGNED_ACCESS
      which defaults to 64BIT && !HAVE_EFFICIENT_UNALIGNED_ACCESS, and can be
      explicitly selected by METAG and any other relevant architectures. This
      can be used in various places to determine whether 64bit alignment is
      required.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Eric Paris <eparis@redhat.com>
      Cc: Will Drewry <wad@chromium.org>
      c19fa94a
    • James Hogan's avatar
      Revert some of "binfmt_elf: cleanups" · c07380be
      James Hogan authored
      The commit "binfmt_elf: cleanups"
      (f670d0ec
      
      ) removed an ifndef elf_map but
      this breaks compilation for metag which does define elf_map.
      
      This adds the ifndef back in as it was before, but does not affect the
      other cleanups made by that patch.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: linux-fsdevel@vger.kernel.org
      Acked-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      c07380be
    • James Hogan's avatar
      asm-generic/unistd.h: handle symbol prefixes in cond_syscall · 4dd3c959
      James Hogan authored
      
      
      Some architectures have symbol prefixes and set CONFIG_SYMBOL_PREFIX,
      but this wasn't taken into account by the generic cond_syscall. It's
      easy enough to fix in a generic fashion, so add the symbol prefix to
      symbol names in cond_syscall when CONFIG_SYMBOL_PREFIX is set.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
      4dd3c959
    • James Hogan's avatar
      asm-generic/io.h: check CONFIG_VIRT_TO_BUS · c93d0312
      James Hogan authored
      
      
      Make asm-generic/io.h check CONFIG_VIRT_TO_BUS before defining
      virt_to_bus() and bus_to_virt(), otherwise it's easy to accidentally
      have a silently failing incorrect direct mapped definition rather then
      no definition at all.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      c93d0312
  2. Feb 19, 2013
    • Linus Torvalds's avatar
      Linux 3.8 · 19f949f5
      Linus Torvalds authored
      19f949f5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · e9cf59ae
      Linus Torvalds authored
      Pull input subsystem fixes from Dmitry Torokhov:
       "Two small driver fixups and a documentation update for managed input
        devices"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - fix wacom_set_report retry logic
        Input: document that unregistering managed devices is not necessary
        Input: lm8323 - fix checking PWM interrupt status
      e9cf59ae
    • Linus Torvalds's avatar
      mm: fix pageblock bitmap allocation · 7c45512d
      Linus Torvalds authored
      Commit c060f943 ("mm: use aligned zone start for pfn_to_bitidx
      calculation") fixed out calculation of the index into the pageblock
      bitmap when a !SPARSEMEM zome was not aligned to pageblock_nr_pages.
      
      However, the _allocation_ of that bitmap had never taken this alignment
      requirement into accout, so depending on the exact size and alignment of
      the zone, the use of that index could then access past the allocation,
      resulting in some very subtle memory corruption.
      
      This was reported (and bisected) by Ingo Molnar: one of his random
      config builds would hang with certain very specific kernel command line
      options.
      
      In the meantime, commit c060f943
      
       has been marked for stable, so this
      fix needs to be back-ported to the stable kernels that backported the
      commit to use the right alignment.
      
      Bisected-and-tested-by: default avatarIngo Molnar <mingo@kernel.org>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7c45512d
  3. Feb 16, 2013
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.8-rc7-tag-two' of... · f741656d
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull xen fixes from Konrad Rzeszutek Wilk:
       "Two fixes:
      
         - A simple bug-fix for redundant NULL check.
      
         - CVE-2013-0228/XSA-42: x86/xen: don't assume %ds is usable in
           xen_iret for 32-bit PVOPS
      
        and two reverts:
      
         - Revert the PVonHVM kexec.  The patch introduces a regression with
           older hypervisor stacks, such as Xen 4.1."
      
      * tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        Revert "xen PVonHVM: use E820_Reserved area for shared_info"
        Revert "xen/PVonHVM: fix compile warning in init_hvm_pv_info"
        xen: remove redundant NULL check before unregister_and_remove_pcpu().
        x86/xen: don't assume %ds is usable in xen_iret for 32-bit PVOPS.
      f741656d
    • Mauro Carvalho Chehab's avatar
      Revert "[media] dvb_frontend: return -ENOTTY for unimplement IOCTL" · ac897586
      Mauro Carvalho Chehab authored
      As reported by Klaus Schmidinger:
       "In VDR I use an ioctl() call with FE_READ_UNCORRECTED_BLOCKS on a
        device (using stb0899).  After this call I check 'errno' for
        EOPNOTSUPP to determine whether this device supports this call.  This
        used to work just fine, until a few months ago I noticed that my
        devices using stb0899 didn't display their signal quality in VDR's OSD
        any more.  After further investigation I found that
        ioctl(FE_READ_UNCORRECTED_BLOCKS) no longer returns EOPNOTSUPP, but
        rather ENOTTY.  And since I stop getting the signal quality in case
        any unknown errno value appears, this broke my signal quality query
        function."
      
      While the changes reflect what is there at:
      
        http://comments.gmane.org/gmane.linux.kernel/1235728
      
      it does cause regression on userspace.  So, revert it to stop the
      damage.
      
      This reverts commit 177ffe50
      
       ("[media] dvb_frontend: return -ENOTTY
      for unimplement IOCTL").
      
      Reported-by: default avatarKlaus Schmidinger <Klaus.Schmidinger@tvdr.de>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ac897586
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 11e76514
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "A couple small fixes for sparc including some THP brown-paper-bag
        material:
      
         1) During the merging of all the THP support for various
            architectures, sparc missed adding a
            HAVE_ARCH_TRANSPARENT_HUGEPAGE to it's Kconfig, oops.
      
         2) Sparc needs to be mindful of hugepages in get_user_pages_fast().
      
         3) Fix memory leak in SBUS probe, from Cong Ding.
      
         4) The sunvdc virtual disk client driver has a test of the bitmask of
            vdisk server supported operations which was off by one bit"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sunvdc: Fix off-by-one in generic_request().
        sparc64: Fix get_user_pages_fast() wrt. THP.
        sparc64: Add missing HAVE_ARCH_TRANSPARENT_HUGEPAGE.
        sparc: kernel/sbus.c: fix memory leakage
      11e76514
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5c0857a9
      Linus Torvalds authored
      Pull one more x86 fix from Peter Anvin:
       "Sigh.  One more patch in the "please don't brick my Samsung" series"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter
      5c0857a9
    • Linus Torvalds's avatar
      Merge tag '3.8-pci-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · db1b2d32
      Linus Torvalds authored
      Pull PCI fix from Bjorn Helgaas:
       "This is another fix for v3.8.  It fixes an oops that happens when a
        Thunderbolt adapter is unplugged (remove device, poll for PME events
        on no-longer-existing device, oops)."
      
      * tag '3.8-pci-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI/PM: Clean up PME state when removing a device
      db1b2d32
    • Linus Torvalds's avatar
      Merge tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux · 7ea76ebb
      Linus Torvalds authored
      Pull omapdss fixes from Tomi Valkeinen:
       "It'd be great if these two late fixes would still make it into 3.8.
        The other one fixes ARM kernel compilation when using 'allyesconfig',
        and the other makes DPI displays function again on OMAP3630 boards:
      
         - Fix ARM compilation with "allyesconfig" (omapdrm: fix the
           dependency to omapdss)
      
         - fix DPI displays on OMAP3630 (OMAPDSS: add FEAT_DPI_USES_VDDS_DSI
           to omap3630_dss_feat_list)"
      
      * tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux:
        omapdrm: fix the dependency to omapdss
        OMAPDSS: add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list
      7ea76ebb
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · f0a34ac9
      Linus Torvalds authored
      Pull i2c maintainer info update from Wolfram Sang:
       "Since my old email and repos are not working anymore, and this already
        caused some confusion, I think a MAINTAINERS update for 3.8 is
        helpful.  So, people trying I2C with the new kernel can properly reach
        me and find my repos."
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        MAINTAINERS: change my email and repos
      f0a34ac9
  4. Feb 15, 2013
  5. Feb 14, 2013
    • Tomi Valkeinen's avatar
      omapdrm: fix the dependency to omapdss · 91e83ffd
      Tomi Valkeinen authored
      
      
      omapdrm uses "select" in Kconfig to enable omapdss. This doesn't work
      correctly, as "select" forces omapdss to be enabled in the config even
      if it normally could not be enabled because of missing Kconfig
      dependencies.
      
      This causes a build break on ARM, when using allyesconfig:
      
      drivers/video/omap2/dss/dss.c: In function 'dss_calc_clock_div':
      drivers/video/omap2/dss/dss.c:572:20: error: 'CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK' undeclared (first use in this function)
      drivers/video/omap2/dss/dss.c:572:20: note: each undeclared identifier is reported only once for each function it appears in
      
      Instead of using select, this patch changes omapdrm to use "depend
      on".
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      91e83ffd
    • NeilBrown's avatar
      OMAPDSS: add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list · eb91e79b
      NeilBrown authored
      commit 195e672a
      
      
         OMAPDSS: DPI: Remove cpu_is_xxxx checks
      
      made the mistake of assuming that cpu_is_omap34xx() is exclusive of
      other cpu_is_* predicates whereas it includes cpu_is_omap3630().
      
      So on an omap3630, code that was previously enabled by
        if (cpu_is_omap34xx())
      is now disabled as
        dss_has_feature(FEAT_DPI_USES_VDDS_DSI)
      fails.
      
      So add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list.
      
      Cc: Chandrabhanu Mahapatra <cmahapatra@ti.com>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      eb91e79b