Eric Lee / smarc-ti-linux-kernel

26 Feb, 2014

1 commit

  • 88dbede1d   Merge tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu into next/soc ... Browse Code »

    Merge "mvebu new SoCs for v3.15" from Jason Cooper:

    - mvebu
    - initial support for Armada 375, 380, and 385

    Depends:
    - tags/mvebu-soc-3.15 (resolves delete/rename hidden conflict)

    * tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu:
    Documentation: arm: update Marvell documentation about Armada 375/38x
    ARM: mvebu: add initial support for the Armada 380/385 SOCs
    ARM: mvebu: add workaround for data abort issue on Armada 375
    ARM: mvebu: add initial support for the Armada 375 SOCs
    ARM: mvebu: add Armada 375 support to the system-controller driver
    ARM: mvebu: make CPU_PJ4B selection a per-SoC choice
    ARM: mvebu: rename DT machine structure for Armada 370/XP
    ARM: mvebu: rename armada-370-xp.c to board-v7.c

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

22 Feb, 2014

1 commit

11 Feb, 2014

1 commit

  • 3cf8ca1c2   Documentation/: update 00-INDEX files ... Browse Code »

    Some of the 00-INDEX files are somewhat outdated and some folders does
    not contain 00-INDEX at all. Only outdated (with the notably exception
    of spi) indexes are touched here, the 169 folders without 00-INDEX has
    not been touched.

    New 00-INDEX
    - spi/* was added in a series of commits dating back to 2006

    Added files (missing in (*/)00-INDEX)
    - dmatest.txt was added by commit 851b7e16a07d ("dmatest: run test via
    debugfs")
    - this_cpu_ops.txt was added by commit a1b2a555d637 ("percpu: add
    documentation on this_cpu operations")
    - ww-mutex-design.txt was added by commit 040a0a371005 ("mutex: Add
    support for wound/wait style locks")
    - bcache.txt was added by commit cafe56359144 ("bcache: A block layer
    cache")
    - kernel-per-CPU-kthreads.txt was added by commit 49717cb40410
    ("kthread: Document ways of reducing OS jitter due to per-CPU
    kthreads")
    - phy.txt was added by commit ff764963479a ("drivers: phy: add generic
    PHY framework")
    - block/null_blk was added by commit 12f8f4fc0314 ("null_blk:
    documentation")
    - module-signing.txt was added by commit 3cafea307642 ("Add
    Documentation/module-signing.txt file")
    - assoc_array.txt was added by commit 3cb989501c26 ("Add a generic
    associative array implementation.")
    - arm/IXP4xx was part of the initial repo
    - arm/cluster-pm-race-avoidance.txt was added by commit 7fe31d28e839
    ("ARM: mcpm: introduce helpers for platform coherency exit/setup")
    - arm/firmware.txt was added by commit 7366b92a77fc ("ARM: Add
    interface for registering and calling firmware-specific operations")
    - arm/kernel_mode_neon.txt was added by commit 2afd0a05241d ("ARM:
    7825/1: document the use of NEON in kernel mode")
    - arm/tcm.txt was added by commit bc581770cfdd ("ARM: 5580/2: ARM TCM
    (Tightly-Coupled Memory) support v3")
    - arm/vlocks.txt was added by commit 9762f12d3e05 ("ARM: mcpm: Add
    baremetal voting mutexes")
    - blackfin/gptimers-example.c, Makefile was added by commit
    4b60779d5ea7 ("Blackfin: add an example showing how to use the
    gptimers API")
    - devicetree/usage-model.txt was added by commit 31134efc681a ("dt:
    Linux DT usage model documentation")
    - fb/api.txt was added by commit fb21c2f42879 ("fbdev: Add FOURCC-based
    format configuration API")
    - fb/sm501.txt was added by commit e6a049807105 ("video, sm501: add
    edid and commandline support")
    - fb/udlfb.txt was added by commit 96f8d864afd6 ("fbdev: move udlfb out
    of staging.")
    - filesystems/Makefile was added by commit 1e0051ae48a2
    ("Documentation/fs/: split txt and source files")
    - filesystems/nfs/nfsd-admin-interfaces.txt was added by commit
    8a4c6e19cfed ("nfsd: document kernel interfaces for nfsd
    configuration")
    - ide/warm-plug-howto.txt was added by commit f74c91413ec6 ("ide: add
    warm-plug support for IDE devices (take 2)")
    - laptops/Makefile was added by commit d49129accc21
    ("Documentation/laptop/: split txt and source files")
    - leds/leds-blinkm.txt was added by commit b54cf35a7f65 ("LEDS: add
    BlinkM RGB LED driver, documentation and update MAINTAINERS")
    - leds/ledtrig-oneshot.txt was added by commit 5e417281cde2 ("leds: add
    oneshot trigger")
    - leds/ledtrig-transient.txt was added by commit 44e1e9f8e705 ("leds:
    add new transient trigger for one shot timer activation")
    - m68k/README.buddha was part of the initial repo
    - networking/LICENSE.(qla3xxx|qlcnic|qlge) was added by commits
    40839129f779, c4e84bde1d59, 5a4faa873782
    - networking/Makefile was added by commit 3794f3e812ef ("docsrc: build
    Documentation/ sources")
    - networking/i40evf.txt was added by commit 105bf2fe6b32 ("i40evf: add
    driver to kernel build system")
    - networking/ipsec.txt was added by commit b3c6efbc36e2 ("xfrm: Add
    file to document IPsec corner case")
    - networking/mac80211-auth-assoc-deauth.txt was added by commit
    3cd7920a2be8 ("mac80211: add auth/assoc/deauth flow diagram")
    - networking/netlink_mmap.txt was added by commit 5683264c3981
    ("netlink: add documentation for memory mapped I/O")
    - networking/nf_conntrack-sysctl.txt was added by commit c9f9e0e1597f
    ("netfilter: doc: add nf_conntrack sysctl api documentation") lan)
    - networking/team.txt was added by commit 3d249d4ca7d0 ("net: introduce
    ethernet teaming device")
    - networking/vxlan.txt was added by commit d342894c5d2f ("vxlan:
    virtual extensible lan")
    - power/runtime_pm.txt was added by commit 5e928f77a09a ("PM: Introduce
    core framework for run-time PM of I/O devices (rev. 17)")
    - power/charger-manager.txt was added by commit 3bb3dbbd56ea
    ("power_supply: Add initial Charger-Manager driver")
    - RCU/lockdep-splat.txt was added by commit d7bd2d68aa2e ("rcu:
    Document interpretation of RCU-lockdep splats")
    - s390/kvm.txt was added by 5ecee4b (KVM: s390: API documentation)
    - s390/qeth.txt was added by commit b4d72c08b358 ("qeth: bridgeport
    support - basic control")
    - scheduler/sched-bwc.txt was added by commit 88ebc08ea9f7 ("sched: Add
    documentation for bandwidth control")
    - scsi/advansys.txt was added by commit 4bd6d7f35661 ("[SCSI] advansys:
    Move documentation to Documentation/scsi")
    - scsi/bfa.txt was added by commit 1ec90174bdb4 ("[SCSI] bfa: add
    readme file")
    - scsi/bnx2fc.txt was added by commit 12b8fc10eaf4 ("[SCSI] bnx2fc: Add
    driver documentation")
    - scsi/cxgb3i.txt was added by commit c3673464ebc0 ("[SCSI] cxgb3i: Add
    cxgb3i iSCSI driver.")
    - scsi/hpsa.txt was added by commit 992ebcf14f3c ("[SCSI] hpsa: Add
    hpsa.txt to Documentation/scsi")
    - scsi/link_power_management_policy.txt was added by commit
    ca77329fb713 ("[libata] Link power management infrastructure")
    - scsi/osd.txt was added by commit 78e0c621deca ("[SCSI] osd:
    Documentation for OSD library")
    - scsi/scsi-parameter.txt was created/moved by commit 163475fb111c
    ("Documentation: move SCSI parameters to their own text file")
    - serial/driver was part of the initial repo
    - serial/n_gsm.txt was added by commit 323e84122ec6 ("n_gsm: add a
    documentation")
    - timers/Makefile was added by commit 3794f3e812ef ("docsrc: build
    Documentation/ sources")
    - virt/kvm/s390.txt was added by commit d9101fca3d57 ("KVM: s390:
    diagnose call documentation")
    - vm/split_page_table_lock was added by commit 49076ec2ccaf ("mm:
    dynamically allocate page->ptl if it cannot be embedded to struct
    page")
    - w1/slaves/w1_ds28e04 was added by commit fbf7f7b4e2ae ("w1: Add
    1-wire slave device driver for DS28E04-100")
    - w1/masters/omap-hdq was added by commit e0a29382c6f5 ("hdq:
    documentation for OMAP HDQ")
    - x86/early-microcode.txt was added by commit 0d91ea86a895 ("x86, doc:
    Documentation for early microcode loading")
    - x86/earlyprintk.txt was added by commit a1aade478862 ("x86/doc:
    mini-howto for using earlyprintk=dbgp")
    - x86/entry_64.txt was added by commit 8b4777a4b50c ("x86-64: Document
    some of entry_64.S")
    - x86/pat.txt was added by commit d27554d874c7 ("x86: PAT
    documentation")

    Moved files
    - arm/kernel_user_helpers.txt was moved out of arch/arm/kernel by
    commit 37b8304642c7 ("ARM: kuser: move interface documentation out of
    the source code")
    - efi-stub.txt was moved out of x86/ and down into Documentation/ in
    commit 4172fe2f8a47 ("EFI stub documentation updates")
    - laptops/hpfall.c was moved out of hwmon/ and into laptops/ in commit
    efcfed9bad88 ("Move hp_accel to drivers/platform/x86")
    - commit 5616c23ad9cd ("x86: doc: move x86-generic documentation from
    Doc/x86/i386"):
    * x86/usb-legacy-support.txt
    * x86/boot.txt
    * x86/zero_page.txt
    - power/video_extension.txt was moved to acpi in commit 70e66e4df191
    ("ACPI / video: move video_extension.txt to Documentation/acpi")

    Removed files (left in 00-INDEX)
    - memory.txt was removed by commit 00ea8990aadf ("memory.txt: remove
    stray information")
    - gpio.txt was moved to gpio/ in commit fd8e198cfcaa ("Documentation:
    gpiolib: document new interface")
    - networking/DLINK.txt was removed by commit 168e06ae26dd
    ("drivers/net: delete old parallel port de600/de620 drivers")
    - serial/hayes-esp.txt was removed by commit f53a2ade0bb9 ("tty: esp:
    remove broken driver")
    - s390/TAPE was removed by commit 9e280f669308 ("[S390] remove tape
    block docu")
    - vm/locking was removed by commit 57ea8171d2bc ("mm: documentation:
    remove hopelessly out-of-date locking doc")
    - laptops/acer-wmi.txt was remvoed by commit 020036678e81 ("acer-wmi:
    Delete out-of-date documentation")

    Typos/misc issues
    - rpc-server-gss.txt was added as knfsd-rpcgss.txt in commit
    030d794bf498 ("SUNRPC: Use gssproxy upcall for server RPCGSS
    authentication.")
    - commit b88cf73d9278 ("net: add missing entries to
    Documentation/networking/00-INDEX")
    * generic-hdlc.txt was added as generic_hdlc.txt
    * spider_net.txt was added as spider-net.txt
    - w1/master/mxc-w1 was added as mxc_w1 by commit a5fd9139f74c ("w1: add
    1-wire master driver for i.MX27 / i.MX31")
    - s390/zfcpdump.txt was added as zfcpdump by commit 6920c12a407e
    ("[S390] Add Documentation/s390/00-INDEX.")

    Signed-off-by: Henrik Austad
    Reviewed-by: Paul E. McKenney [rcu bits]
    Acked-by: Rob Landley
    Cc: Jiri Kosina
    Cc: Thomas Gleixner
    Cc: Rob Herring
    Cc: David S. Miller
    Cc: Mark Brown
    Cc: "H. Peter Anvin"
    Cc: Ingo Molnar
    Cc: Gleb Natapov
    Cc: Linus Torvalds
    Cc: Len Brown
    Cc: James Bottomley
    Cc: Jean-Christophe Plagniol-Villard
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Henrik Austad
     

24 Jan, 2014

1 commit

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

    Pull ARM SoC platform changes from Olof Johansson:
    "New core SoC-specific changes.

    New platforms:
    * Introduction of a vendor, Hisilicon, and one of their SoCs with
    some random numerical product name.
    * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
    i.e. !MMU).
    * Marvell Berlin series of SoCs, which include the one in Chromecast.
    * MOXA platform support, ARM9-based platform used mostly in
    industrial products
    * Support for Freescale's i.MX50 SoC.

    Other work:
    * Renesas work for new platforms and drivers, and conversion over to
    more multiplatform-friendly device registration schemes.
    * SMP support for Allwinner sunxi platforms.
    * ... plus a bunch of other stuff across various platforms"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
    ARM: tegra: fix tegra_powergate_sequence_power_up() inline
    ARM: msm_defconfig: Update for multi-platform
    ARM: msm: Move MSM's DT based hardware to multi-platform support
    ARM: msm: Only build timer.c if required
    ARM: msm: Only build clock.c on proc_comm based platforms
    ARM: ux500: Enable system suspend with WFI support
    ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
    ARM: shmobile: r8a7790: Fix I2C controller names
    ARM: msm: Simplify ARCH_MSM_DT config
    ARM: msm: Add support for MSM8974 SoC
    ARM: sunxi: select ARM_PSCI
    MAINTAINERS: Update Allwinner sunXi maintainer files
    ARM: sunxi: Select RESET_CONTROLLER
    ARM: imx: improve the comment of CCM lpm SW workaround
    ARM: imx: improve status check of clock gate
    ARM: imx: add necessary interface for pfd
    ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
    ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
    ARM: imx: Add cpu frequency scaling support
    ARM i.MX35: Add devicetree support.
    ...

    Linus Torvalds
     

08 Jan, 2014

1 commit

13 Dec, 2013

1 commit

29 Oct, 2013

1 commit

  • e086df92e   Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux into next/soc ... Browse Code »

    From Maxime Ripard:
    Allwinner sunXi SoCs machine additions for 3.13

    Nothing outstanding here, mostly some documentation cleanup, and the split of
    the previous generic machine declaration into three different machines to
    handle the sun4i/sun5i, sun6i and sun7i separately.

    * tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux:
    Documentation: dt: Remove clock gates IDs list for Allwinner SoCs
    Documentation: dt: Remove interrupt sources list for Allwinner SoCs
    Documentation: sunxi: Update Allwinner SoC documentation
    Documentation: sunxi: Update A13 user manual dead link
    ARM: sunxi: Order Kconfig options alphabetically
    ARM: sunxi: Simplify restart setup code
    ARM: sunxi: Split out the DT machines for sun6i and sun7i

    Signed-off-by: Olof Johansson

    Olof Johansson
     

12 Oct, 2013

2 commits

09 Oct, 2013

1 commit

07 Sep, 2013

1 commit

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

    Pull trivial tree from Jiri Kosina:
    "The usual trivial updates all over the tree -- mostly typo fixes and
    documentation updates"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
    doc: Documentation/cputopology.txt fix typo
    treewide: Convert retrun typos to return
    Fix comment typo for init_cma_reserved_pageblock
    Documentation/trace: Correcting and extending tracepoint documentation
    mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
    power: Documentation: Update s2ram link
    doc: fix a typo in Documentation/00-INDEX
    Documentation/printk-formats.txt: No casts needed for u64/s64
    doc: Fix typo "is is" in Documentations
    treewide: Fix printks with 0x%#
    zram: doc fixes
    Documentation/kmemcheck: update kmemcheck documentation
    doc: documentation/hwspinlock.txt fix typo
    PM / Hibernate: add section for resume options
    doc: filesystems : Fix typo in Documentations/filesystems
    scsi/megaraid fixed several typos in comments
    ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
    treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
    page_isolation: Fix a comment typo in test_pages_isolated()
    doc: fix a typo about irq affinity
    ...

    Linus Torvalds
     

26 Aug, 2013

2 commits

  • 2afd0a052   ARM: 7825/1: document the use of NEON in kernel mode ... Browse Code »

    Add a file to Documentation/arm explaining how kernel mode NEON
    is supposed to be used.

    Reviewed-by: Nicolas Pitre
    Signed-off-by: Ard Biesheuvel
    Signed-off-by: Russell King

    Ard Biesheuvel
     
  • 83d26d111   ARM: 7824/1: update advice on kernel, initramfs and FDT load address. ... Browse Code »

    - Recommend that the kernel be placed under 128MiB, this is required if
    CONFIG_AUTO_ZRELADDR=y and good (or at least not bad) advice even if
    CONFIG_AUTO_ZRELADDR=n.
    - Recommend that a zImage kernel be placed above 32MiB, this avoids the need
    to relocate prior to decompression, which can speed up boot.
    - Add basic info on the requirements when loading a raw (non-zImage) kernel
    which are stricter than the zImage requirements.
    - Recommend that the DTB be placed after the 128MiB boundary, avoiding any
    potential conflict with the kernel decompressor, and within the lowmem
    region. In practice it could follow the kernel loaded after 32MiB,
    assuming the kernel decompesses to less than 32MiB, but the 128MiB
    recommendation is simple and unambiguous.
    - Add similar recommendation regarding initramfs.

    Signed-off-by: Ian Campbell
    Cc: Nicolas Pitre
    Cc: Will Deacon
    Cc: Dave Martin
    Cc: Grant Likely
    Cc: Roy Franz
    Cc: linux-arm-kernel@lists.infradead.org
    Signed-off-by: Russell King

    Ian Campbell
     

25 Jul, 2013

1 commit

05 Jul, 2013

1 commit

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

    Pull trivial tree updates from Jiri Kosina:
    "The usual stuff from trivial tree"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
    treewide: relase -> release
    Documentation/cgroups/memory.txt: fix stat file documentation
    sysctl/net.txt: delete reference to obsolete 2.4.x kernel
    spinlock_api_smp.h: fix preprocessor comments
    treewide: Fix typo in printk
    doc: device tree: clarify stuff in usage-model.txt.
    open firmware: "/aliasas" -> "/aliases"
    md: bcache: Fixed a typo with the word 'arithmetic'
    irq/generic-chip: fix a few kernel-doc entries
    frv: Convert use of typedef ctl_table to struct ctl_table
    sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
    doc: clk: Fix incorrect wording
    Documentation/arm/IXP4xx fix a typo
    Documentation/networking/ieee802154 fix a typo
    Documentation/DocBook/media/v4l fix a typo
    Documentation/video4linux/si476x.txt fix a typo
    Documentation/virtual/kvm/api.txt fix a typo
    Documentation/early-userspace/README fix a typo
    Documentation/video4linux/soc-camera.txt fix a typo
    lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
    ...

    Linus Torvalds
     

03 Jul, 2013

1 commit

  • 42daabf62   Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC late changes from Arnd Bergmann:
    "These are changes that arrived a little late before the merge window
    or that have multiple dependencies on previous branches so they did
    not fit into one of the earlier ones. There are 10 branches merged
    here, a total of 39 non-merge commits. Contents are a mixed bag for
    the above reasons:

    * Two new SoC platforms: ST microelectronics stixxxx and the TI
    'Nspire' graphing calculator. These should have been in the 'soc'
    branch but were a little late
    * Support for the Exynos 5420 variant in mach-exynos, which is based
    on the other exynos branches to avoid conflicts.
    * Various small changes for sh-mobile, ux500 and davinci
    * Common clk support for MSM"

    * tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
    ARM: ux500: bail out on alien cpus
    ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins
    serial: sh-sci: Initialise variables before access in sci_set_termios()
    ARM: stih41x: Add B2020 board support
    ARM: stih41x: Add B2000 board support
    ARM: sti: Add DEBUG_LL console support
    ARM: sti: Add STiH416 SOC support
    ARM: sti: Add STiH415 SOC support
    ARM: msm: Migrate to common clock framework
    ARM: msm: Make proc_comm clock control into a platform driver
    ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
    ARM: msm: Remove clock-7x30.h include file
    ARM: msm: Remove custom clk_set_{max,min}_rate() API
    ARM: msm: Remove custom clk_set_flags() API
    msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
    msm: iommu: Convert to clk_prepare/unprepare
    msm_sdcc: Convert to clk_prepare/unprepare
    usb: otg: msm: Convert to clk_prepare/unprepare
    msm_serial: Use devm_clk_get() and properly return errors
    msm_serial: Convert to clk_prepare/unprepare
    ...

    Linus Torvalds
     

26 Jun, 2013

2 commits

  • 15969b457   ARM: sti: Add STiH416 SOC support ... Browse Code »

    The STiH416 is advanced HD AVC processor with 3D graphics acceleration
    and 1.2-GHz ARM Cortex-A9 SMP CPU.

    Signed-off-by: Srinivas Kandagatla
    CC: Stephen Gallimore
    CC: Stuart Menefy
    CC: Arnd Bergmann
    CC: Linus Walleij

    Signed-off-by: Srinivas Kandagatla
    Signed-off-by: Olof Johansson

    Srinivas Kandagatla
     
  • 65ebcc115   ARM: sti: Add STiH415 SOC support ... Browse Code »

    The STiH415 is the next generation of HD, AVC set-top box processors for
    satellite, cable, terrestrial and IP-STB markets. It is an ARM Cortex-A9
    1.0 GHz, dual-core CPU.

    Signed-off-by: Srinivas Kandagatla
    CC: Stephen Gallimore
    CC: Stuart Menefy
    CC: Arnd Bergmann
    CC: Linus Walleij
    Signed-off-by: Srinivas Kandagatla
    Signed-off-by: Olof Johansson

    Srinivas Kandagatla
     

17 Jun, 2013

1 commit

05 Jun, 2013

1 commit

29 May, 2013

1 commit

05 May, 2013

1 commit

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

    Pull ARM platform specific firmware interfaces from Olof Johansson:
    "Two platforms, bcm and exynos have their own firmware interfaces using
    the "secure monitor call", this adds support for those.

    We had originally planned to have a third set of patches in here,
    which would extend support for the existing generic "psci" call that
    is used on multiple platforms as well as Xen and KVM guests, but that
    ended up getting dropped because the patches were not ready in time."

    * tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: bcm: mark bcm_kona_smc_init as __init
    ARM: bcm281xx: Add DT support for SMC handler
    ARM: bcm281xx: Add L2 cache enable code
    ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up
    ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
    ARM: EXYNOS: Add support for Exynos secure firmware
    ARM: EXYNOS: Add support for secure monitor calls
    ARM: Add interface for registering and calling firmware-specific operations

    Linus Torvalds
     

04 May, 2013

1 commit

  • 8546dc1d4   Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull ARM updates from Russell King:
    "The major items included in here are:

    - MCPM, multi-cluster power management, part of the infrastructure
    required for ARMs big.LITTLE support.

    - A rework of the ARM KVM code to allow re-use by ARM64.

    - Error handling cleanups of the IS_ERR_OR_NULL() madness and fixes
    of that stuff for arch/arm

    - Preparatory patches for Cortex-M3 support from Uwe Kleine-König.

    There is also a set of three patches in here from Hugh/Catalin to
    address freeing of inappropriate page tables on LPAE. You already
    have these from akpm, but they were already part of my tree at the
    time he sent them, so unfortunately they'll end up with duplicate
    commits"

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (77 commits)
    ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE()
    ARM: IMX: remove unnecessary use of IS_ERR_VALUE()
    ARM: OMAP: use consistent error checking
    ARM: cleanup: OMAP hwmod error checking
    ARM: 7709/1: mcpm: Add explicit AFLAGS to support v6/v7 multiplatform kernels
    ARM: 7700/2: Make cpu_init() notrace
    ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE
    ARM: 7701/1: mm: Allow arch code to control the user page table ceiling
    ARM: 7703/1: Disable preemption in broadcast_tlb*_a15_erratum()
    ARM: mcpm: provide an interface to set the SMP ops at run time
    ARM: mcpm: generic SMP secondary bringup and hotplug support
    ARM: mcpm_head.S: vlock-based first man election
    ARM: mcpm: Add baremetal voting mutexes
    ARM: mcpm: introduce helpers for platform coherency exit/setup
    ARM: mcpm: introduce the CPU/cluster power API
    ARM: multi-cluster PM: secondary kernel entry code
    ARM: cacheflush: add synchronization helpers for mixed cache state accesses
    ARM: cpu hotplug: remove majority of cache flushing from platforms
    ARM: smp: flush L1 cache in cpu_die()
    ARM: tegra: remove tegra specific cpu_disable()
    ...

    Linus Torvalds
     

24 Apr, 2013

2 commits

  • 9762f12d3   ARM: mcpm: Add baremetal voting mutexes ... Browse Code »

    This patch adds a simple low-level voting mutex implementation
    to be used to arbitrate during first man selection when no load/store
    exclusive instructions are usable.

    For want of a better name, these are called "vlocks". (I was
    tempted to call them ballot locks, but "block" is way too confusing
    an abbreviation...)

    There is no function to wait for the lock to be released, and no
    vlock_lock() function since we don't need these at the moment.
    These could straightforwardly be added if vlocks get used for other
    purposes.

    For architectural correctness even Strongly-Ordered memory accesses
    require barriers in order to guarantee that multiple CPUs have a
    coherent view of the ordering of memory accesses. Whether or not
    this matters depends on hardware implementation details of the
    memory system. Since the purpose of this code is to provide a clean,
    generic locking mechanism with no platform-specific dependencies the
    barriers should be present to avoid unpleasant surprises on future
    platforms.

    Note:

    * When taking the lock, we don't care about implicit background
    memory operations and other signalling which may be pending,
    because those are not part of the critical section anyway.

    A DMB is sufficient to ensure correctly observed ordering if
    the explicit memory accesses in vlock_trylock.

    * No barrier is required after checking the election result,
    because the result is determined by the store to
    VLOCK_OWNER_OFFSET and is already globally observed due to the
    barriers in voting_end. This means that global agreement on
    the winner is guaranteed, even before the winner is known
    locally.

    Signed-off-by: Dave Martin
    Signed-off-by: Nicolas Pitre
    Reviewed-by: Santosh Shilimkar
    Reviewed-by: Will Deacon

    Dave Martin
     
  • 7fe31d28e   ARM: mcpm: introduce helpers for platform coherency exit/setup ... Browse Code »

    This provides helper methods to coordinate between CPUs coming down
    and CPUs going up, as well as documentation on the used algorithms,
    so that cluster teardown and setup
    operations are not done for a cluster simultaneously.

    For use in the power_down() implementation:
    * __mcpm_cpu_going_down(unsigned int cluster, unsigned int cpu)
    * __mcpm_outbound_enter_critical(unsigned int cluster)
    * __mcpm_outbound_leave_critical(unsigned int cluster)
    * __mcpm_cpu_down(unsigned int cluster, unsigned int cpu)

    The power_up_setup() helper should do platform-specific setup in
    preparation for turning the CPU on, such as invalidating local caches
    or entering coherency. It must be assembler for now, since it must
    run before the MMU can be switched on. It is passed the affinity level
    for which initialization should be performed.

    Because the mcpm_sync_struct content is looked-up and modified
    with the cache enabled or disabled depending on the code path, it is
    crucial to always ensure proper cache maintenance to update main memory
    right away. The sync_cache_*() helpers are used to that end.

    Also, in order to prevent a cached writer from interfering with an
    adjacent non-cached writer, we ensure each state variable is located to
    a separate cache line.

    Thanks to Nicolas Pitre and Achin Gupta for the help with this
    patch.

    Signed-off-by: Dave Martin
    Signed-off-by: Nicolas Pitre
    Reviewed-by: Will Deacon

    Dave Martin
     

09 Apr, 2013

1 commit

  • 7366b92a7   ARM: Add interface for registering and calling firmware-specific operations ... Browse Code »

    Some boards are running with secure firmware running in TrustZone secure
    world, which changes the way some things have to be initialized.

    This patch adds an interface for platforms to specify available firmware
    operations and call them.

    A wrapper macro, call_firmware_op(), checks if the operation is provided
    and calls it if so, otherwise returns -ENOSYS to allow fallback to
    legacy operation..

    By default no operations are provided.

    Example of use:

    In code using firmware ops:

    __raw_writel(virt_to_phys(exynos4_secondary_startup),
    CPU1_BOOT_REG);

    /* Call Exynos specific smc call */
    if (call_firmware_op(cpu_boot, cpu) == -ENOSYS)
    cpu_boot_legacy(...); /* Try legacy way */

    gic_raise_softirq(cpumask_of(cpu), 1);

    In board-/platform-specific code:

    static int platformX_do_idle(void)
    {
    /* tell platformX firmware to enter idle */
    return 0;
    }

    static int platformX_cpu_boot(int i)
    {
    /* tell platformX firmware to boot CPU i */
    return 0;
    }

    static const struct firmware_ops platformX_firmware_ops = {
    .do_idle = exynos_do_idle,
    .cpu_boot = exynos_cpu_boot,
    /* other operations not available on platformX */
    };

    static void __init board_init_early(void)
    {
    register_firmware_ops(&platformX_firmware_ops);
    }

    Signed-off-by: Kyungmin Park
    Signed-off-by: Tomasz Figa
    Signed-off-by: Kukjin Kim

    Tomasz Figa
     

27 Mar, 2013

1 commit

16 Dec, 2012

1 commit

  • 2b8318881   Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux ... Browse Code »

    Pull fbdev changes from Tomi Valkeinen:
    "OMAPDSS changes, including:
    - use dynanic debug prints
    - OMAP platform dependency removals
    - Creation of compat-layer, helping us to improve omapdrm
    - Misc cleanups, aiming to make omadss more in line with the upcoming
    common display framework

    Exynos DP changes for the 3.8 merge window:
    - Device Tree support for Samsung Exynos DP
    - SW Link training is cleaned up.
    - HPD interrupt is supported.

    Samsung Framebuffer changes for the 3.8 merge window:
    - The bit definitions of header file are updated.
    - Some minor typos are fixed.
    - Some minor bugs of s3c_fb_check_var() are fixed.

    FB related changes for SH Mobile, Freescale DIU

    Add support for the Solomon SSD1307 OLED Controller"

    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
    OMAPDSS: fix TV-out issue with DSI PLL
    Revert "OMAPFB: simplify locking"
    OMAPFB: remove silly loop in fb2display()
    OMAPFB: fix error handling in omapfb_find_best_mode()
    OMAPFB: use devm_kzalloc to allocate omapfb2_device
    OMAPDSS: DISPC: remove dispc fck uses
    OMAPDSS: DISPC: get dss clock rate from dss driver
    drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
    drivers/video: add support for the Solomon SSD1307 OLED Controller
    OMAPDSS: use omapdss_compat_init() in other drivers
    OMAPDSS: export dispc functions
    OMAPDSS: export dss_feat functions
    OMAPDSS: export dss_mgr_ops functions
    OMAPDSS: separate compat files in the Makefile
    OMAPDSS: move display sysfs init to compat layer
    OMAPDSS: DPI: use dispc's check_timings
    OMAPDSS: DISPC: add dispc_ovl_check()
    OMAPDSS: move irq handling to dispc-compat
    OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
    OMAPDSS: move blocking mgr enable/disable to compat layer
    ...

    Conflicts:
    arch/arm/mach-davinci/devices-da8xx.c
    arch/arm/plat-omap/common.c
    drivers/media/platform/omap/omap_vout.c

    Linus Torvalds
     

17 Nov, 2012

1 commit

13 Nov, 2012

1 commit

  • 0049fb260   OMAPFB: use dma_alloc_attrs to allocate memory ... Browse Code »

    Use dma_alloc_attrs to allocate memory instead of omap specific vram
    allocator. After this we can remove the omap vram allocator.

    There are some downsides to this change:

    1) dma_alloc_attrs doesn't let us allocate at certain physical address.
    However, this should not be a problem as this feature of vram allocator
    is only used when reserving the framebuffer that was initialized by the
    bootloader, and we don't currently support "passing" a framebuffer from
    the bootloader to the kernel anyway.

    2) dma_alloc_attrs, as of now, always ioremaps the allocated area, and
    we don't need the ioremap when using VRFB. This patch uses
    DMA_ATTR_NO_KERNEL_MAPPING for the allocation, but the flag is currently
    not operational.

    3) OMAPFB_GET_VRAM_INFO ioctl cannot return real values anymore. I
    changed the ioctl to return 64M for all the values, which, I hope, the
    applications will interpret as "there's enough vram".

    4) "vram" kernel parameter to define how much ram to reserve for video
    use no longer works. The user needs to enable CMA and use "cma"
    parameter.

    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     

11 Oct, 2012

1 commit

02 Oct, 2012

1 commit

21 Sep, 2012

1 commit

  • 928487a1c   Merge branch 'samsung/cleanup' into next/cleanup ... Browse Code »

    From Kukjin Kim:

    Here, there are cleanup patches for Samsung v3.7 and most of them are
    related to cleanup Samsung specific gpio API.

    * samsung/cleanup:
    gpio: samsung: Update documentation
    ARM: S3C24XX: Use module_platform_driver macro in mach-osiris-dvs.c
    ARM: S3C24XX: Use module_platform_driver macro in h1940-bluetooth.c
    gpio-samsung: Remove now unused s3c2410_gpio* API
    ARM: S3C24XX: Remove obsolete GPIO API declarations
    ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib API
    ARM: EXYNOS: cleanup unused code related to GPS

    Olof Johansson
     

19 Sep, 2012

1 commit

07 Sep, 2012

1 commit

  • 98025c8c7   gpio: samsung: Update documentation ... Browse Code »

    Update Samsung GPIO API documentation to reflect removal of
    the s3c24xx specific gpio API. While at it, fix some typos.

    The notes on conversion from s3c2410_* functions to the gpiolib
    API are left here just in case there is any out of tree code that
    still needs to be converted.

    Signed-off-by: Sylwester Nawrocki
    Acked-by: Linus Walleij
    Signed-off-by: Kukjin Kim

    Sylwester Nawrocki
     

13 Aug, 2012

1 commit

  • 19ec6caca   Merge branch 'cleanup/io-pci' into next/cleanups ... Browse Code »

    From Rob Herring :

    This is the 2nd part of mach/io.h removals. This series removes io.h on
    platforms with PCI by creating a fixed virtual I/O mapping and a common
    __io() macro.

    This version has changed a bit to accommodate Tegra converting its PCIe
    host to a platform driver. Now the virtual space is only reserved during
    early boot before .map_io() is called. The mapping is not created until
    calling pci_ioremap_io which can be done at any point after vmalloc is
    initialized.

    I've gone back to fixed 64K windows for each PCI bus. This allows
    removing all the i/o resource setup from the individually platforms and
    placing it within the common ARM PCI code.

    I've only tested versatilepb under qemu (with the model hacked up to
    actually enable i/o space), so any testing is appreciated. iop3xx and
    mv78xx0 have some risk of breaking as the PCI bus addresses are moved
    to 0 from matching the cpu host bus addesss.

    * cleanup/io-pci:
    ARM: iop3xx: use fixed PCI i/o mapping
    ARM: mv78xx0: use fixed pci i/o mapping
    ARM: iop13xx: use fixed PCI i/o mapping
    iop13xx: use more regular PCI I/O space handling
    ARM: orion5x: use fixed PCI i/o mapping
    ARM: kirkwood: use fixed PCI i/o mapping
    ARM: dove: use fixed PCI i/o mapping
    ARM: footbridge: use fixed PCI i/o mapping
    ARM: shark: use fixed PCI i/o mapping
    ARM: integrator: remove trailing whitespace on pci_v3.c
    ARM: integrator: use fixed PCI i/o mapping
    ARM: tegra: use fixed PCI i/o mapping
    ARM: versatile: use fixed PCI i/o mapping
    ARM: move PCI i/o resource setup into common code
    ARM: Add fixed PCI i/o mapping
    i2c: iop3xx: use standard gpiolib functions
    i2c: iop3xx: clean-up trailing whitespace

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

11 Aug, 2012

1 commit

  • 9ee99783d   arm: add documentation describing Marvell families of SoC ... Browse Code »

    As stated in the introduction of the document, the families of ARM
    SoCs at Marvell are very complicated, and it is difficult for
    newcomers to understand the organization of this SoC family and how it
    relates to the Linux kernel support for those hardware platforms.

    This document is only at RFC stage for now, it requires reviews and
    comments from the Marvell maintainers, the PXA maintainers and the MMP
    maintainers. For correctness of course, but also to add any other
    information that would be useful. For example, one of the thing that
    wasn't clear how to detail in the documentation is how the SoCs relate
    to each other in terms of hardware IP blocks. For example, most of the
    Kirkwood/Dove/Armada 370-XP/etc. hardware IPs (I2C, SPI, USB, SATA,
    etc.) are identical, while the PXA and MMP families are completely
    separate.

    Signed-off-by: Thomas Petazzoni
    Cc: Andrew Lunn
    Cc: Jason Cooper
    Cc: Gregory Clement
    Cc: Eric Miao
    Cc: Russell King
    Cc: Haojian Zhuang
    Cc: Nicolas Pitre
    Cc: Arnd Bergmann
    Cc: Olof Johansson
    Cc: Lior Amsalem
    Cc: Maen Suleiman
    Cc: Tawfik Bayouk
    Cc: Shadi Ammouri
    Cc: Eran Ben-Avi
    Acked-by: Arnd Bergmann

    ---
    Changes from v3:
    * Add Arnd Bergmann Acked-by.

    Changes from v2:
    * Mention the plat- directory that each SoC family is using.
    * Take into account Eric Miao's comments on the PXA/MMP families: add
    PXA21x/PXA25x/PXA26x to the list, mention which processors are
    AP+CP or AP only. Clarify the comments on which SoCs were designed
    by Intel, which ones were designed by Marvell after the acquisition
    of the XScale family.
    * Mention long-term plans regarding the support of those SoC
    families.

    Changes from v1:
    * Added publicly available datasheet for the 88F5182 pointed by
    Andrew Lunn.
    * Added publicly available datasheet for the 88F5281 found with
    Google searches
    * Mentionned the Feroceon core name where appropriate, and Sheeva
    where appropriate
    * Fixed the core names for PXA930, PXA935 and PXA955 after comments
    from Arnd Bergmann. Wikipedia is mistakenly suggesting that PXA93x
    are Sheeva-based, and there isn't much information available on the
    web about the 955.

    Thomas Petazzoni
     

25 Jul, 2012

2 commits

  • c27944370   ARM: Add fixed PCI i/o mapping ... Browse Code »

    This adds a fixed virtual mapping for PCI i/o addresses. The mapping is
    located at the last 2MB of vmalloc region (0xfee00000-0xff000000). 2MB
    is used to align with PMD size, but IO_SPACE_LIMIT is 1MB. The space
    is reserved after .map_io and can be mapped at any time later with
    pci_ioremap_io. Platforms which need early i/o mapping (e.g. for vga
    console) can call pci_map_io_early in their .map_io function.

    This has changed completely from the 1st implementation which only
    supported creating the static mapping at .map_io.

    Signed-off-by: Rob Herring
    Cc: Russell King
    Acked-by: Nicolas Pitre

    Rob Herring
     
  • 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
     

21 Jul, 2012

1 commit

  • f9028317b   Documentation: Add newline at end-of-file to files lacking one ... Browse Code »

    This patch simply adds a newline character at end-of-file to those
    files in Documentation/ that currently lack one.

    This is done for a few different reasons:

    A) It's rather annoying when you do "cat some_file.txt" that your
    prompt/cursor ends up at the end of the last line of output rather
    than on a new line.

    B) Some tools that process files line-by-line may get confused by the
    lack of a newline on the last line.

    C) The "\ No newline at end of file" line in diffs annoys me for some
    reason.

    So, let's just add the missing newline once and for all.

    Signed-off-by: Jesper Juhl
    Signed-off-by: Jiri Kosina

    Jesper Juhl