1. 20 May, 2016 24 commits
  2. 19 May, 2016 6 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 2600a46e
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This includes two new updates for the ftrace infrastructure.
      
         - With the changing of the code for filtering events by pid, from a
           list of pids to a bitmask, we can now easily implement following
           forks.  With a new tracing option "event-fork" which, when set,
           will have tasks with pids in set_event_pid, when they fork, to have
           their child pids added to set_event_pid and the child will be
           traced as well.
      
           Note, if "event-fork" is set and a task with its pid in
           set_event_pid exits, its pid will be removed from set_event_pid
      
         - The addition of Tom Zanussi's hist triggers.  This includes a very
           thorough documentatino on how to use the hist triggers with events.
           This introduces a quick and easy way to get histogram data from
           events and their fields.
      
        Some other cleanups and updates were added as well.  Like Masami
        Hiramatsu added test cases for the event trigger and hist triggers.
        Also I added a speed up of filtering by using a temp buffer when
        filters are set"
      
      * tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (45 commits)
        tracing: Use temp buffer when filtering events
        tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER logic
        tracing: Remove unused function trace_current_buffer_lock_reserve()
        tracing: Remove one use of trace_current_buffer_lock_reserve()
        tracing: Have trace_buffer_unlock_commit() call the _regs version with NULL
        tracing: Remove unused function trace_current_buffer_discard_commit()
        tracing: Move trace_buffer_unlock_commit{_regs}() to local header
        tracing: Fold filter_check_discard() into its only user
        tracing: Make filter_check_discard() local
        tracing: Move event_trigger_unlock_commit{_regs}() to local header
        tracing: Don't use the address of the buffer array name in copy_from_user
        tracing: Handle tracing_map_alloc_elts() error path correctly
        tracing: Add check for NULL event field when creating hist field
        tracing: checking for NULL instead of IS_ERR()
        tracing: Do not inherit event-fork option for instances
        tracing: Fix unsigned comparison to zero in hist trigger code
        kselftests/ftrace: Add a test for log2 modifier of hist trigger
        tracing: Add hist trigger 'log2' modifier
        kselftests/ftrace: Add hist trigger testcases
        kselftests/ftrace : Add event trigger testcases
        ...
      2600a46e
    • Linus Torvalds's avatar
      Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit · 03e1aa1c
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "Four small audit patches for 4.7.
      
        Two are simple cleanups around the audit thread management code, one
        adds a tty field to AUDIT_LOGIN events, and the final patch makes
        tty_name() usable regardless of CONFIG_TTY.
      
        Nothing controversial, and it all passes our regression test"
      
      * 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit:
        tty: provide tty_name() even without CONFIG_TTY
        audit: add tty field to LOGIN event
        audit: we don't need to __set_current_state(TASK_RUNNING)
        audit: cleanup prune_tree_thread
      03e1aa1c
    • Linus Torvalds's avatar
      Merge tag 'rproc-v4.7' of git://github.com/andersson/remoteproc · 97f00905
      Linus Torvalds authored
      Pull remoteproc updates from Bjorn Andersson:
       "Introduce a synchronization point between the async firmware loading
        and clients requesting the remote processor to boot, as well as
        support for remote processors that are not interested in the resource
        table information"
      
      * tag 'rproc-v4.7' of git://github.com/andersson/remoteproc:
        remoteproc: Add additional crash reasons
        remoteproc: core: Make the loaded resource table optional
        remoteproc: core: Task sync during rproc_fw_boot()
      97f00905
    • Linus Torvalds's avatar
      Merge tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc · 676d9735
      Linus Torvalds authored
      Pull rpmsg updates from Bjorn Andersson:
       "Refactor rpmsg module registration to follow other subsystems; by
        introduction of module_rpmsg_driver and hiding of THIS_MODULE from
        clients"
      
      * tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc:
        rpmsg: use module_rpmsg_driver in existing drivers and examples
        rpmsg: add helper macro module_rpmsg_driver
        rpmsg: drop owner assignment from rpmsg_drivers
        rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core
      676d9735
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 888dae53
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "First round of updates for the input subsystem.  No new drivers here,
        just some driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: rotary-encoder - fix bare use of 'unsigned'
        Input: cm109 - spin_lock in complete() cleanup
        Input: cm109 - fix handling of volume and mute buttons
        Input: byd - don't wipe dynamically allocated memory twice
        Input: twl4030 - fix unsafe macro definition
        Input: twl6040-vibra - remove mutex
        Input: bcm_iproc_tsc - DT spelling s/clock-name/clock-names/
        Input: bcm_iproc_tsc - use syscon to access shared registers
        Input: ti_am335x_tsc - use SIMPLE_DEV_PM_OPS
        Input: omap-keypad - remove set_col_gpio_val() and get_row_gpio_val()
        Input: omap-keypad - drop empty PM stubs
        Input: omap-keypad - remove adjusting of scan delay
        Input: gpio-keys - clean up device tree binding example
        Input: kbtab - stop saving struct usb_device
        Input: gtco - stop saving struct usb_device
        Input: aiptek - stop saving struct usb_device
        Input: acecad - stop saving struct usb_device
      888dae53
    • Linus Torvalds's avatar
      Merge tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 19c5abcb
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       - added support for Intersil/Techwell TW686x-based video capture cards
       - v4l PCI skeleton driver moved to samples directory
       - Documentation cleanups and improvements
       - RC: reduced the memory footprint for IR raw events
       - tpg: Export the tpg code from vivid as a module
       - adv7180: Add device tree binding documentation
       - lots of driver improvements and fixes
      
      * tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (173 commits)
        [media] exynos-gsc: avoid build warning without CONFIG_OF
        [media] samples: v4l: from Documentation to samples directory
        [media] dib0700: add USB ID for another STK8096-PVR ref design based card
        [media] tvp5150: propagate I2C write error in .s_register callback
        [media] tvp5150: return I2C write operation failure to callers
        [media] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner
        [media] em28xx: add missing USB IDs
        [media] update cx23885 and em28xx cardlists
        [media] media: au0828 fix au0828_v4l2_device_register() to not unlock and free
        [media] c8sectpfe: Rework firmware loading mechanism
        [media] c8sectpfe: Demote print to dev_dbg
        [media] c8sectpfe: Fix broken circular buffer wp management
        [media] media-device: Simplify compat32 logic
        [media] media: i2c: ths7303: remove redundant assignment on bt
        [media] dvb-usb: hide unused functions
        [media] xilinx-vipp: remove unnecessary of_node_put
        [media] drivers/media/media-devnode: clear private_data before put_device()
        [media] drivers/media/media-device: move debug log before _devnode_unregister()
        [media] drivers/media/rc: postpone kfree(rc_dev)
        [media] media/dvb-core: forward media_create_pad_links() return value
        ...
      19c5abcb
  3. 18 May, 2016 10 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 675e0655
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "First round of SCSI updates for the 4.6+ merge window.
      
        This batch includes the usual quota of driver updates (bnx2fc, mp3sas,
        hpsa, ncr5380, lpfc, hisi_sas, snic, aacraid, megaraid_sas).  There's
        also a multiqueue update for scsi_debug, assorted bug fixes and a few
        other minor updates (refactor of scsi_sg_pools into generic code, alua
        and VPD updates, and struct timeval conversions)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (138 commits)
        mpt3sas: Used "synchronize_irq()"API to synchronize timed-out IO & TMs
        mpt3sas: Set maximum transfer length per IO to 4MB for VDs
        mpt3sas: Updating mpt3sas driver version to 13.100.00.00
        mpt3sas: Fix initial Reference tag field for 4K PI drives.
        mpt3sas: Handle active cable exception event
        mpt3sas: Update MPI header to 2.00.42
        Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy"
        eata_pio: missing break statement
        hpsa: Fix type ZBC conditional checks
        scsi_lib: Decode T10 vendor IDs
        scsi_dh_alua: do not fail for unknown VPD identification
        scsi_debug: use locally assigned naa
        scsi_debug: uuid for lu name
        scsi_debug: vpd and mode page work
        scsi_debug: add multiple queue support
        bfa: fix bfa_fcb_itnim_alloc() error handling
        megaraid_sas: Downgrade two success messages to info
        cxlflash: Fix to resolve dead-lock during EEH recovery
        scsi_debug: rework resp_report_luns
        scsi_debug: use pdt constants
        ...
      675e0655
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft · d974f09e
      Linus Torvalds authored
      Pull iscsi_ibft updates from Konrad Rzeszutek Wilk:
       "The pull has two features - both of them expand the SysFS entries:
      
         - 'prefix-len' - which is subnet_mask_prefix of the iBFT header.
      
         - 'acpi_header' dir with: 'iBFT', OEM-ID (whatever it extracts from
           the iBFT header) and OEM_TABLE_ID (also whatever it extracts from
           the iBFT header).  This is to help NIC drivers to figure out during
           bootup how to deal with BIOS created iBFT tables (like by TianoCore
           UEFI implemenation)"
      
      * 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        ibft: Expose iBFT acpi header via sysfs
        iscsi_ibft: Add prefix-len attr and display netmask
      d974f09e
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4a5219ed
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "Driver updates for ARM SoCs, these contain various things that touch
        the drivers/ directory but got merged through arm-soc for practical
        reasons.
      
        For the most part, this is now related to power management
        controllers, which have not yet been abstracted into a separate
        subsystem, and typically require some code in drivers/soc or arch/arm
        to control the power domains.
      
        Another large chunk here is a rework of the NVIDIA Tegra USB3.0
        support, which was surprisingly tricky and took a long time to get
        done.
      
        Finally, reset controller handling as always gets merged through here
        as well"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
        arm-ccn: Enable building as module
        soc/tegra: pmc: Add generic PM domain support
        usb: xhci: tegra: Add Tegra210 support
        usb: xhci: Add NVIDIA Tegra XUSB controller driver
        dt-bindings: usb: xhci-tegra: Add Tegra210 XUSB controller support
        dt-bindings: usb: Add NVIDIA Tegra XUSB controller binding
        PCI: tegra: Support per-lane PHYs
        dt-bindings: pci: tegra: Update for per-lane PHYs
        phy: tegra: Add Tegra210 support
        phy: Add Tegra XUSB pad controller support
        dt-bindings: phy: tegra-xusb-padctl: Add Tegra210 support
        dt-bindings: phy: Add NVIDIA Tegra XUSB pad controller binding
        phy: core: Allow children node to be overridden
        clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs
        drivers: firmware: psci: make two helper functions inline
        soc: renesas: rcar-sysc: Add support for R-Car H3 power areas
        soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
        soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
        soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
        soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
        ...
      4a5219ed
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9797f6b0
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Arnd Bergmann:
       "As usual, a bunch of commits, mostly adding drivers and other options
        to defconfigs.
      
        We are adding three new defconfig files for the newly added 32-bit
        machines (aspeed and mps2), the rest is mainly housekeeping.
      
        The changes outside of arch/arm/config/ are for a Kconfig symbol that
        got renamed"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (63 commits)
        ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
        ARM: u8500_defconfig: update sensor config
        ARM: u8500_defconfig: remove staging from defconfig
        ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
        ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
        arm/configs: Add Aspeed defconfig
        arm/configs/multi_v5: Add Aspeed ast2400
        ARM: at91: sama5: Update defconfig
        ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
        ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
        ARM: multi_v7: Enable Tegra XUSB controller in defconfig
        ARM: tegra: Enable XUSB controller in defconfig
        ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
        ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
        ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
        ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
        ARM: multi_v7_defconfig: add Atmel watchdog timers
        ARM: multi_v7_defconfig: add HLCDC drivers as modules
        ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
        ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
        ...
      9797f6b0
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2ec3240f
      Linus Torvalds authored
      Pull ARM 64-bit DT updates from Arnd Bergmann:
       "We continue ramping up platform support for 64-bit ARM machines, with
        111 individual non-merge changesets touching 21 platforms.
      
        The LG1312 platform is completely new and is the first ARM platform by
        LG that we support in the mainline kernel.  Two other SoCs got added
        that are updated versions of existing SoC families, so the port mainly
        consists of new dts files:
      
         - The Hisilicon Hip06/D03 is the latest server platform from
           Huawei/Hisilicon, and follows the Hip05/D02 platform.
      
         - Rockchip RK3399 follows the 32-bit RK3288 that is popular in
           low-end Chromebooks and the 64-bit RK3368 that is mainly found in
           chinese Android TV boxes.
      
        The 96Boards HiKey based on the Hisilicon Hi6220 (Kirin 620) gets a
        long-awaited overhaul with a lot of devices enabled in the DT, so it
        should be much more usable with a mainline kernel now.  See also
      
           https://plus.google.com/111524780435806926688/posts/PeGb2VsNhJd
      
        A lot of work went into enabling new device drivers on existing
        machines, but we also have a couple of new commercially available
        machines:
      
         - Google Pixel C laptop based on Tegra210
         - Hardkernel Odroid C2 Based on Amlogic Meson GXBB (S905)
         - Geekbuying GeekBox based on Rockchip RK3368
      
        And finally, a couple of reference or development platforms that are
        not end-user platforms but are used for trying out the respective SoC
        platforms:
      
         - Amlogic Meson GXBB P200 and P201 development systems
         - NXP Layerscape 1043A QDS development board
         - Hisilicon Hip06 D03 server board, as mentioned above
         - LG1312 Reference Design
         - RK3399 Evaluation Board"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (104 commits)
        arm64: dts: marvell: add XOR node for Armada 3700 SoC
        dt-bindings: document rockchip rk3399-evb board
        arm64: dts: rockchip: add dts file for RK3399 evaluation board
        arm64: dts: rockchip: add core dtsi file for RK3399 SoCs
        dt-bindings: rockchip-dw-mshc: add description for rk3399
        arm64: dts: marvell: Use a SoC-specific compatible for xHCI on Armada37xx
        arm64: dts: marvell: Rename armada-37xx USB node
        arm64: dts: marvell: Clean up armada-3720-db
        Documentation: arm64: Add Hisilicon Hip06 D03 dts binding
        arm64: dts: Add initial dts for Hisilicon Hip06 D03 board
        arm64: dts: hip05: Add nor flash support
        arm64: dts: hip05: fix its node without msi-cells
        arm64: dts: r8a7795: Don't disable referenced optional clocks
        arm64: dts: salvator-x: populate EXTALR
        arm64: dts: r8a7795: enable PCIe on Salvator-X
        arm64: dts: r8a7795: Add PCIe nodes
        arm64: tegra: Add IOMMU node to GM20B on Tegra210
        arm64: tegra: Add reference clock to GM20B on Tegra210
        dt-bindings: Add documentation for GM20B GPU
        dt-bindings: gk20a: Document iommus property
        ...
      2ec3240f
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f7df9be0
      Linus Torvalds authored
      Pull ARM DT updates from Arnd Bergmann:
       "These are all the updates to device tree files for 32-bit platforms,
        which as usual makes up the bulk of the ARM SoC changes: 462 non-merge
        changesets, 450 files changed, 23340 insertions, 5216 deletions.
      
        The three platforms that are added with the "soc" branch are here as
        well, and we add some related machine files:
      
         - For Aspeed AST2400/AST2500, we get the evaluation platform and the
           Tyan Palmetto POWER8 mainboard that uses the AST2400 BMC
         - For Oxnas 810SE, the Western Digital "My Book World Edition" is
           added as the only platform at the moment.
         - For ARM MPS2, the AN385 (Cortex-M3) and AN399 (Cortex-M7) are
           supported
      
        On the ARM Realview development platform, we now support all machines
        with device tree, previously only the board files were supported,
        which in turn will likely be removed soon.
      
        Qualcomm IPQ4019 is the second generation ARM based "Internet
        Processor", following the IPQ806x that is used in many high-end WiFi
        routers.  This one integrates two ath10k wifi radios that were
        previously on separate chips.
      
        Other boards that got added for existing chips are:
      
        Ti OMAP family:
           - Amazon Kindle Fire, first generation, tablet and ebook reader
           - OnRISC Baltos iR 2110 and 3220 embedded industrial PCs
           - TI AM5728 IDK, TI AM3359 ICE-V2, and TI DRA722 Rev C EVM
             development systems
      
        Samsung EXYNOS platform:
           - Samsung ARTIK5 evaluation board, see
      
              https://www.artik.io/modules/overview/artik-5/
      
        NXP i.MX platforms:
           - Ka-Ro electronics TX6S-8034, TX6S-8035, TX6U-8033, TX6U-81xx,
             TX6Q-1036, TX6Q-1110/-1130, TXUL-0010 and TXUL-0011 industrial
             SoM modules
           - Embest MarS Board i.MX6Dual DIY platform
           - Boundary Devices i.MX6 Quad Plus Nitrogen6_MAX and SoloX
             Nitrogen6sx embedded boards
           - Technexion Pico i.MX6UL compute module
           - ZII VF610 Development Board
      
        Marvell embedded (mvebu, orion, kirkwood) platforms:
           - Linksys Viper (E4200v2 / EA4500) WiFi router
           - Buffalo Kurobox Pro NAS
      
        Qualcomm Snapdragon:
           - Arrow DragonBoard 600c (96boards) with APQ8064 Snapdragon 600
      
        Rockchips platform:
           - mqmaker MiQi single-board computer
      
        Altera SoCFPGA:
           - samtec VIN|ING 1000 vehicle communication interface
      
        Allwinner Sunxi platforms:
           - Dserve DSRV9703C tablet
           - Difrnce DIT4350 tablet
           - Colorfly E708 Q1 tablet
           - Polaroid MID2809PXE04 tablet
           - Olimex A20 OLinuXino LIME2 single board computer
           - Xunlong Orange Pi 2, Orange Pi One, and Orange Pi PC single board
             computers
      
        Across many platforms, bug fixes went in to address warnings that dtc
        now emits with 'make dtbs W=1'.  Further changes for device enablement
        went into Ti OMAP, bcm283x (Raspberry Pi), bcm47xx (wifi router), Ti
        Davinci, Samsung EXYNOS, Marvell mvebu/kirkwood/orion, NXP i.MX/Vybrid
        NXP LPC18xx, NXP LPC32xx, Renesas shmobile/r-mobile/r-car, Rockchips
        rk3xxx, ST Ux500, ST STi, Atmel AT91/SAMA5, Altera SoCFPGA, Allwinner
        Sunxi, Sigma Designs Tango, NVIDIA Tegra, Socionext Uniphier and ARM
        Versatile Express"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (458 commits)
        ARM: dts: tango4: Import watchdog node
        ARM: dts: tango4: Update cpus node for cpufreq
        ARM: dts: tango4: Update DT to match clk driver
        ARM: dts: tango4: Initial thermal support
        arm/dst: Add Aspeed ast2500 device tree
        arm/dts: Add Aspeed ast2400 device tree
        ARM: sun7i: dt: Add pll3 and pll7 clocks
        ARM: dts: sunxi: Add a olinuxino-lime2-emmc
        ARM: dts: at91: sama5d4: add trng node
        ARM: dts: at91: sama5d3: add trng node
        ARM: dts: at91: sama5d2: add trng node
        ARM: dts: at91: at91sam9g45 family: reduce the trng register map size
        ARM: sun4i: dt: Add pll3 and pll7 clocks
        ARM: sun5i: chip: Enable the TV Encoder
        ARM: sun5i: r8: Add display blocks to the DTSI
        ARM: sun5i: a13: Add display and TCON clocks
        ARM: dts: ux500: configure the accelerometers open drain
        ARM: mx5: dts: Enable USB OTG on M53EVK
        ARM: dts: imx6ul-14x14-evk: Add audio support
        ARM: dts: imx6qdl: Remove unneeded unit-addresses
        ...
      f7df9be0
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9f8f2022
      Linus Torvalds authored
      Pull ARM SoC 64-bit changes from Arnd Bergmann:
       "One new platform gets added this time: The Cortex-A53 based LG
        Electronics LG1K platform used in digital TVs.
      
        The other changes are mostly smaller updates to the defconfig files,
        to enable additional platform specific drivers, as they get merged
        through the subsystem trees"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: configs: add options useful for Armada 7K/8K support
        arm64: defconfig: Add Juno SATA controller
        arm64: defconfig: enable freescale/nxp config options
        arm64: defconfig: enable 48-bit virtual addresses
        arm64: defconfig: cleanup the defconfig
        MAINTAINERS: update entry for Marvell ARM platform maintainers
        arm64: marvell: enable AP806 and CP110 syscon driver
        arm64: Kconfig: select sp804 timer for ARCH_HISI
        arm64: defconfig: enable configs for WLAN and TI WL1835 as modules
        arm64: defconfig: enable several common USB network adapters
        arm64: defconfig: add CONFIG_SPI_SPIDEV as module
        arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKey
        arm64: defconfig: Add Renesas R-Car USB 3.0 driver support
        MAINTAINERS: add Chanho Min as ARM/LG1K maintainer
        arm64: defconfig: enable ARCH_LG1K
        arm64: add Kconfig entry for LG1K SoC family
        arm64: defconfig: Enable PL330 DMA controller
        arm64: defconfig: enable basic boot for Amlogic meson
      9f8f2022
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9896c7b5
      Linus Torvalds authored
      Pull ARM SoC platform updates from Arnd Bergmann:
       "We get support for three new 32-bit SoC platforms this time.
      
        The amount of changes in arch/arm for any of them is miniscule, as all
        the interesting code is in device driver subsystems (irqchip, clk,
        pinctrl, ...) these days.  I'm listing them here, as the addition of
        the Kconfig statement is the main relevant milestone for a new
        platform.  In each case, some drivers are are shared with existing
        platforms, while other drivers are added for v4.7 as well, or come in
        a later release.
      
         - The Aspeed platform is probably the most interesting one, this is
           what most whitebox servers use as their baseboard management
           controller.  We get support for the very common ast2400 and ast2500
           SoCs.  The OpenBMC project focuses on this chip, and the LWN
           article about their ELC 2016 presentation at
      
              https://lwn.net/Articles/683320/
      
           triggered the submission, but the code comes from IBM's OpenPOWER
           team rather than the team at Facebook.  There are still a lot more
           drivers that need to get added over time, and I hope both teams can
           work together on that.
      
         - OXNAS is an old platform for Network Attached Storage devices from
           Oxford Semiconductor.  There are models with ARM10 (!) and
           ARM11MPCore cores, but for now, we only support the original ARM9
           based versions.  The product lineup was subsequently part of PLX,
           Avago and now the new Broadcom Ltd.
      
              https://wiki.openwrt.org/doc/hardware/soc/soc.oxnas
      
           has some more information.
      
         - V2M-MPS2 is a prototyping platform from ARM for their Cortex-M
           cores and is related to the existing Realview / Versatile Express
           lineup, but without MMU.
      
           We now support various NOMMU platforms, so adding a new one is
           fairly straightforward.
      
              http://infocenter.arm.com/help/topic/com.arm.doc.100112_0100_03_en/
      
           has detailed information about the platform.
      
        Other noteworthy updates:
      
         - Work on LPC32xx has resumed, and Vladimir Zapolskiy and Sylvain
           Lemieux are now maintaining the platform.
      
           This is an older ARM9 based platform from NXP (not Freescale), but
           it remains in use in embedded markets.
      
         - Kevin Hilman is now co-maintaining the Amlogic Meson platform for
           both 32-bit and 64-bit ARM, and started contributing some patches.
      
         - As is often the case, work on the OMAP platforms makes up the bulk
           of the actual SoC code changes in arch/arm, but there isn't a lot
           of that either"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
        MAINTAINERS: ARM/Amlogic: add co-maintainer, misc. updates
        MAINTAINERS: add ARM/NXP LPC32XX SoC specific drivers to the section
        MAINTAINERS: add new maintainers of NXP LPC32xx SoC
        MAINTAINERS: move ARM/NXP LPC32xx record to ARM section
        arm: Add Aspeed machine
        ARM: lpc32xx: remove duplicate const on lpc32xx_auxdata_lookup
        ARM: lpc32xx: remove leftovers of legacy clock source and provider drivers
        ARM: lpc32xx: remove reboot header file
        ARM: dove: Remove CLK_IS_ROOT
        ARM: orion5x: Remove CLK_IS_ROOT
        ARM: mv78xx0: Remove CLK_IS_ROOT
        ARM: davinci: da850: use clk->set_parent for async3
        ARM: davinci: Move clock init after ioremap.
        MAINTAINERS: Update ARM Versatile Express platform entry
        ARM: vexpress/mps2: introduce MPS2 platform
        MAINTAINERS: add maintainer entry for ARM/OXNAS platform
        ARM: Add new mach-oxnas
        irqchip: versatile-fpga: add new compatible for OX810SE SoC
        ARM: uniphier: correct the call order of of_node_put()
        MAINTAINERS: fix stale TI DaVinci entries
        ...
      9896c7b5
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanups-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f2b1e0f6
      Linus Torvalds authored
      Pull ARM SoC cleanups and fixes from Arnd Bergmann:
       "Traditionally we've had two separate branches for cleanups and
        non-critical bug fixes, but both of these got smaller with each
        release and the differences are rather unclear now, so it seems more
        appropriate to have a combined branch.
      
        The most notable change is for OMAP, which gets a small rework to
        simplify handling of the AUXDATA mechanism used on machines that are
        not completely DT based yet, along with other work that is used as
        preparation for dropping the legacy board files"
      
      * tag 'armsoc-cleanups-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats
        ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats
        ARM: dts: exynos: Add MFC memory banks for Peach boards
        ARM: OMAP2+: n900 needs MMC slot names for legacy user space
        ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51
        ARM: debug: remove extraneous DEBUG_HI3716_UART option
        ARM: OMAP2+: Simplify auxdata by using the generic match
        of/platform: Allow secondary compatible match in of_dev_lookup
        ARM: davinci: use IRQCHIP_DECLARE for cp_intc
        ARM: davinci: remove unused DA8XX_NUM_UARTS
        ARM: davinci: simplify call to of populate
        ARM: DaVinci USB: removed deprecated properties from MUSB config
        ARM: rockchip: Fix use of plain integer as NULL pointer
        ARM: realview: hide unused 'pmu_device' object
        soc: versatile: dynamically detect RealView HBI numbers
      f2b1e0f6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · f61a657f
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The s390 patches for the 4.7 merge window have the usual bug fixes and
        cleanups, and the following new features:
      
         - An interface for dasd driver to query if a volume is online to
           another operating system
      
         - A new ioctl for the dasd driver to verify the format for a range of
           tracks
      
         - Following the example of x86 the struct fpu is now allocated with
           the task_struct
      
         - The 'report_error' interface for the PCI bus to send an
           adapter-error notification from user space to the service element
           of the machine"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (29 commits)
        s390/vmem: remove unused function parameter
        s390/vmem: fix identity mapping
        s390: add missing include statements
        s390: add missing declarations
        s390: make couple of variables and functions static
        s390/cache: remove superfluous locking
        s390/cpuinfo: simplify locking and skip offline cpus early
        s390/3270: hangup the 3270 tty after a disconnect
        s390/3270: handle reconnect of a tty with a different size
        s390/3270: avoid endless I/O loop with disconnected 3270 terminals
        s390/3270: fix garbled output on 3270 tty view
        s390/3270: fix view reference counting
        s390/3270: add missing tty_kref_put
        s390/dumpstack: implement and use return_address()
        s390/cpum_sf: Remove superfluous SMP function call
        s390/cpum_cf: Remove superfluous SMP function call
        s390/Kconfig: make z196 the default processor type
        s390/sclp: avoid compile warning in sclp_pci_report
        s390/fpu: allocate 'struct fpu' with the task_struct
        s390/crypto: cleanup and move the header with the cpacf definitions
        ...
      f61a657f