1. 19 Feb, 2013 1 commit
  2. 18 Feb, 2013 2 commits
  3. 11 Feb, 2013 1 commit
  4. 10 Feb, 2013 3 commits
  5. 09 Feb, 2013 3 commits
  6. 07 Feb, 2013 6 commits
  7. 05 Feb, 2013 15 commits
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.9-dt' of... · 5b22c33e
      Olof Johansson authored
      Merge tag 'tegra-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt
      
      From Stephen Warren:
      ARM: tegra: device tree updates
      
      Numerous updates to the various Tegra device trees are made:
      
      * Addition of NVIDIA Beaver (Tegra30) and Toradex Colibri T20 and Iris
        carrier boards.
      * Enablement of the HDMI connector on most boards.
      * Enablement of the keyboard controller on a few boards.
      * Addition of the AC'97 controller to Tegra20.
      * Addition of a GPIO poweroff node for TrimSlice.
      * Changes to support the new "high speed UART" (DMA-capable) driver for
        Tegra serial ports, and enablement for Cardhu's UART C.
      * A few cleanups, such as compatible flag fixes, node renames, node
        ordering fixes, commonizing properties into SoC .dtsi files, etc..
      
      This pull request is based on (most of) the previous pull request with
      tag tegra-for-3.9-soc-t114.
      
      * tag 'tegra-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (22 commits)
        ARM: dt: tegra30: Rename "smmu" to "iommu"
        ARM: dt: tegra20: Rename "gart" to "iommu"
        ARM: tegra: move serial clock-frequency attr into the Tegra30 dtsi
        ARM: tegra: Add Toradex Iris carrier board DT with T20 512MB COM
        ARM: tegra: Add Colibri T20 512MB COM device tree
        ARM: tegra: move serial clock-frequency attr into the Tegra20 dtsi
        ARM: tegra: harmony: enable keyboard in DT
        ARM: tegra: whistler: enable keyboard in DT
        ARM: tegra: cardhu: register UARTC
        ARM: tegra: seaboard: enable keyboard in DT
        ARM: tegra: add DT entry for KBC controller
        ARM: tegra: swap cache-/interrupt-ctrlr nodes in DT
        ASoC: tegra: add ac97 host controller to device tree
        ARM: DT: tegra: Add Tegra30 Beaver board support
        ARM: DT: tegra: Add board level compatible properties
        ARM: tegra: paz00: enable HDMI port
        ARM: tegra: ventana: enable HDMI port
        ARM: tegra: seaboard: enable HDMI port
        ARM: tegra: trimslice: add gpio-poweroff node to DT
        ARM: DT: tegra: Unify the description of Tegra20 boards
        ...
      5b22c33e
    • Olof Johansson's avatar
      Merge branch 'next/soc' into next/dt · 0b6ad80a
      Olof Johansson authored
      0b6ad80a
    • Olof Johansson's avatar
      ARM: tegra: remove empty tegra_smp_init_cpus() · f7c66dc0
      Olof Johansson authored
      Based on two separate cleanup branches, it's now empty and can be removed.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      f7c66dc0
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.9-soc-t114' of... · e9daa0ea
      Olof Johansson authored
      Merge tag 'tegra-for-3.9-soc-t114' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
      
      From Stepen Warren:
      ARM: tegra: add Tegra114 SoC support
      
      This pull request adds initial support for the Tegra114 SoC, which
      integrates a quad-core ARM Cortex-A15 CPU. I'm proud to observe that we
      posted the initial versions of these patches before the final official
      announcement of this chip.
      
      These patches are enough to boot with a UART-based console, support the
      Dalmore and Pluto reference/evaluation boards, instantiate the GPIO and
      pinctrl drivers, and enable a cpuidle state. As yet, no clocks or
      storage devices are supported, but patches for those will follow shortly.
      
      This pull request is based on (most of) the previous pull request with
      tag tegra-for-3.9-soc-cpuidle, followed by a merge of the previous pull
      request with tag tegra-for-3.9-scu-base-rework.
      
      * tag 'tegra-for-3.9-soc-t114' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (24 commits)
        ARM: DT: tegra114: add pinmux DT entry
        ARM: DT: tegra114: add GPIO DT entry
        ARM: tegra114: select PINCTRL for Tegra114 SoC
        ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support
        ARM: tegra: Add SMMU entry to Tegra114 DT
        ARM: tegra: add AHB entry to Tegra114 DT
        ARM: tegra: Add initial support for Tegra114 SoC.
        ARM: dt: tegra114: Add new board, Pluto
        ARM: dt: tegra114: Add new board, Dalmore
        ARM: dt: tegra114: Add new SoC base, Tegra114 SoC
        ARM: tegra: fuse: Add chip ID Tegra114 0x35
        ARM: OMAP: Make use of available scu_a9_get_base() interface
        ARM: tegra: Skip scu_enable(scu_base) if not Cortex A9
        ARM: Add API to detect SCU base address from CP15
        ARM: tegra: Use DT /cpu node to detect number of CPU core
        ARM: tegra: Add CPU nodes to Tegra30 device tree
        ARM: tegra: Add CPU nodes to Tegra20 device tree
        ARM: perf: simplify __hw_perf_event_init err handling
        ARM: perf: remove unnecessary checks for idx < 0
        ARM: perf: handle armpmu_register failing
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      
      Remove/add conflict in arch/arm/mach-tegra/common.c resolved.
      Remove/remove conflict in arch/arm/mach-tegra/platsmp.c. Leave the empty
      stub function for now since removing it in the merge commit is confusing;
      will be cleaned up in a separate commit.  # # It looks like you may be
      committing a merge.  # If this is not correct, please remove the file #
      .git/MERGE_HEAD # and try again.
      e9daa0ea
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.9-soc-cpuidle' of... · c8bfea36
      Olof Johansson authored
      Merge tag 'tegra-for-3.9-soc-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
      
      From Stephen Warren:
      ARM: tegra: cpuidle enhancements
      
      This pull request implements a new "LP2" cpuidle state for Tegra20,
      which makes use of the couple cpuidle feature.
      
      It is based on (most of) the previous pull request, with tag
      tegra-for-3.9-soc-usb.
      
      * tag 'tegra-for-3.9-soc-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode
        ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit
        clk: tegra20: Implementing CPU low-power function for tegra_cpu_car_ops
        ARM: tegra20: cpuidle: add powered-down state for secondary CPU
        ARM: tegra: add pending SGI checking API
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c8bfea36
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.9-soc-usb' of... · ceca718f
      Olof Johansson authored
      Merge tag 'tegra-for-3.9-soc-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
      
      From Stephen Warren:
      ARM: tegra: USB driver cleanup
      
      The Tegra USB driver has a number of issues:
      
      1) The PHY driver isn't a true platform device, and doesn't implement
         the standard USB PHY API.
      
      2) struct device instance numbers were used to make decisions in the
         driver, rather than being parameterized by DT or platform data.
      
      This pull request solves issue (2), and lays the groundwork for solving
      issue (1). The work on issue (1) involved introducing new DT nodes for
      the USB PHYs, which in turn interacted with the Tegra common clock
      framework changes, due to the move of clock lookups into device tree.
      Hence, these USB driver changes are taken through the Tegra tree with
      acks from USB maintainers.
      
      This pull request is based on the previous pull request, with tag
      tegra-for-3.9-soc-ccf.
      
      * tag 'tegra-for-3.9-soc-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        usb: host: tegra: make use of PHY pointer of HCD
        ARM: tegra: Add reset GPIO information to PHY DT node
        usb: host: tegra: don't touch EMC clock
        usb: add APIs to access host registers from Tegra PHY
        USB: PHY: tegra: Get rid of instance number to differentiate PHY type
        USB: PHY: tegra: get rid of instance number to differentiate legacy controller
        ARM: tegra: add clocks properties to USB PHY nodes
        ARM: tegra: add DT nodes for Tegra USB PHY
        usb: phy: remove unused APIs from Tegra PHY.
        usb: host: tegra: Resetting PORT0 based on information received via DT.
        ARM: tegra: Add new DT property to USB node.
        usb: phy: use kzalloc to allocate struct tegra_usb_phy
        ARM: tegra: remove USB address related macros from iomap.h
      ceca718f
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.9-soc-ccf' of... · bda6f8e6
      Olof Johansson authored
      Merge tag 'tegra-for-3.9-soc-ccf' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
      
      From Stephen Warren:
      ARM: tegra: Common Clock Framework rework
      
      Tegra already supports the common clock framework, but had issues:
      
      1) The clock driver was located in arch/arm/mach-tegra/ rather than
         drivers/clk/.
      
      2) A single "Tegra clock" type was implemented, rather than separate
         clock types for PLL, mux, divider, ... type in HW.
      
      3) Clock lookups by device drivers were still driven by device name
         and connection ID, rather than through device tree.
      
      This pull request solves all three issues. This required some DT changes
      to add clocks properties, and driver changes to request clocks more
      "correctly". Finally, this rework allows all AUXDATA to be removed from
      Tegra board files, and various duplicate clock lookup entries to be
      removed from the driver.
      
      This pull request is based on the previous pull request, with tag
      tegra-for-3.9-cleanup.
      
      * tag 'tegra-for-3.9-soc-ccf' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (31 commits)
        clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s
        clk: tegra20: remove unused TEGRA_CLK_DUPLICATE()s
        ARM: tegra30: remove auxdata
        ARM: tegra20: remove auxdata
        ASoC: tegra: remove auxdata
        staging: nvec: remove use of clk_get_sys
        ARM: tegra: paz00: add clock information to DT
        ARM: tegra: add clock properties to Tegra30 DT
        ARM: tegra: add clock properties to Tegra20 DT
        spi: tegra: do not use clock name to get clock
        ARM: tegra: remove legacy clock code
        ARM: tegra: migrate to new clock code
        clk: tegra: add clock support for Tegra30
        clk: tegra: add clock support for Tegra20
        clk: tegra: add Tegra specific clocks
        ARM: tegra: define Tegra30 CAR binding
        ARM: tegra: define Tegra20 CAR binding
        ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h
        ARM: tegra: add function to read chipid
        ARM: tegra: fix compile error when disable CPU_IDLE
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      
      Conflicts:
      	arch/arm/mach-tegra/board-dt-tegra20.c
      	arch/arm/mach-tegra/board-dt-tegra30.c
      	arch/arm/mach-tegra/common.c
      	arch/arm/mach-tegra/platsmp.c
      	drivers/clocksource/Makefile
      bda6f8e6
    • Olof Johansson's avatar
      Merge tag 'renesas-soc3-for-v3.9' of... · c35a0bfa
      Olof Johansson authored
      Merge tag 'renesas-soc3-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      From Simon Horman:
      Third round of Renesas ARM-based SoC changes for v3.9
      
      A fix for r8a7779 clocks.
      
      * tag 'renesas-soc3-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7779: Correct TMU clock support
      c35a0bfa
    • Linus Walleij's avatar
      ARM: nomadik: fix OF compilation regression · f015941f
      Linus Walleij authored
      The Nomadik Device Tree patch series accidentally
      selected OF instead of USE_OF which led to problems
      during compile:
      
      arch/arm/kernel/devtree.c: In function 'arm_dt_memblock_reserve':
      /home/elinwal/linux-arm-soc/arch/arm/kernel/devtree.c:43:7: error: 'initial_boot_params' undeclared (first use in this function)
      (etc).
      
      This fixes it up by selecting USE_OF instead.
      Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      f015941f
    • Olof Johansson's avatar
      Merge tag 'v3.8-rc6' into next/dt · 604d11d9
      Olof Johansson authored
      Linux 3.8-rc6
      604d11d9
    • Olof Johansson's avatar
      Merge tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux into next/soc · 71e45bd2
      Olof Johansson authored
      From Jason Cooper:
      mvebu drivers for v3.9
       - use rtc-mv in mvebu armv7 SoCs
       - add pci-e hotplug for kirkwood
      
      Depends on:
       - tags/mvebu_fixes_for_v3.8-rc6
      
      * tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux:
        cpuidle: kirkwood: Move out of mach directory
        rtc: Add support of rtc-mv for MVEBU SoCs
        ARM: Kirkwood: Support basic hotplug for PCI-E
        arm: mvebu: i2c come back in defconfig
        arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
        Dove: activate GPIO interrupts in DT
      71e45bd2
    • Olof Johansson's avatar
      Merge tag 'v3.8-rc6' into next/soc · 469da620
      Olof Johansson authored
      Linux 3.8-rc6
      469da620
    • Olof Johansson's avatar
      Merge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc · 42279616
      Olof Johansson authored
      From Shawn Guo:
      imx6q cpuidle support for 3.9
      
       - It's based on imx-cleanup-3.9 to avoid conflicts.
      
      * tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: imx6q: support WAIT mode using cpuidle
        ARM: imx: move imx6q_cpuidle_driver into a separate file
        ARM: imx: mask gpc interrupts initially
        ARM: imx: return zero in case next event gets a large increment
        ARM: imx: Remove mx508 support
        ARM: imx: Remove mach-mx51_3ds board
        ARM: imx: use debug_ll_io_init() for imx6q
        ARM: imx: remove unused imx6q_clock_map_io()
        ARM: mach-imx: Kconfig: Do not select Babbage for MACH_IMX51_DT
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      
      Still, two delete/change conflicts caused by imx/cleanup:
      
      	arch/arm/mach-imx/mach-mx50_rdp.c
      	arch/arm/mach-imx/mach-mx51_3ds.c
      42279616
    • Barry Song's avatar
      ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move · ef4acb75
      Barry Song authored
      Fix the issue:
      tree:   git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc
      head:   6ed05a2a
      commit: af70fdc9 [4/8] Merge branch 'marco-timer-cleanup-rebase' of
      git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/soc
      config: make ARCH=arm prima2_defconfig
      
      All error/warnings:
      
      >> arch/arm/mach-prima2/platsmp.c:20:30: fatal error: asm/hardware/gic.h: No such file or directory
         compilation terminated.
      --
      >> arch/arm/mach-prima2/common.c:15:30: fatal error: asm/hardware/gic.h: No such file or directory
         compilation terminated.
      Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
      Cc: Xie ChanglongX <changlongx.xie@intel.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ef4acb75
    • Simon Horman's avatar
      ARM: shmobile: r8a7779: Correct TMU clock support · 58079fa7
      Simon Horman authored
      During code review it was noticed that the clock value for
      TMU01 was incorrect and the value for TMU02 was missing.
      
      For reference: As of 3.8-rc6 there are no in-tree consumes of these clocks.
      Reported-by: default avatarDenis Oliver Kropp <dok@directfb.org>
      Reviewed-by: default avatarMagnus Damm <damm@opensource.se>
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      58079fa7
  8. 03 Feb, 2013 1 commit
  9. 01 Feb, 2013 3 commits
  10. 31 Jan, 2013 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · cf5425bf
      Linus Torvalds authored
      PullHID fixes from Jiri Kosina:
      
       - fix i2c-hid and hidraw interaction, by Benjamin Tissoires
      
       - a quirk to make a particular device (Formosa IR receiver) work
         properly, by Nicholas Santos
      
      * 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: i2c-hid: fix i2c_hid_output_raw_report
        HID: usbhid: quirk for Formosa IR receiver
        HID: remove x bit from sensor doc
      cf5425bf
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.8-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · bf6c8a81
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Error reporting in nfs_xdev_mount incorrectly maps all errors to
         ENOMEM
      
       - Fix an NFSv4 refcounting issue
      
       - Fix a mount failure when the server reboots during NFSv4 trunking
         discovery
      
       - NFSv4.1 mounts may need to run the lease recovery thread.
      
       - Don't silently fail setattr() requests on mountpoints
      
       - Fix a SUNRPC socket/transport livelock and priority queue issue
      
       - We must handle NFS4ERR_DELAY when resetting the NFSv4.1 session.
      
      * tag 'nfs-for-3.8-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFSv4.1: Handle NFS4ERR_DELAY when resetting the NFSv4.1 session
        SUNRPC: When changing the queue priority, ensure that we change the owner
        NFS: Don't silently fail setattr() requests on mountpoints
        NFSv4.1: Ensure that nfs41_walk_client_list() does start lease recovery
        NFSv4: Fix NFSv4 trunking discovery
        NFSv4: Fix NFSv4 reference counting for trunked sessions
        NFS: Fix error reporting in nfs_xdev_mount
      bf6c8a81
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · aeb8eede
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "A number of fixes all across the MIPS tree.  No area is particularly
        standing out and things have cooled down quite nicely for a release."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Function tracer: Fix broken function tracing
        mips: Move __virt_addr_valid() to a place for MIPS 64
        MIPS: Netlogic: Fix UP compilation on XLR
        MIPS: AR71xx: Fix AR71XX_PCI_MEM_SIZE
        MIPS: AR724x: Fix AR724X_PCI_MEM_SIZE
        MIPS: Lantiq: Fix cp0_perfcount_irq mapping
        MIPS: DSP: Fix DSP mask for registers.
        MIPS: Fix build failure by adding definition of pfn_pmd().
        MIPS: Octeon: Fix warning.
        MIPS: delay.c: Check BITS_PER_LONG instead of __SIZEOF_LONG__
        MIPS: PNX833x: Fix comment.
        MIPS: Add struct p_format to union mips_instruction.
        MIPS: Export <asm/break.h>.
        MIPS: BCM47xx: Enable SSB prerequisite SSB_DRIVER_PCICORE.
        MIPS: BCM47xx: Select GPIOLIB for BCMA on bcm47xx platform
        MIPS: vpe.c: Fix null pointer dereference in print arguments.
      aeb8eede
    • Andrew Lunn's avatar
      cpuidle: kirkwood: Move out of mach directory · 9cfc94eb
      Andrew Lunn authored
      Move the Kirkwood cpuidle driver out of arch/arm/mach-kirkwood and
      into drivers/cpuidle. Convert the driver into a platform driver.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      9cfc94eb
    • Benjamin Tissoires's avatar
      HID: i2c-hid: fix i2c_hid_output_raw_report · c284979a
      Benjamin Tissoires authored
      i2c_hid_output_raw_report is used by hidraw to forward set_report requests.
      The current implementation of i2c_hid_set_report needs to take the
      report_id as an argument. The report_id is stored in the first byte
      of the buffer in argument of i2c_hid_output_raw_report.
      
      Not removing the report_id from the given buffer adds this byte 2 times
      in the command, leading to a non working command.
      Reported-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      c284979a