Skip to content
  1. Dec 05, 2013
    • Olof Johansson's avatar
      Merge commit 'fixes' into next/cleanup · 330641ce
      Olof Johansson authored
      
      
      Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.
      
      * commit 'fixes': (39 commits)
        arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
        arm: socfpga: Enable ARM_TWD for socfpga
        ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
        ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
        ARM: multi_v7_defconfig: enable network for BeagleBone Black
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ...
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      330641ce
  2. Dec 04, 2013
    • Olof Johansson's avatar
      Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into next/cleanup · 63167569
      Olof Johansson authored
      From Jason Cooper:
      mvebu soc changes for v3.14
      
       - orion:
          - remove IRQF_DISABLED
          - directly include some .h files
      
       - mvebu:
          - remove some sparse warnings
      
       - orion5x:
          - include cleanup
          - warning removal for C=1
      
       - kirkwood:
          - remove legacy clock workarounds
          - stop rpinting a TCLK value of 0 for DT boards
      
       - dove:
          - warning removal for C=1
      
      * tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu
      
      :
        ARM: mvebu: fix some sparse warnings
        ARM: kirkwood: stop printk TCLK value at boot for DT boards
        ARM: orion5x: drop unused include from common.c
        ARM: Dove: Fix compiler warnings with C=1 builds
        ARM: Orion5x: Fix warnings when using C=1.
        ARM: Orion: Add missing includes
        ARM: kirkwood: remove lagacy clk workarounds
        arm: plat-orion: remove deprecated IRQF_DISABLED
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      63167569
    • Olof Johansson's avatar
      Merge tag 'renesas-cleanup-for-v3.14' of... · 6ecf49bc
      Olof Johansson authored
      Merge tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      From Simon Horman:
      
      Renesas ARM based SoC cleanups for v3.14
      
      * Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
        sh7372 and sh73a0 SoCs.
      * Tidy up camera-rcar header for r8a7779 SoC
      * Tidy up registration of VIN on r8a7779 SoC
      * Tidy up PFC registration on r8a7790 SoC
      * Correct typo in clocks for r8a7790 SoC
      * Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
      * Don't use named resources for MMCIF and SDHI on ape6evm board
      * Don't use named resources for MMCIF on lager board
      * Tidy up device registration on lager board
      * Tidy up headers for bockw board
      
      * tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      :
        ARM: shmobile: sh7372: tidyup clock table order
        ARM: shmobile: r7s72100: tidyup clock table order
        ARM: shmobile: sh73a0: tidyup clock table order
        ARM: shmobile: r8a7779: cleanup registration of sh_eth
        ARM: shmobile: r8a7790: Correct typo in clocks
        ARM: shmobile: r8a7779: camera-rcar header cleanup
        ARM: shmobile: Add r8a7790_register_pfc() function
        ARM: shmobile: Cosmetic update of Lager DT Reference
        ARM: shmobile: r8a7779: cleanup registration of VIN
        ARM: shmobile: bockw: header cleanup
        ARM: shmobile: sh73a0: don't use named resource for IPMMU
        ARM: shmobile: sh73a0: don't use named resource for I2C
        ARM: shmobile: sh73a0: don't use named resource for TMU
        ARM: shmobile: lager: don't use named resource for MMCIF
        ARM: shmobile: ape6evm: don't use named resource for SDHI
        ARM: shmobile: ape6evm: don't use named resource for MMCIF
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6ecf49bc
    • Dinh Nguyen's avatar
      arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk · a5c6e87a
      Dinh Nguyen authored
      
      
      Some of the clocks that were designated gate-clk do not have a gate, so
      change those clocks to be of periph-clk type.
      
      Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a5c6e87a
    • Dinh Nguyen's avatar
      arm: socfpga: Enable ARM_TWD for socfpga · 725dd7eb
      Dinh Nguyen authored
      
      
      Update Kconfig to enable TWD.
      
      Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
      Reviewed-by: default avatarPavel Machek <pavel@denx.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      725dd7eb
    • Olof Johansson's avatar
      ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16 · f39918ee
      Olof Johansson authored
      
      
      Enable MMC/SD on the Broadcom mobile platforms, and increase the block
      minors from the default 8 to 16 (since the Broadcom board by default
      has root on the 8th partition).
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: stable@vger.kernel.org # v3.12
      f39918ee
    • Olof Johansson's avatar
      ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support · 610ffd58
      Olof Johansson authored
      
      
      This enables a few more options on the sunxi defconfigs such that I can
      use nfsroot to boot them (there is no local storage support yet). It
      also enables PRINTK_TIME and tmpfs since it's a common distro requirement.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      610ffd58
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/more-dt-regressions' of... · 82cca5da
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/more-dt-regressions' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      
      Few more legacy booting vs device tree booting fixes that people
      have noticed while booting things with device tree for things like
      omap4 WLAN, smsc911x, and beagle audio. Hopefully this will be it
      for the legacy booting vs device tree fixes for this -rc cycle.
      
      * tag 'omap-for-v3.13/more-dt-regressions' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
      82cca5da
    • Olof Johansson's avatar
      ARM: multi_v7_defconfig: enable network for BeagleBone Black · 0dfee674
      Olof Johansson authored
      
      
      BeagleBone Black uses the TI CPSW ethernet controller, enable it in the
      multi_v7_defconfig for testing coverage purposes.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Cc: stable@vger.kernel.org # v3.12
      0dfee674
    • Olof Johansson's avatar
      Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes · 3060817f
      Olof Johansson authored
      From Nicolas Ferre:
      AT91: second round of fixes for 3.13
      - reduce IP frequency for I2C on sama5d3
      - missing aliases directive for USART3 on 9x5 family
      - a PM symbol is missing if !CONFIG_PM
      
      * tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
      3060817f
    • Olof Johansson's avatar
      Merge tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu into fixes · c0c3350c
      Olof Johansson authored
      From Jason Cooper, mvebu DT fixes for v3.13:
       - mvebu
          - PCIe fixes now that we have test devices with more ports.
          - fix access to coherency registers
      
      * tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: re-enable PCIe on Armada 370 DB
        ARM: mvebu: use the virtual CPU registers to access coherency registers
        ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260
        ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable
      c0c3350c
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of... · b8be3a22
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      
      Some omap related fixes that have come up with people moving to device
      tree only based booting for omap2+.
      
      The series contains a handful of fixes for the igep boards as they were
      one of the first omap3 boards to jump over completely to device tree
      based booting. So these can be considered regressions compared to
      booting igep in legacy mode with board files in v3.12.
      
      Also included are few other device tree vs legacy booting regressions:
      
      - yet more missing omap3 .dtsi entries that have showed up booting
        various boards with device tree only
      
      - n900 eMMC device tree fix
      
      - fixes for beagle USB EHCI
      
      - two fixes to make omap2420 MMC work
      
      As we're moving omap2+ to be device tree only for v3.14, I'd like to
      have v3.13 work equally well for legacy based booting and device tree
      based booting. So there will be likely few more device tree related
      booting patches trickling in.
      
      This series also includes a regression fix for the omap timer posted
      mode that may wrongly stay on from the bootloader for some SoCs.
      
      * tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap
      
      :
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ARM: dts: AM33XX BASE0033: add pinmux and hdmi node to enable display
        ARM: dts: omap3-igep0020: Add pinmuxing for DVI output
        ARM: dts: omap3-igep0020: Add pinmux setup for i2c devices
        ARM: dts: omap3-igep: Update to use the TI AM/DM37x processor
        ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO
        ARM: dts: omap3-igep: Fix bus-width for mmc1
        ARM: OMAP2+: dss-common: change IGEP's DVI DDC i2c bus
        ARM: OMAP2+: Disable POSTED mode for errata i103 and i767
        ARM: OMAP2+: Fix eMMC on n900 with device tree
        ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
        ARM: OMAP2+: Fix more missing data for omap3.dtsi file
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b8be3a22
  3. Dec 03, 2013
  4. Dec 02, 2013
  5. Nov 30, 2013
    • Linus Torvalds's avatar
      Linux 3.13-rc2 · dc1ccc48
      Linus Torvalds authored
      dc1ccc48
    • Linus Torvalds's avatar
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · d5ff835f
      Linus Torvalds authored
      Pull ARM64 fixes from Catalin Marinas:
       - Remove preempt_count modifications in the arm64 IRQ handling code
         since that's already dealt with in generic irq_enter/irq_exit
       - PTE_PROT_NONE bit moved higher up to avoid overlapping with the
         hardware bits (for PROT_NONE mappings which are pte_present)
       - Big-endian fixes for ptrace support
       - Asynchronous aborts unmasking while in the kernel
       - pgprot_writecombine() change to create Normal NonCacheable memory
         rather than Device GRE
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: Move PTE_PROT_NONE higher up
        arm64: Use Normal NonCacheable memory for writecombine
        arm64: debug: make aarch32 bkpt checking endian clean
        arm64: ptrace: fix compat registes get/set to be endian clean
        arm64: Unmask asynchronous aborts when in kernel mode
        arm64: dts: Reserve the memory used for secondary CPU release address
        arm64: let the core code deal with preempt_count
      d5ff835f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 033dbbde
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "One performance improvement and a few bug fixes.  Two of the fixes
        deal with the clock related problems we have seen on recent kernels"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mm: handle asce-type exceptions as normal page fault
        s390,time: revert direct ktime path for s390 clockevent device
        s390/time,vdso: convert to the new update_vsyscall interface
        s390/uaccess: add missing page table walk range check
        s390/mm: optimize copy_page
        s390/dasd: validate request size before building CCW/TCW request
        s390/signal: always restore saved runtime instrumentation psw bit
      033dbbde
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · dc418f6e
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Some easy but needed fixes for i2c drivers since rc1"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: bcm2835: Linking platform nodes to adapter nodes
        i2c: omap: raw read and write endian fix
        i2c: i2c-bcm-kona: Fix module build
        i2c: i2c-diolan-u2c: different usb endpoints for DLN-2-U2C
        i2c: bcm-kona: remove duplicated include
        i2c: davinci: raw read and write endian fix
      dc418f6e
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 7224b31b
      Linus Torvalds authored
      Pull workqueue fixes from Tejun Heo:
       "This contains one important fix.  The NUMA support added a while back
        broke ordering guarantees on ordered workqueues.  It was enforced by
        having single frontend interface with @max_active == 1 but the NUMA
        support puts multiple interfaces on unbound workqueues on NUMA
        machines thus breaking the ordered guarantee.  This is fixed by
        disabling NUMA support on ordered workqueues.
      
        The above and a couple other patches were sitting in for-3.12-fixes
        but I forgot to push that out, so they ended up waiting a bit too
        long.  My aplogies.
      
        Other fixes are minor"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues
        workqueue: fix comment typo for __queue_work()
        workqueue: fix ordered workqueues in NUMA setups
        workqueue: swap set_cpus_allowed_ptr() and PF_NO_SETAFFINITY
      7224b31b
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · de92a058
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "libata device removal path was removing parent device node before its
        child, which is mostly harmless but triggers warning after recent
        sysfs changes.  Rafael's patch fixes the order.
      
        Other than that, minor controller-specific fixes and device ID
        additions"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ATA: Fix port removal ordering
        ahci: add Marvell 9230 to the AHCI PCI device list
        ata: fix acpi_bus_get_device() return value check
        pata_arasan_cf: add missing clk_disable_unprepare() on error path
        ahci: add support for IBM Akebono platform device
      de92a058
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 2855987d
      Linus Torvalds authored
      Pull cgroup fixes from Tejun Heo:
       "Fixes for three issues.
      
         - cgroup destruction path could swamp system_wq possibly leading to
           deadlock.  This actually seems to happen in the wild with memcg
           because memcg destruction path adds nested dependency on system_wq.
      
           Resolved by isolating cgroup destruction work items on its
           dedicated workqueue.
      
         - Possible locking context deadlock through seqcount reported by
           lockdep
      
         - Memory leak under certain conditions"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fix cgroup_subsys_state leak for seq_files
        cpuset: Fix memory allocator deadlock
        cgroup: use a dedicated workqueue for cgroup destruction
      2855987d
    • Linus Torvalds's avatar
      Merge tag 'sound-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b8495995
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Quite a few HD-Audio fixes, a WUSB audio fix and a fix for FireWire
        audio.  The HD-audio part contains a couple of fixes for the generic
        parser, and these are the only intrusive fixes.  The rest are mostly
        device-specific fixes"
      
      * tag 'sound-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add LFE chmap to ASUS ET2700
        ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700
        ALSA: hda - limit mic boost on Asus UX31[A,E]
        ALSA: hda - Check leaf nodes to find aamix amps
        ALSA: hda - Fix hp-mic mode without VREF bits
        ALSA: hda - Create Headhpone Mic Jack Mode when really needed
        ALSA: usb: use multiple packets per urb for Wireless USB inbound audio
        ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Conexant codec
        ALSA: hda - Drop bus->avoid_link_reset flag
        ALSA: hda/realtek - Set pcbeep amp for ALC668
        ALSA: hda/realtek - Add support of ALC231 codec
        ALSA: firewire-lib: fix wrong value for FDF field as an empty packet
      b8495995
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · b01537bf
      Linus Torvalds authored
      Pull vfs dentry reference count fix from Al Viro.
      
      This fixes a possible inode_permission NULL pointer dereference (and
      other problems) that were due to the root dentry count being decremented
      too much.  In commit 48a066e7 ("RCU'd vfsmounts") the placement of
      clearing the LOOKUP_RCU bit changed, and we then returned failure of
      incrementing the lockref on the parent dentry with LOOKUP_RCU cleared.
      
      But that meant we needed to go through the same cleanup routines that
      the later failures did wrt LOOKUP_ROOT and nd->root.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fix bogus path_put() of nd->root after some unlazy_walk() failures
      b01537bf
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 282c183b
      Linus Torvalds authored
      Pull drm qxl leak fix from Dave Airlie:
       "As usual 5 mins after I send a trivial pull fix I find a real bug!
      
        This fixes a memory leak and I'd like to get it into stable queue
        asap"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/qxl: fix memory leak in release list handling
      282c183b
  6. Nov 29, 2013