Doug / smarc-fsl-linux-kernel

07 Sep, 2013

1 commit

  • 8e73e367f   Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC cleanups from Olof Johansson:
    "This branch contains code cleanups, moves and removals for 3.12.

    There's a large number of various cleanups, and a nice net removal of
    13500 lines of code.

    Highlights worth mentioning are:

    - A series of patches from Stephen Boyd removing the ARM local timer
    API.
    - Move of Qualcomm MSM IOMMU code to drivers/iommu.
    - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM
    driver and switching over to the drivers/pwm one.
    - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM).

    There's also a move of a header file out of include/linux/i2c/ to
    platform_data, where it really belongs. It touches mostly ARM
    platform code for include changes so we took it through our tree"

    * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
    ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
    gpio: (gpio-pca953x) move header to linux/platform_data/
    arm: zynq: hotplug: Remove unreachable code
    ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
    tegra: simplify use of devm_ioremap_resource
    ARM: SAMSUNG: Remove plat/regs-timer.h header
    ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
    ARM: SAMSUNG: Remove pwm-clock infrastructure
    ARM: SAMSUNG: Remove old PWM timer platform devices
    pwm: Remove superseded pwm-samsung-legacy driver
    ARM: SAMSUNG: Modify board files to use new PWM platform device
    ARM: SAMSUNG: Rework private data handling in dev-backlight
    pwm: Add new pwm-samsung driver
    ARM: mach-mvebu: remove redundant DT parsing and validation
    ARM: msm: Only compile io.c on platforms that use it
    iommu/msm: Move mach includes to iommu directory
    ARM: msm: Remove devices-iommu.c
    ARM: msm: Move mach/board.h contents to common.h
    ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
    ARM: msm: Remove TMR and TMR0 static mappings
    ...

    Linus Torvalds
     

30 Aug, 2013

1 commit

21 Aug, 2013

1 commit

25 Dec, 2012

1 commit

  • 6bb27d734   ARM: delete struct sys_timer ... Browse Code »

    Now that the only field in struct sys_timer is .init, delete the struct,
    and replace the machine descriptor .timer field with the initialization
    function itself.

    This will enable moving timer drivers into drivers/clocksource without
    having to place a public prototype of each struct sys_timer object into
    include/linux; the intent is to create a single of_clocksource_init()
    function that determines which timer driver to initialize by scanning
    the device dtree, much like the proposed irqchip_init() at:
    http://www.spinics.net/lists/arm-kernel/msg203686.html

    Includes mach-omap2 fixes from Igor Grinberg.

    Tested-by: Robert Jarzmik
    Signed-off-by: Stephen Warren

    Stephen Warren
     

14 Sep, 2012

1 commit

  • 293b2da1b   ARM: pxa: move platform_data definitions ... Browse Code »

    Platform data for device drivers should be defined in
    include/linux/platform_data/*.h, not in the architecture
    and platform specific directories.

    This moves such data out of the pxa include directories

    Signed-off-by: Arnd Bergmann
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Nicolas Pitre
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Igor Grinberg
    Acked-by: Jeff Garzik
    Acked-by: Marek Vasut
    Acked-by: Robert Jarzmik
    Acked-by: Paul Parsons
    Acked-by: Vinod Koul
    Acked-By: Stefan Schmidt
    Cc: Eric Miao
    Cc: Haojian Zhuang
    Cc: Daniel Ribeiro
    Cc: Harald Welte
    Cc: Philipp Zabel
    Cc: Tomas Cech
    Cc: Sergey Lapin
    Cc: Jonathan Cameron
    Cc: Dan Williams
    Cc: Dmitry Torokhov
    Cc: Chris Ball
    Cc: David Woodhouse
    Cc: Samuel Ortiz
    Cc: Alan Stern
    Cc: Florian Tobias Schandinat
    Cc: Liam Girdwood
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Cc: Guennadi Liakhovetski
    Cc: Artem Bityutskiy
    Cc: openezx-devel@lists.openezx.org

    Arnd Bergmann
     

29 Mar, 2012

1 commit

10 Jan, 2012

1 commit

05 Jan, 2012

1 commit

14 Nov, 2011

1 commit

01 Nov, 2011

1 commit

08 Oct, 2011

1 commit

  • 97b09da4e   ARM: pxa: use correct __iomem annotations ... Browse Code »

    This tries to clear up the confusion between integers and iomem pointers
    in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
    values, in order to let the Linux type checking work correctly. This
    patch moves the cast to __iomem as far back as possible, to the place
    where the MMIO virtual address windows are defined.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Eric Miao

    Arnd Bergmann
     

22 Aug, 2011

1 commit

27 Jul, 2011

1 commit

  • 69f1d1a6a   Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
    ARM: S5P64X0: External Interrupt Support
    ARM: EXYNOS4: Enable MFC on Samsung NURI
    ARM: EXYNOS4: Enable MFC on universal_c210
    ARM: S5PV210: Enable MFC on Goni
    ARM: S5P: Add support for MFC device
    ARM: EXYNOS4: Add support FIMD on SMDKC210
    ARM: EXYNOS4: Add platform device and helper functions for FIMD
    ARM: EXYNOS4: Add resource definition for FIMD
    ARM: EXYNOS4: Change devname for FIMD clkdev
    ARM: SAMSUNG: Add IRQ_I2S0 definition
    ARM: SAMSUNG: Add platform device for idma
    ARM: EXYNOS4: Add more registers to be saved and restored for PM
    ARM: EXYNOS4: Add more register addresses of CMU
    ARM: EXYNOS4: Add platform device for dwmci driver
    ARM: EXYNOS4: configure rtc-s3c on NURI
    ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
    ARM: EXYNOS4: configure ADC on NURI
    ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
    ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
    ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
    ...

    Fix up tons of silly conflicts:
    - arch/arm/mach-davinci/include/mach/psc.h
    - arch/arm/mach-exynos4/Kconfig
    - arch/arm/mach-exynos4/mach-smdkc210.c
    - arch/arm/mach-exynos4/pm.c
    - arch/arm/mach-imx/mm-imx1.c
    - arch/arm/mach-imx/mm-imx21.c
    - arch/arm/mach-imx/mm-imx25.c
    - arch/arm/mach-imx/mm-imx27.c
    - arch/arm/mach-imx/mm-imx31.c
    - arch/arm/mach-imx/mm-imx35.c
    - arch/arm/mach-mx5/mm.c
    - arch/arm/mach-s5pv210/mach-goni.c
    - arch/arm/mm/Kconfig

    Linus Torvalds
     

12 Jul, 2011

2 commits

24 Jun, 2011

2 commits

30 Mar, 2011

1 commit

  • 85eb1513c   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
    ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
    ARM: 6838/1: etm: fix section mismatch warning
    ARM: 6837/1: remove unused pci_fixup_prpmc1100
    ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
    Fix the broken build for Marvell Dove platform.
    ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
    ARM: 6834/1: perf: reset counters on all CPUs during initialisation
    ARM: 6833/1: perf: add required isbs() to ARMv7 backend
    ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
    ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
    arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
    eukrea_mbimxsd51: add SD Card detect
    eukrea_mbimxsd25-baseboard: add SD card detect
    mx3/eukrea_mbimxsd-baseboard: add SD card detect support
    mx3/eukrea_mbimxsd-baseboard: fix gpio request
    ARM: mxs/mx28evk: add mmc device
    ARM: mxs/mx23evk: add mmc device
    ARM: mxs: dynamically allocate mmc device
    ARM: mx51_efika: update platform data for new mfd changes
    mx2/iomux: Set direction for CSPI2 pins
    ...

    Linus Torvalds
     

29 Mar, 2011

2 commits

26 Mar, 2011

1 commit

21 Mar, 2011

1 commit

  • b459396ee   ARM: pxa2xx: reorganize I2C files ... Browse Code »

    This patch moves the platform data definition from
    arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
    it can be accessed from x86 the same way as on ARM.

    This change should make no functional change to the PXA code. The move
    is verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
    pxa910_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Ben Dooks

    Sebastian Andrzej Siewior
     

16 Mar, 2011

1 commit

23 Feb, 2011

1 commit

15 Jan, 2011

1 commit

14 Jan, 2011

1 commit

08 Jan, 2011

1 commit

  • 021db8e2b   Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
    spi/omap: Fix DMA API usage in OMAP MCSPI driver
    spi/imx: correct the test on platform_get_irq() return value
    spi/topcliff: Typo fix threhold to threshold
    spi/dw_spi Typo change diable to disable.
    spi/fsl_espi: change the read behaviour of the SPIRF
    spi/mpc52xx-psc-spi: move probe/remove to proper sections
    spi/dw_spi: add DMA support
    spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
    spi/dw_spi: Fix too short timeout in spi polling loop
    spi/pl022: convert running variable
    spi/pl022: convert busy flag to a bool
    spi/pl022: pass the returned sglen to the DMA engine
    spi/pl022: map the buffers on the DMA engine
    spi/topcliff_pch: Fix data transfer issue
    spi/imx: remove autodetection
    spi/pxa2xx: pass of_node to spi device and set a parent device
    spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
    spi/pxa2xx: Add chipselect support for Sodaville
    spi/pxa2xx: Consider CE4100's FIFO depth
    spi/pxa2xx: Add CE4100 support
    ...

    Linus Torvalds
     

16 Dec, 2010

2 commits

  • ad68bb9f7   ARM: pxa: Access SMEMC via virtual addresses ... Browse Code »

    This is important because on PXA3xx, the physical mapping of SMEMC registers
    differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
    and PXA320, the PCMCIA driver was adjusted accordingly as well.

    Also, various places in the kernel had to be patched to use
    __raw_read/__raw_write.

    Signed-off-by: Marek Vasut
    Acked-by: Haojian Zhuang
    Signed-off-by: Eric Miao

    Marek Vasut
     
  • 851982c1b   ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() ... Browse Code »

    This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
    between PXA25x/PXA27x and PXA3xx memory mapping.

    Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
    and pxa3xx_map_io() is included.

    Signed-off-by: Marek Vasut
    Signed-off-by: Eric Miao

    Marek Vasut
     

01 Dec, 2010

1 commit

  • 8348c259d   arm/pxa2xx: reorgazine SSP and SPI header files ... Browse Code »

    The PXA-SPI driver relies on some files / defines which are arm specific
    and are within the ARM tree. The CE4100 SoC which is x86 has also the
    SPI core.
    This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to
    include/linux where the CE4100 can access them.

    This move got verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie

    Sebastian Andrzej Siewior
     

20 Oct, 2010

1 commit

  • 6451d7783   arm: remove machine_desc.io_pg_offst and .phys_io ... Browse Code »

    Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     

08 Oct, 2010

1 commit

21 May, 2010

1 commit

  • f8965467f   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
    qlcnic: adding co maintainer
    ixgbe: add support for active DA cables
    ixgbe: dcb, do not tag tc_prio_control frames
    ixgbe: fix ixgbe_tx_is_paused logic
    ixgbe: always enable vlan strip/insert when DCB is enabled
    ixgbe: remove some redundant code in setting FCoE FIP filter
    ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
    ixgbe: fix header len when unsplit packet overflows to data buffer
    ipv6: Never schedule DAD timer on dead address
    ipv6: Use POSTDAD state
    ipv6: Use state_lock to protect ifa state
    ipv6: Replace inet6_ifaddr->dead with state
    cxgb4: notify upper drivers if the device is already up when they load
    cxgb4: keep interrupts available when the ports are brought down
    cxgb4: fix initial addition of MAC address
    cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
    cnic: Convert cnic_local_flags to atomic ops.
    can: Fix SJA1000 command register writes on SMP systems
    bridge: fix build for CONFIG_SYSFS disabled
    ARCNET: Limit com20020 PCI ID matches for SOHARD cards
    ...

    Fix up various conflicts with pcmcia tree drivers/net/
    {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
    wireless/orinoco/spectrum_cs.c} and feature removal
    (Documentation/feature-removal-schedule.txt).

    Also fix a non-content conflict due to pm_qos_requirement getting
    renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

    Linus Torvalds
     

11 May, 2010

1 commit

  • f97cab28b   [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond ... Browse Code »

    delay_detect in HZ is confusing, convert it to be millisecond based. And
    thus remove those unnecessary call to msecs_to_jiffies() at runtime for
    this field. Other constants are converted assuming HZ == 100, which are
    basically true for those platforms.

    The assignment in csb726.c was incorrect, and is fixed in this patch as
    a result.

    Signed-off-by: Eric Miao
    Acked-by: Robert Jarzmik
    Acked-by: Marc Zyngier
    Acked-by: Marek Vasut
    Acked-by: Mike Rapoport
    Acked-by: Daniel Mack

    Eric Miao
     

31 Mar, 2010

1 commit

  • e446630c9   Add hotplug support to mcp251x driver ... Browse Code »

    Chip model can now be selected directly by matching the modalias name
    (instead of filling the .model field in platform_data), and allows the
    module to be auto-loaded. Previous behaviour is of course still supported.

    Convert the two in-tree users to this feature (icontrol & zeus).
    Tested on an Zeus platform (mcp2515).

    Signed-off-by: Marc Zyngier
    Acked-by: Christian Pellegrin
    Cc: Edwin Peer
    Acked-by: Wolfgang Grandegger
    Signed-off-by: David S. Miller

    Marc Zyngier
     

02 Mar, 2010

5 commits