07 Oct, 2012

1 commit

  • Pull m68knommu arch updates from Greg Ungerer:
    "Most of it is a cleanup of the ColdFire hardware header files. We
    have had a few occurrances of bugs caused by inconsistent definitions
    of peripheral addresses. These patches make them all consistent, and
    also clean out a bunch of old crap. Overall we remove about 1000
    lines."

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (27 commits)
    m68knommu: fix inconsistent formating in ColdFire 5407 definitions
    m68knommu: fix inconsistent formating in ColdFire 5307 definitions
    m68knommu: fix inconsistent formating in ColdFire 527x definitions
    m68knommu: fix inconsistent formating in ColdFire 5272 definitions
    m68knommu: fix inconsistent formating in ColdFire 523x definitions
    m68knommu: clean up ColdFire 54xx General Timer definitions
    m68knommu: clean up Pin Assignment definitions for the 54xx ColdFire CPU
    m68knommu: fix multi-function pin setup for FEC module on ColdFire 523x
    m68knommu: move ColdFire slice timer address defiens to 54xx header
    m68knommu: use read/write IO access functions in ColdFire m532x setup code
    m68knommu: modify ColdFire 532x GPIO register definitions to be consistent
    m68knommu: remove a lot of unsed definitions for 532x ColdFire
    m68knommu: use definitions for the ColdFire 528x FEC multi-function pins
    m68knommu: remove address offsets relative to IPSBAR for ColdFire 527x
    m68knommu: remove unused ColdFire 5282 register definitions
    m68knommu: fix wrong register offsets used for ColdFire 5272 multi-function pins
    m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses
    m68knommu: make remaining ColdFire 5272 register definitions absolute addresses
    m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
    m68knommu: make ColdFire Chip Select register definitions absolute addresses
    ...

    Linus Torvalds
     

05 Oct, 2012

1 commit

  • Pull MFD changes from Samuel Ortiz:
    "MFD bits for the 3.7 merge window.

    As usual we have a few new drivers:

    - TI LP8788
    - TI OMAP USB TLL
    - Maxim MAX8907
    - SMSC ECE1099
    - Dialog Semiconductor DA9055
    - A simpler syscon driver that allow us to get rid of the anatop one.

    Drivers are also gradually getting Device Tree and IRQ domain support.

    The following drivers got DT support:
    - palmas, 88pm860x, tc3589x and twl4030-audio

    And those ones now use the IRQ domain APIs:
    - 88pm860x, tc3589x, db8500_prcmu

    Also some other interesting changes:
    - Intel's ICH LPC now supports Lynx Point
    - TI's twl4030-audio added a GPO child
    - tps6527 enabled its backlight subdevice
    - The twl6030 pwm driver moved to the new PWM subsystem

    And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
    palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

    Fix up various annoying conflicts: the DT and IRQ domain support came in
    twice and was already in 3.6. And then it was apparently rebased.

    Guys, DON'T REBASE!

    * tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
    ARM: dts: Enable 88pm860x pmic
    mfd: 88pm860x: Move gpadc init into touch
    mfd: 88pm860x: Device tree support
    mfd: 88pm860x: Use irqdomain
    mfd: smsc: Add support for smsc gpio io/keypad driver
    backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
    mfd: DA9055 core driver
    mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
    mfd: wm5110: Add register patches for revision B
    mfd: wm5110: Disable control interface error report for WM5110 rev B
    mfd: max8907: Remove regulator-compatible from DT docs
    backlight: Add TPS65217 WLED driver
    mfd: Add backlight as subdevice to the tps65217
    mfd: Provide the PRCMU with its own IRQ domain
    mfd: Fix max8907 sparse warning
    mfd: Add lp8788 mfd driver
    mfd: dbx500: Provide a more accurate smp_twd clock
    mfd: rc5t583: Fix warning messages
    regulator: palmas: Add DT support
    mfd: palmas: Change regulator defns to better suite DT
    ...

    Linus Torvalds
     

02 Oct, 2012

2 commits

  • Pull ARM soc general cleanups from Olof Johansson:
    "This is a large branch that contains a handful of different cleanups:

    - Fixing up the I/O space remapping on PCI on ARM. This is a series
    from Rob Herring that restructures how all pci devices allocate I/O
    space, and it's part of the work to allow multiplatform kernels.
    - A number of cleanup series for OMAP, moving and removing some
    headers, sparse irq rework and in general preparation for
    multiplatform.
    - Final removal of all non-DT boards for Tegra, it is now
    device-tree-only!
    - Removal of a stale platform, nxp4008. It's an old mobile chipset
    that is no longer in use, and was very likely never really used
    with a mainline kernel. We have not been able to find anyone
    interested in keeping it around in the kernel.
    - Removal of the legacy dmaengine driver on tegra

    + A handful of other things that I haven't described above."

    Fix up some conflicts with the staging tree (and because nxp4008 was
    removed)

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
    ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
    ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
    ARM: mmp: using for_each_set_bit to simplify the code
    ARM: tegra: harmony: fix ldo7 regulator-name
    ARM: OMAP2+: Make omap4-keypad.h local
    ARM: OMAP2+: Make l4_3xxx.h local
    ARM: OMAP2+: Make l4_2xxx.h local
    ARM: OMAP2+: Make l3_3xxx.h local
    ARM: OMAP2+: Make l3_2xxx.h local
    ARM: OMAP1: Move irda.h from plat to mach
    ARM: OMAP2+: Make hdq1w.h local
    ARM: OMAP2+: Make gpmc-smsc911x.h local
    ARM: OMAP2+: Make gpmc-smc91x.h local
    ARM: OMAP1: Move flash.h from plat to mach
    ARM: OMAP2+: Make debug-devices.h local
    ARM: OMAP1: Move board-voiceblue.h from plat to mach
    ARM: OMAP1: Move board-sx1.h from plat to mach
    ARM: OMAP2+: Make omap-wakeupgen.h local
    ARM: OMAP2+: Make omap-secure.h local
    ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
    ...

    Linus Torvalds
     
  • Pull non-critical ARM soc bug fixes from Olof Johansson:
    "These were submitted as bug fixes before v3.6 but not considered
    important enough to be included in it. Some of them cross over to
    cleanup territory as well, and aren't strictly bugfixes."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
    ARM: nomadik: remove NAND_NO_READRDY use
    ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
    ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
    ARM: S3C24XX: removes unnecessary semicolon
    ARM: S3C24xx: delete double assignment
    ARM: EXYNOS: fix address for EXYNOS4 MDMA1
    ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
    ARM: ep93xx: Move ts72xx.h out of include/mach
    ARM: ep93xx: use __iomem pointers for MMIO
    ARM: msm: Fix early debug uart mapping on some memory configs
    ARM: msm: io: Change the default static iomappings to be shared
    ARM: msm: io: Remove 7x30 iomap region from 7x00
    ARM: msm: Remove call to missing FPGA init on 8660
    ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
    ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
    dma: tegra: make data used as *of_device_id.data const
    can: mpc5xxx_can: make data used as *of_device_id.data const
    macintosh/mediabay: make data used as *of_device_id.data const
    i2c/mpc: make data used as *of_device_id.data const
    mfd/da9052: make i2c_device_id array const
    ...

    Linus Torvalds
     

27 Sep, 2012

1 commit

  • Convert the ColdFire 54xx CPU General Timer register address definitions to
    include the MCF_MBAR peripheral region offset. This makes them consistent
    with all other 54xx address register definitions (in m54xxsim.h).

    The goal is to reduce different definitions used (some including offsets and
    others not) causing bugs when used incorrectly.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     

17 Sep, 2012

1 commit

  • …x/kernel/git/tmlind/linux-omap into next/cleanup

    From Tony Lindgren:

    This branch contains changes needed to make omap2+
    work properly with sparse IRQ. It also removes
    dependencies to mach/hardware.h. These help moving
    things towards ARM single zImage support.

    This branch is based on a commit in tty-next
    branch with omap-devel-gpmc-fixed-for-v3.7 and
    cleanup-omap-tags-for-v3.7 merged in to keep things
    compiling and sort out some merge conflicts.

    * tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
    ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
    ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
    ARM: OMAP: Remove unused old gpio-switch.h
    ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
    ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
    ARM: OMAP2+: Prepare for irqs.h removal
    W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
    Input: omap-keypad: Remove dependencies to mach includes
    ARM: OMAP: Move gpio.h to include/linux/platform_data
    ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
    ARM: OMAP2+: Remove unused nand_irq for GPMC
    ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
    ARM: OMAP1: Define OMAP1_INT_I2C locally
    ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h

    Olof Johansson
     

16 Sep, 2012

1 commit


13 Sep, 2012

3 commits

  • From "Uwe Kleine-König" :

    this is the 2nd version of this series whose goal is to make struct
    of_device_id.data const. Conceptually a driver must not modify the data
    contained there so making it const is the right thing.

    v1 of this series was sent with Message-id:
    1342182734-321-1-git-send-email-y. Changes since then are:
    - powerpc fixes
    - several new consts that were found by Arnd that are possible after
    patch 19.

    Arnd suggested to take this series via arm-soc late for 3.6 in one go
    because patch 19 depends on the former patches but is a precondition to
    the latter and it fixes a few warnings. So getting it in via the
    respective maintainer trees would need a much bigger coordination
    effort. That means I prefer getting Acks over you taking the patch.

    Vinod Koul already took
    dmaengine: at_hdmac: add a few const qualifiers
    that is in next-20120723 as 7fd63ccdad72 now. Vinod, I don't follow your
    pull requests, but assuming you didn't let it already pull for 3.6 I
    suggest you drop it from your queue and I just take your Ack.

    This series was build tested for arm (all defconfigs) and powerpc (all
    defconfigs and an allyesconfig) and grep didn't find more issues. As
    before it introduces a warning in drivers/regulator/twl-regulator.c.
    This driver does modify its .of_match_table when a device is bound which
    doesn't fits the concept of independant devices. Arnd noticed another
    new warning in drivers/scsi/qlogicpti.c that isn't that easy to resolve,
    because the pointer to (now) const data is passed as first argument to
    scsi_host_alloc. To fix that properly struct Scsi_Host.hostt needs to
    get a const, too. Alternatively I could introduce a cast removing the
    const, but I don't like that.

    * 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux: (25 commits)
    dma: tegra: make data used as *of_device_id.data const
    can: mpc5xxx_can: make data used as *of_device_id.data const
    macintosh/mediabay: make data used as *of_device_id.data const
    i2c/mpc: make data used as *of_device_id.data const
    mfd/da9052: make i2c_device_id array const
    powerpc/fsl_msi: drop unneeded cast to non-const pointer
    gpio/gpio-omap: make platformdata used as *of_device_id.data const
    of: add const to struct *of_device_id.data
    dma: tegra: make tegra_dma.chip_data a pointer to const data
    watchdog/mpc8xxx: add a const qualifier
    powerpc/celleb_pci: add a const qualifier
    powerpc/fsl_msi: add a const qualifier
    powerpc/83xx: add a const qualifier
    macintosh/mediabay: add a const qualifier
    mmc/omap_hsmmc: add a const qualifier
    i2c/mpc: add a const qualifier
    i2c/i2c-omap: add a const qualifier
    gpio/mpc8xxx: add a const qualifier
    gpio/gpio-omap.c: add a const qualifier
    misc/atmel_tc: make atmel_tc.tcb_config member point to const data

    Signed-off-by: Arnd Bergmann
    [olof: repulled a v3 version of the branch that rebased to add some more
    acked-bys and added one more patch on top for tegra]
    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • * 'clk' of git://github.com/hzhuang1/linux:
    ARM: mmp: remove unused definition in APBC and APMU
    ARM: mmp: move mmp2 clock definition to separated file
    arm: mmp: move pxa910 clock definition to separated file
    arm: mmp: move pxa168 clock definition to separated file
    arm: mmp: make private clock definition exclude from common clock
    + Linux 3.6-rc4

    Olof Johansson
     
  • As the plat and mach includes need to disappear for single zImage work,
    we need to remove plat/hardware.h.

    Do this by splitting plat/hardware.h into omap1 and omap2+ specific files.

    The old plat/hardware.h already has omap1 only defines, so it gets moved
    to mach/hardware.h for omap1. For omap2+, we use the local soc.h
    that for now just includes the related SoC headers to keep this patch more
    readable.

    Note that the local soc.h still includes plat/cpu.h that can be dealt
    with in later patches. Let's also include plat/serial.h from common.h for
    all the board-*.c files. This allows making the include files local later
    on without patching these files again.

    Note that only minimal changes are done in this patch for the
    drivers/watchdog/omap_wdt.c driver to keep things compiling. Further
    patches are needed to eventually remove cpu_is_omap usage in the drivers.

    Also only minimal changes are done to sound/soc/omap/* to remove the
    unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's
    no need to include omap44xx.h.

    While at it, also sort some of the includes in the standard way.

    Cc: linux-watchdog@vger.kernel.org
    Cc: alsa-devel@alsa-project.org
    Cc: Peter Ujfalusi
    Cc: Jarkko Nikula
    Cc: Liam Girdwood
    Acked-by: Wim Van Sebroeck
    Acked-by: Mark Brown
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

12 Sep, 2012

2 commits


11 Sep, 2012

1 commit

  • This prepares *of_device_id.data becoming const. Without this change
    the following warning would occur:

    drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_probe':
    drivers/watchdog/mpc8xxx_wdt.c:203:11: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

    Signed-off-by: Arnd Bergmann
    [ukl: split Arnd's patch by driver and add changelog]
    Acked-by: Wim Van Sebroeck
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Uwe Kleine-König

    Arnd Bergmann
     

10 Sep, 2012

2 commits

  • The dereference should be moved below the NULL test.

    spatch with a semantic match is used to found this.
    (http://coccinelle.lip6.fr/)

    Signed-off-by: Wei Yongjun
    Signed-off-by: Wim Van Sebroeck

    Wei Yongjun
     
  • kdump can be interrupted by watchdog timer when the timer is left
    activated on the crash kernel. Changed the hpwdt driver to disable
    watchdog timer at boot-time. This assures that watchdog timer is
    disabled until /dev/watchdog is opened, and prevents watchdog timer
    to be left running on the crash kernel.

    Signed-off-by: Toshi Kani
    Tested-by: Lisa Mitchell
    Signed-off-by: Thomas Mingarelli
    Signed-off-by: Wim Van Sebroeck
    Cc: stable

    Toshi Kani
     

29 Aug, 2012

1 commit


26 Aug, 2012

1 commit


17 Aug, 2012

1 commit


03 Aug, 2012

1 commit

  • Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
    "This contains a set of device-tree conversions for Marvell Orion
    platforms that were staged early but took a few tries to get the
    branch into a format where it was suitable for us to pick up.

    Given that most people working on these platforms are hobbyists with
    limited time, we were a bit more flexible with merging it even though
    it came in late."

    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
    ARM: Kirkwood: Replace mrvl with marvell
    ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
    ARM: Kirkwood: Describe Dreamplug LEDs in DT.
    ARM: Kirkwood: Describe iConnects LEDs in DT.
    ARM: Kirkwood: Describe iConnects temperature sensor in DT.
    ARM: Kirkwood: Describe IB62x0 LEDs in DT.
    ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
    ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
    ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
    ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
    ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
    ARM: Kirkwood: Use DT to configure SATA device.
    ARM: kirkwood: use devicetree for SPI on dreamplug
    ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
    ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
    ARM: Kirkwood: Add basic device tree support for QNAP TS219.
    ATA: sata_mv: Add device tree support
    ARM: Orion: DTify the watchdog timer.
    ARM: Orion: Add arch support needed for I2C via DT.
    ARM: kirkwood: use devicetree for orion-spi
    ...

    Conflicts:
    drivers/watchdog/orion_wdt.c

    Linus Torvalds
     

28 Jul, 2012

2 commits

  • Pull ARM updates from Russell King:
    "First ARM push of this merge window, post me coming back from holiday.
    This is what has been in linux-next for the last few weeks. Not much
    to say which isn't described by the commit summaries."

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
    ARM: 7463/1: topology: Update cpu_power according to DT information
    ARM: 7462/1: topology: factorize the update of sibling masks
    ARM: 7461/1: topology: Add arch_scale_freq_power function
    ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit}
    ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling
    ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path
    ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace
    ARM: 7452/1: delay: allow timer-based delay implementation to be selected
    ARM: 7451/1: arch timer: implement read_current_timer and get_cycles
    ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs
    ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions
    ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
    ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines
    ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation
    ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process
    ARM: 7444/1: kernel: add arch-timer C3STOP feature
    ARM: 7460/1: remove asm/locks.h
    ARM: 7439/1: head.S: simplify initial page table mapping
    ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE
    ARM: 7436/1: Do not map the vectors page as write-through on UP systems
    ...

    Linus Torvalds
     
  • Russell King
     

27 Jul, 2012

1 commit


25 Jul, 2012

1 commit

  • Pull watchdog changes from Wim Van Sebroeck:
    - conversion of iTCO_wdt and orion_wdt to the generic watchdog API
    - uses module_platform_driver() for s3c2410_wdt
    - Adds support for Jetway JNF99 Motherboard
    - various fixes

    * git://www.linux-watchdog.org/linux-watchdog:
    watchdog: orion_wdt: Convert driver to watchdog core
    watchdog: s3c2410_wdt: Use module_platform_driver()
    watchdog: sch311x_wdt: Fix Polarity when starting watchdog
    Watchdog: OMAP: Fix the runtime pm code to avoid module getting stuck intransition state.
    watchdog: ie6xx_wdt: section mismatch in ie6xx_wdt_probe()
    watchdog: bcm63xx_wdt: fix driver section mismatch
    watchdog: iTCO_wdt.c: convert to watchdog core
    char/ipmi: remove local ioctl defines replaced by generic ones
    watchdog: xilinx: Read clock frequency directly from DT node
    watchdog: coh901327_wdt: use clk_prepare/unprepare
    watchdog: f71808e_wdt: Add support for Jetway JNF99 motherboard

    Linus Torvalds
     

24 Jul, 2012

1 commit

  • Pull powerpc updates from Benjamin Herrenschmidt:
    "Notable highlights:

    - iommu improvements from Anton removing the per-iommu global lock in
    favor of dividing the DMA space into pools, each with its own lock,
    and hashed on the CPU number. Along with making the locking more
    fine grained, this gives significant improvements in multiqueue
    networking scalability.

    - Still from Anton, we know provide a vdso based variant of getcpu
    which makes sched_getcpu with the appropriate glibc patch something
    like 18 times faster.

    - More anton goodness (he's been busy !) in other areas such as a
    faster __clear_user and copy_page on P7, various perf fixes to
    improve sampling quality, etc...

    - One more step toward removing legacy i2c interfaces by using new
    device-tree based probing of platform devices for the AOA audio
    drivers

    - A nice series of patches from Michael Neuling that helps avoiding
    confusion between register numbers and litterals in assembly code,
    trying to enforce the use of "%rN" register names in gas rather
    than plain numbers.

    - A pile of FSL updates

    - The usual bunch of small fixes, cleanups etc...

    You may spot a change to drivers/char/mem. The patch got no comment
    or ack from outside, it's a trivial patch to allow the architecture to
    skip creating /dev/port, which we use to disable it on ppc64 that
    don't have a legacy brige. On those, IO ports 0...64K are not mapped
    in kernel space at all, so accesses to /dev/port cause oopses (and
    yes, distros -still- ship userspace that bangs hard coded ports such
    as kbdrate)."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
    powerpc/mpic: Create a revmap with enough entries for IPIs and timers
    Remove stale .rej file
    powerpc/iommu: Fix iommu pool initialization
    powerpc/eeh: Check handle_eeh_events() return value
    powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS
    powerpc/e500: add paravirt QEMU platform
    powerpc/mpc85xx_ds: convert to unified PCI init
    powerpc/fsl-pci: get PCI init out of board files
    powerpc/85xx: Update corenet64_smp_defconfig
    powerpc/85xx: Update corenet32_smp_defconfig
    powerpc/85xx: Rename P1021RDB-PC device trees to be consistent
    powerpc/watchdog: move booke watchdog param related code to setup-common.c
    sound/aoa: Adapt to new i2c probing scheme
    i2c/powermac: Improve detection of devices from device-tree
    powerpc: Disable /dev/port interface on systems without an ISA bridge
    of: Improve prom_update_property() function
    powerpc: Add "memory" attribute for mfmsr()
    powerpc/ftrace: Fix assembly trampoline register usage
    powerpc/hw_breakpoints: Fix incorrect pointer access
    powerpc: Put the gpr save/restore functions in their own section
    ...

    Linus Torvalds
     

23 Jul, 2012

10 commits


10 Jul, 2012

2 commits

  • CONFIG_FSL_BOOKE is only defined in 32-bit, CONFIG_PPC_FSL_BOOK3E is
    defined in both 32-bit and 64-bit, so use CONFIG_PPC_FSL_BOOK3E to make
    driver work in 32-bit & 64-bit.

    Signed-off-by: Shaohui Xie
    Signed-off-by: Kumar Gala

    Shaohui Xie
     
  • Make the OS timer registers have IOMEM like properities so they can
    be passed to readl_relaxed/writel_relaxed() et.al. rather than being
    straight volatile dereferences. Add linux/io.h includes where
    required.

    linux/io.h includes added to arch/arm/mach-sa1100/cpu-sa1100.c,
    arch/arm/mach-sa1100/jornada720_ssp.c, arch/arm/mach-sa1100/leds-lart.c
    drivers/input/touchscreen/jornada720_ts.c, drivers/pcmcia/sa1100_shannon.c
    from Arnd.

    This fixes these warnings:

    arch/arm/mach-sa1100/time.c: In function 'sa1100_timer_init':
    arch/arm/mach-sa1100/time.c:104: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type
    arch/arm/mach-pxa/time.c: In function 'pxa_timer_init':
    arch/arm/mach-pxa/time.c:126: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Russell King

    Russell King
     

09 Jul, 2012

1 commit


29 Jun, 2012

3 commits

  • In commit 7a87982420e5e126bfefeb42232d1fd92052794e we added
    a wrapper for the WDIOC_GETSTATUS ioctl call. The code results
    however in a different behaviour: it returns an error if the
    driver doesn't support the status operation. This is not
    according to the API that says that when we don't support
    the status operation, that we just should return a 0 value.
    Only when the device isn't there anymore, we should return an
    error.

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • This patch is to unregister for NMI events upon exit. Also we are now
    making the default setting for allow_kdump enabled.

    Signed-off-by: Thomas Mingarelli
    Signed-off-by: Wim Van Sebroeck

    Mingarelli, Thomas
     
  • The recent conversion of iTCO_wdt resulted in the driver no longer
    getting loaded automatically, since it no longer has a
    MODULE_DEVICE_TABLE() included. As the lpc_ich driver now creates a
    platform device, auto-loading can easily be done by having a respective
    module alias in place.

    Signed-off-by: Jan Beulich
    Cc: Aaron Sierra
    Acked-by: Guenter Roeck
    Cc: Samuel Ortiz
    Signed-off-by: Wim Van Sebroeck

    Jan Beulich