1. 12 Nov, 2015 1 commit
  2. 11 Nov, 2015 30 commits
  3. 10 Nov, 2015 9 commits
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 52e9a333
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "Defconfig updates are kept separate from other branches mostly to
        avoid conflicts between the different categories (driver branch
        enabling something that has context conflict with SoC options, etc).
      
        A lot of this again is scattered across the various hardware
        platforms.  multi_v7_defconfig, our "generic" config for most 32-bit
        platforms has been gone through by Marvell Berlin maintainers and
        added most options they need to run on their hardware.  Broadcom NSP
        is also added there, and the new Atmel SAMA5D2 (added last release).
        Rockchip also has display and other devices supported in that config.
      
        In addition to that, the usual small churn of new options being added
        here and there"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
        ARM: multi_v7_defconfig: enable UniPhier I2C drivers
        ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
        ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
        ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
        ARM: exynos_defconfig: Disable simplefb support
        ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
        ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
        ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
        ARM: exynos_defconfig: Enable USB Video Class support
        ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin
        ARM: tegra: Update multi_v7_defconfig
        ARM: multi_v7_defconfig: Add Atmel SDHCI device
        ARM: multi_v7_defconfig: Add Atmel Flexcom device
        ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
        ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
        ARM: at91/defconfig: update at91_dt defconfig
        ARM: at91/defconfig: update sama5 defconfig
        ARM: configs: Enable FIXED_PHY in multi_v7 defconfig
        ARM: configs: update lpc18xx defconfig
        ARM: socfpga_defconfig: enable fpga manager
        ...
      52e9a333
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c0d6fe2f
      Linus Torvalds authored
      Pull ARM DT updates from Olof Johansson:
       "As usual, this is the massive branch we have for each release.  Lots
        of various updates and additions of hardware descriptions on existing
        hardware, as well as the usual additions of new boards and SoCs.
      
        This is also the first release where we've started mixing 64- and
        32-bit DT updates in one branch.
      
        (Specific details on what's actually here and new is pretty easy to
        tell from the diffstat, so there's little point in duplicating listing
        it here)"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (499 commits)
        ARM: dts: uniphier: add system-bus-controller nodes
        ARM64: juno: disable NOR flash node by default
        ARM: dts: uniphier: add outer cache controller nodes
        arm64: defconfig: Enable PCI generic host bridge by default
        arm64: Juno: Add support for the PCIe host bridge on Juno R1
        Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
        ARM: dts: uniphier: add I2C aliases for ProXstream2 boards
        dts/Makefile: Add build support for LS2080a QDS & RDB board DTS
        dts/ls2080a: Add DTS support for LS2080a QDS & RDB boards
        dts/ls2080a: Update Simulator DTS to add support of various peripherals
        dts/ls2080a: Remove text about writing to Free Software Foundation
        dts/ls2080a: Update DTSI to add support of various peripherals
        doc: DTS: Update DWC3 binding to provide reference to generic bindings
        doc/bindings: Update GPIO devicetree binding documentation for LS2080A
        Documentation/dts: Move FSL board-specific bindings out of /powerpc
        Documentation: DT: Add entry for FSL LS2080A QDS and RDB boards
        arm64: Rename FSL LS2085A SoC support code to LS2080A
        arm64: Use generic Layerscape SoC family naming
        ARM: dts: uniphier: add ProXstream2 Vodka board support
        ARM: dts: uniphier: add ProXstream2 Gentil board support
        ...
      c0d6fe2f
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b44a3d2a
      Linus Torvalds authored
      Pull ARM SoC driver updates from Olof Johansson:
       "As we've enabled multiplatform kernels on ARM, and greatly done away
        with the contents under arch/arm/mach-*, there's still need for
        SoC-related drivers to go somewhere.
      
        Many of them go in through other driver trees, but we still have
        drivers/soc to hold some of the "doesn't fit anywhere" lowlevel code
        that might be shared between ARM and ARM64 (or just in general makes
        sense to not have under the architecture directory).
      
        This branch contains mostly such code:
      
         - Drivers for qualcomm SoCs for SMEM, SMD and SMD-RPM, used to
           communicate with power management blocks on these SoCs for use by
           clock, regulator and bus frequency drivers.
      
         - Allwinner Reduced Serial Bus driver, again used to communicate with
           PMICs.
      
         - Drivers for ARM's SCPI (System Control Processor).  Not to be
           confused with PSCI (Power State Coordination Interface).  SCPI is
           used to communicate with the assistant embedded cores doing power
           management, and we have yet to see how many of them will implement
           this for their hardware vs abstracting in other ways (or not at all
           like in the past).
      
         - To make confusion between SCPI and PSCI more likely, this release
           also includes an update of PSCI to interface version 1.0.
      
         - Rockchip support for power domains.
      
         - A driver to talk to the firmware on Raspberry Pi"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (57 commits)
        soc: qcom: smd-rpm: Correct size of outgoing message
        bus: sunxi-rsb: Add driver for Allwinner Reduced Serial Bus
        bus: sunxi-rsb: Add Allwinner Reduced Serial Bus (RSB) controller bindings
        ARM: bcm2835: add mutual inclusion protection
        drivers: psci: make PSCI 1.0 functions initialization version dependent
        dt-bindings: Correct paths in Rockchip power domains binding document
        soc: rockchip: power-domain: don't try to print the clock name in error case
        soc: qcom/smem: add HWSPINLOCK dependency
        clk: berlin: add cpuclk
        ARM: berlin: dts: add CLKID_CPU for BG2Q
        ARM: bcm2835: Add the Raspberry Pi firmware driver
        soc: qcom: smem: Move RPM message ram out of smem DT node
        soc: qcom: smd-rpm: Correct the active vs sleep state flagging
        soc: qcom: smd: delete unneeded of_node_put
        firmware: qcom-scm: build for correct architecture level
        soc: qcom: smd: Correct SMEM items for upper channels
        qcom-scm: add missing prototype for qcom_scm_is_available()
        qcom-scm: fix endianess issue in __qcom_scm_is_call_available
        soc: qcom: smd: Reject send of too big packets
        soc: qcom: smd: Handle big endian CPUs
        ...
      b44a3d2a
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 56e04649
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "New and/or improved SoC support for this release:
      
        Marvell Berlin:
           - Enable standard DT-based cpufreq
           - Add CPU hotplug support
      
        Freescale:
           - Ethernet init for i.MX7D
           - Suspend/resume support for i.MX6UL
      
        Allwinner:
           - Support for R8 chipset (used on NTC's $9 C.H.I.P board)
      
        Mediatek:
           - SMP support for some platforms
      
        Uniphier:
           - L2 support
           - Cleaned up SMP support, etc.
      
        plus a handful of other patches around above functionality, and a few
        other smaller changes"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
        ARM: uniphier: rework SMP operations to use trampoline code
        ARM: uniphier: add outer cache support
        Documentation: EXYNOS: Update bootloader interface on exynos542x
        ARM: mvebu: add broken-idle option
        ARM: orion5x: use mac_pton() helper
        ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned
        ARM: sunxi: Add R8 support
        ARM: digicolor: select pinctrl/gpio driver
        arm: berlin: add CPU hotplug support
        arm: berlin: use non-self-cleared reset register to reset cpu
        ARM: mediatek: add smp bringup code
        ARM: mediatek: enable gpt6 on boot up to make arch timer working
        soc: mediatek: Fix random hang up issue while kernel init
        soc: ti: qmss: make acc queue support optional in the driver
        soc: ti: add firmware file name as part of the driver
        Documentation: dt: soc: Add description for knav qmss driver
        ARM: S3C64XX: Use PWM lookup table for mach-smartq
        ARM: S3C64XX: Use PWM lookup table for mach-hmt
        ARM: S3C64XX: Use PWM lookup table for mach-crag6410
        ARM: S3C64XX: Use PWM lookup table for smdk6410
        ...
      56e04649
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a5e1d715
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "Again we have a sizable (but not huge) cleanup branch with a net delta
        of about -3k lines.
      
        Main contents here is:
      
         - A bunch of development/cleanup of a few PXA boards
         - Removal of bockw platforms on shmobile, since the platform has now
           gone completely multiplatform.  Whee!
         - move of the 32kHz timer on OMAP to a proper timesource
         - Misc cleanup of older OMAP material (incl removal of one board
           file)
         - Switch over to new common PWM lookup support for several platforms
      
        There's also a handful of other cleanups across the tree, but the
        above are the major pieces"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (103 commits)
        ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs
        ARM: DRA7: hwmod data: Remove spinlock hwmod addrs
        ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs
        ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data
        ARM: Remove __ref on hotplug cpu die path
        ARM: Remove open-coded version of IRQCHIP_DECLARE
        arm: omap2: board-generic: use omap4_local_timer_init for AM437x
        ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
        ARM: OMAP: Remove duplicated operand in OR operation
        clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE
        ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
        ARM: pxa: raumfeld: make some variables static
        ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c
        ARM: OMAP2+: Rename cpu_is macros to soc_is
        arm: omap2: timer: limit hwmod usage to non-DT boots
        arm: omap2+: select 32k clocksource driver
        clocksource: add TI 32.768 Hz counter driver
        arm: omap2: timer: rename omap_sync32k_timer_init()
        arm: omap2: timer: always call clocksource_of_init() when DT
        arm: omap2: timer: move realtime_counter_init() around
        ...
      a5e1d715
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 64fd8c8a
      Linus Torvalds authored
      Pull ARM SoC non-urgent fixes from Olof Johansson:
       "A handful of fixes that came in and didn't seem warranted to go in
        through the 4.3-rc cycle.
      
         - MAINTAINERS updates for one of the Broadcom platforms and lpc18xx
         - A couple of non-critical Davinci bugfixes
         - A fix to reset irq affinity for TI platforms (silences a warning at
           reboot)"
      
      * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: update lpc18xx entry with more drivers
        soc: ti: reset irq affinity before freeing irq
        ARM: cns3xxx: pci: avoid potential stack overflow
        ARM: davinci: clock: Correct return values for API functions
        ARM: davinci: re-use %*ph specifier
        MAINTAINERS: add entry for the Broadcom Northstar Plus SoCs
      64fd8c8a
    • Tony Luck's avatar
      Fix alloc_node_mem_map() to work on ia64 again · b0aeba74
      Tony Luck authored
      In commit a1c34a3b ("mm: Don't offset memmap for flatmem") Laura
      fixed a problem for Srinivas relating to the bottom 2MB of RAM on an ARM
      IFC6410 board.
      
      One small wrinkle on ia64 is that it allocates the node_mem_map earlier
      in arch code, so it skips the block of code where "offset" is
      initialized.
      
      Move initialization of start and offset before the check for the
      node_mem_map so that they will always be available in the latter part of
      the function.
      Tested-by: default avatarLaura Abbott <laura@labbott.name>
      Fixes: a1c34a3b (mm: Don't offset memmap for flatmem)
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b0aeba74
    • Vlad Yasevich's avatar
      Revert "bridge: Allow forward delay to be cfgd when STP enabled" · 8a921265
      Vlad Yasevich authored
      This reverts commit 34c2d9fb.
      
      There are 2 reasons for this revert:
       1)  The commit in question doesn't do what it says it does.  The
           description reads: "Allow bridge forward delay to be configured
           when Spanning Tree is enabled."  This was already the case before
           the commit was made.  What the commit actually do was disallow
           invalid values or 'forward_delay' when STP was turned off.
      
       2)  The above change was actually a change in the user observed
           behavior and broke things like libvirt and other network configs
           that set 'forward_delay' to 0 without enabling STP.  The value
           of 0 is actually used when STP is turned off to immediately mark
           the bridge as forwarding.
      Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8a921265
    • Steven Rostedt's avatar
      bpf_trace: Make dependent on PERF_EVENTS · a31d82d8
      Steven Rostedt authored
      Arnd Bergmann reported:
      
        In my ARM randconfig tests, I'm getting a build error for
        newly added code in bpf_perf_event_read and bpf_perf_event_output
        whenever CONFIG_PERF_EVENTS is disabled:
      
        kernel/trace/bpf_trace.c: In function 'bpf_perf_event_read':
        kernel/trace/bpf_trace.c:203:11: error: 'struct perf_event' has no member named 'oncpu'
        if (event->oncpu != smp_processor_id() ||
                 ^
        kernel/trace/bpf_trace.c:204:11: error: 'struct perf_event' has no member named 'pmu'
              event->pmu->count)
      
        This can happen when UPROBE_EVENT is enabled but KPROBE_EVENT
        is disabled. I'm not sure if that is a configuration we care
        about, otherwise we could prevent this case from occuring by
        adding Kconfig dependencies.
      
      Looking at this further, it's really that UPROBE_EVENT enables PERF_EVENTS.
      By just having BPF_EVENTS depend on PERF_EVENTS, then all is fine.
      
      Link: http://lkml.kernel.org/r/4525348.Aq9YoXkChv@wuerfelReported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a31d82d8