Eric Lee / smarc-fsl-linux-kernel

09 Aug, 2012

3 commits

04 Aug, 2012

1 commit

  • 587a9e1f9   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... Browse Code »

    Pull m68k updates from Geert Uytterhoeven.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k: Make sys_atomic_cmpxchg_32 work on classic m68k
    m68k/apollo: Rename "timer" to "apollo_timer"
    zorro: Remove unused zorro_bus.devices
    m68k: Remove never used asm/shm.h
    m68k/sun3: Remove unselectable code in prom_init()
    m68k: Use asm-generic version of
    m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop}
    mtd/uclinux: Use generic __bss_stop instead of _ebss
    m68knommu: Allow ColdFire CPUs to use unaligned accesses
    m68k: Remove five unused headers
    m68k: CPU32 does not support unaligned accesses
    m68k: Introduce config option CPU_HAS_NO_UNALIGNED
    m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64
    m68k: Move CPU_HAS_* config options
    m68k: Remove duplicate FPU config option
    m68knommu: Clean up printing of sections
    m68k: Use asm-generic version of
    m68k: Use Kbuild logic to import asm-generic headers

    Linus Torvalds
     

02 Aug, 2012

1 commit

01 Aug, 2012

4 commits

31 Jul, 2012

1 commit

  • c1d7e01d7   ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION ... Browse Code »

    Rather than #define the options manually in the architecture code, add
    Kconfig options for them and select them there instead. This also allows
    us to select the compat IPC version parsing automatically for platforms
    using the old compat IPC interface.

    Reported-by: Andrew Morton
    Signed-off-by: Will Deacon
    Cc: Arnd Bergmann
    Cc: Chris Metcalf
    Cc: Catalin Marinas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Will Deacon
     

26 Jul, 2012

1 commit

25 Jul, 2012

5 commits

  • a3fd869a6   Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest Browse Code »
    Paul Mundt
     
  • 90eed7d87   sh: Fix up recursive fault in oops with unset TTB. ... Browse Code »

    Presently the oops code looks for the pgd either from the mm context or
    the cached TTB value. There are presently cases where the TTB can be
    unset or otherwise cleared by hardware, which we weren't handling,
    resulting in recursive faults on the NULL pgd. In these cases we can
    simply reload from swapper_pg_dir and continue on as normal.

    Cc: stable@vger.kernel.org
    Signed-off-by: Paul Mundt

    Paul Mundt
     
  • c511dc1fb   Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Browse Code »

    Pull slave-dmaengine update from Vinod Koul:
    "This time we have a new dmaengine driver from the tegra folks. Also
    we have Guennadi's cleanup of sh drivers which incudes a library for
    sh drivers. And the usual odd fixes in bunch of drivers and some nice
    cleanup of dw_dmac from Andy."

    Fix up conflicts in drivers/mmc/host/sh_mmcif.c

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
    dmaengine: Cleanup logging messages
    mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
    dma: sh: provide a migration path for slave drivers to stop using .private
    dma: sh: use an integer slave ID to improve API compatibility
    dmaengine: shdma: prepare to stop using struct dma_chan::private
    sh: remove unused DMA device pointer from SIU platform data
    ASoC: siu: don't use DMA device for channel filtering
    dmaengine: shdma: (cosmetic) simplify a static function
    dmaengine: at_hdmac: add a few const qualifiers
    dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
    dw_dmac: mark dwc_dump_lli inline
    dma: mxs-dma: Export missing symbols from mxs-dma.c
    dma: shdma: convert to the shdma base library
    ASoC: fsi: prepare for conversion to the shdma base library
    usb: renesas_usbhs: prepare for conversion to the shdma base library
    ASoC: siu: prepare for conversion to the shdma base library
    serial: sh-sci: prepare for conversion to the shdma base library
    mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
    mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
    dma: shdma: prepare for conversion to the shdma base library
    ...

    Linus Torvalds
     
  • 6dd53aa45   Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci ... Browse Code »

    Pull PCI changes from Bjorn Helgaas:
    "Host bridge hotplug:
    - Add MMCONFIG support for hot-added host bridges (Jiang Liu)
    Device hotplug:
    - Move fixups from __init to __devinit (Sebastian Andrzej Siewior)
    - Call FINAL fixups for hot-added devices, too (Myron Stowe)
    - Factor out generic code for P2P bridge hot-add (Yinghai Lu)
    - Remove all functions in a slot, not just those with _EJx (Amos
    Kong)
    Dynamic resource management:
    - Track bus number allocation (struct resource tree per domain)
    (Yinghai Lu)
    - Make P2P bridge 1K I/O windows work with resource reassignment
    (Bjorn Helgaas, Yinghai Lu)
    - Disable decoding while updating 64-bit BARs (Bjorn Helgaas)
    Power management:
    - Add PCIe runtime D3cold support (Huang Ying)
    Virtualization:
    - Add VFIO infrastructure (ACS, DMA source ID quirks) (Alex
    Williamson)
    - Add quirks for devices with broken INTx masking (Jan Kiszka)
    Miscellaneous:
    - Fix some PCI Express capability version issues (Myron Stowe)
    - Factor out some arch code with a weak, generic, pcibios_setup()
    (Myron Stowe)"

    * tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (122 commits)
    PCI: hotplug: ensure a consistent return value in error case
    PCI: fix undefined reference to 'pci_fixup_final_inited'
    PCI: build resource code for M68K architecture
    PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_width()
    PCI: reorder __pci_assign_resource() (no change)
    PCI: fix truncation of resource size to 32 bits
    PCI: acpiphp: merge acpiphp_debug and debug
    PCI: acpiphp: remove unused res_lock
    sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()
    PCI: call final fixups hot-added devices
    PCI: move final fixups from __init to __devinit
    x86/PCI: move final fixups from __init to __devinit
    MIPS/PCI: move final fixups from __init to __devinit
    PCI: support sizing P2P bridge I/O windows with 1K granularity
    PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)
    PCI: disable MEM decoding while updating 64-bit MEM BARs
    PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too
    PCI: never discard enable/suspend/resume_early/resume fixups
    PCI: release temporary reference in __nv_msi_ht_cap_quirk()
    PCI: restructure 'pci_do_fixups()'
    ...

    Linus Torvalds
     
  • d14b7a419   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    Pull trivial tree from Jiri Kosina:
    "Trivial updates all over the place as usual."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
    Fix typo in include/linux/clk.h .
    pci: hotplug: Fix typo in pci
    iommu: Fix typo in iommu
    video: Fix typo in drivers/video
    Documentation: Add newline at end-of-file to files lacking one
    arm,unicore32: Remove obsolete "select MISC_DEVICES"
    module.c: spelling s/postition/position/g
    cpufreq: Fix typo in cpufreq driver
    trivial: typo in comment in mksysmap
    mach-omap2: Fix typo in debug message and comment
    scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
    Change email address for Steve Glendinning
    Btrfs: fix typo in convert_extent_bit
    via: Remove bogus if check
    netprio_cgroup.c: fix comment typo
    backlight: fix memory leak on obscure error path
    Documentation: asus-laptop.txt references an obsolete Kconfig item
    Documentation: ManagementStyle: fixed typo
    mm/vmscan: cleanup comment error in balance_pgdat
    mm: cleanup on the comments of zone_reclaim_stat
    ...

    Linus Torvalds
     

24 Jul, 2012

1 commit

  • 47b170af8   Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh ... Browse Code »

    Pull SuperH updates from Paul Mundt:

    - Migration off of old-style dynamic IRQ API.

    - irqdomain and generic irq chip propagation.

    - div4/6 clock consolidation, another step towards co-existing with the
    common struct clk infrastructure.

    - Extensive PFC rework
    - Decoupling GPIO from pin state.
    - Initial pinctrl support to facilitate incremental migration off of
    legacy pinmux.
    - gpiolib support made optional, and made pinctrl-backed.

    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (38 commits)
    sh: pfc: pin config get/set support.
    sh: pfc: Prefer DRV_NAME over KBUILD_MODNAME.
    sh: pfc: pinctrl legacy group support.
    sh: pfc: Ignore pinmux GPIOs with invalid enum IDs.
    sh: pfc: Export pinctrl binding init symbol.
    sh: pfc: Error out on pinctrl init resolution failure.
    sh: pfc: Make pr_fmt consistent across pfc drivers.
    sh: pfc: pinctrl legacy function support.
    sh: pfc: Rudimentary pinctrl-backed GPIO support.
    sh: pfc: Dumb GPIO stringification.
    sh: pfc: Shuffle PFC support core.
    sh: pfc: Verify pin type encoding size at build time.
    sh: pfc: Kill off unused pinmux bias flags.
    sh: pfc: Make gpio chip support optional where possible.
    sh: pfc: Split out gpio chip support.
    sh64: Fix up section mismatch warnings.
    sh64: Attempt to make reserved insn trap handler resemble C.
    sh: Consolidate die definitions for trap handlers.
    sh64: Kill off old exception debugging helpers.
    sh64: Use generic unaligned access control/counters.
    ...

    Linus Torvalds
     

20 Jul, 2012

2 commits

17 Jul, 2012

1 commit

  • 90b24cfb4   Change email address for Steve Glendinning ... Browse Code »

    I no longer have a mailbox at smsc.com, and I've had two reports
    that that email address now bounces from people trying to
    contact me. This patch updates all references to that invalid
    address to one that I can be contacted on more permanently.

    This patch also updates the maintainer status to reflect
    the fact I'm no longer directly paid to maintain these drivers.

    Signed-off-by: Steve Glendinning
    Signed-off-by: Jiri Kosina

    Steve Glendinning
     

12 Jul, 2012

1 commit

  • 44033109e   SH: Convert out[bwl] macros to inline functions ... Browse Code »

    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: Corey Minyard
    Signed-off-by: Paul Mundt

    Corey Minyard
     

06 Jul, 2012

4 commits

  • 89d71486b   sh: select the fixed regulator driver on several boards ... Browse Code »

    On systems, using regulators to supply power to devices, if the REGULATOR
    Kconfig option is disabled, regulator API stubs will be used, which often
    suffices to bring a default configuration up. If REGULATOR is enabled but
    respective regulator drivers are inactive, the real regulator API calls
    will be used, which in the absence of drivers will fail to provide
    services. This patch prevents such a problem on sh-mobile boards by
    forcing REGULATOR_FIXED_VOLTAGE on if REGULATOR is selected.

    Signed-off-by: Guennadi Liakhovetski
    Signed-off-by: Paul Mundt

    Guennadi Liakhovetski
     
  • 85a00dd39   Merge branch 'pci/myron-pcibios_setup' into next ... Browse Code »

    * pci/myron-pcibios_setup:
    xtensa/PCI: factor out pcibios_setup()
    x86/PCI: adjust section annotations for pcibios_setup()
    unicore32/PCI: adjust section annotations for pcibios_setup()
    tile/PCI: factor out pcibios_setup()
    sparc/PCI: factor out pcibios_setup()
    sh/PCI: adjust section annotations for pcibios_setup()
    sh/PCI: factor out pcibios_setup()
    powerpc/PCI: factor out pcibios_setup()
    parisc/PCI: factor out pcibios_setup()
    MIPS/PCI: adjust section annotations for pcibios_setup()
    MIPS/PCI: factor out pcibios_setup()
    microblaze/PCI: factor out pcibios_setup()
    ia64/PCI: factor out pcibios_setup()
    cris/PCI: factor out pcibios_setup()
    alpha/PCI: factor out pcibios_setup()
    PCI: pull pcibios_setup() up into core

    Bjorn Helgaas
     
  • ce8dd71ad   sh/PCI: adjust section annotations for pcibios_setup() ... Browse Code »

    Make pcibios_setup() consistently use the "__init" section annotation.

    Signed-off-by: Myron Stowe
    Signed-off-by: Bjorn Helgaas

    Myron Stowe
     
  • 86927f934   sh/PCI: factor out pcibios_setup() ... Browse Code »

    The PCI core provides a generic pcibios_setup() routine. Drop this
    architecture-specific version in favor of that.

    Tested-by: Nobuhiro Iwamatsu
    Acked-by: Paul Mundt
    Signed-off-by: Myron Stowe
    Signed-off-by: Bjorn Helgaas

    Myron Stowe
     

02 Jul, 2012

1 commit

  • 64941d893   sh: Fix up se7721 GPIOLIB=y build warnings. ... Browse Code »

    Presently the SH7720/21 serial code uses asm/gpio.h to get at the CPU
    GPIO port definitions, but in the case of GPIOLIB=y this also includes
    references to generic GPIOLIB routines that we don't have any function
    declarations for, tripping up on -Werror=implicit-function-declaration
    with newer gcc versions:

    CC arch/sh/kernel/cpu/sh3/serial-sh7720.o
    In file included from include/linux/sh_pfc.h:14:0,
    from arch/sh/include/asm/gpio.h:23,
    from arch/sh/kernel/cpu/sh3/serial-sh7720.c:5:
    include/asm-generic/gpio.h: In function 'gpio_get_value_cansleep':
    include/asm-generic/gpio.h:220:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration]
    include/asm-generic/gpio.h: In function 'gpio_set_value_cansleep':
    include/asm-generic/gpio.h:226:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration]
    In file included from arch/sh/include/asm/gpio.h:23:0,
    from arch/sh/kernel/cpu/sh3/serial-sh7720.c:5:
    include/linux/sh_pfc.h: At top level:
    include/linux/sh_pfc.h:121:19: error: field 'chip' has incomplete type

    Switch to using the cpu/ version for the port definitions explicitly.

    Signed-off-by: Paul Mundt

    Paul Mundt
     

28 Jun, 2012

14 commits