1. 05 7月, 2014 1 次提交
    • O
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of... · 5acd78c5
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge OMAP fixes from Tony Lindgren:
      
      Fixes for omaps for issues discovered during the merge window and
      enabling of a few features that had to wait for the driver
      dependencies to clear.
      
      The fixes included are:
      
      - Fix am43xx hard reset flags
      - Fix SoC detection for DRA722
      - Fix CPU OPP table for omap5
      - Fix legacy mux parser bug if requested muxname is a prefix of
        multiple mux entries
      - Fix qspi interrupt binding that relies on the irq crossbar
        that has not yet been enabled
      - Add missing phy_sel for am43x-epos-evm
      - Drop unused gic_init_irq() that is no longer needed
      
      And the enabling of features that had driver dependencies are:
      
      - Change dra7 to use Audio Tracking Logic clock instead of a fixed
        clock now that the clock driver for it has been merged
      
      - Enable off idle configuration for selected omaps as all the kernel
        dependencies for device tree based booting are finally merged as
        this is needed to get the automated PM tests working finally with
        device tree based booting
      
      - Add hwmod entry for ocp2scp3 for omap5 to get sata working as
        all the driver dependencies are now in the kernel and this patch
        fell through the cracks during the merge window
      
      * tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: dra7-evm: remove interrupt binding
        ARM: OMAP2+: Fix parser-bug in platform muxing code
        ARM: DTS: dra7/dra7xx-clocks: ATL related changes
        ARM: OMAP2+: drop unused function
        ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
        ARM: dts: omap5: Update CPU OPP table as per final production Manual
        ARM: DRA722: add detection of SoC information
        ARM: dts: Enable twl4030 off-idle configuration for selected omaps
        ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
        ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
      5acd78c5
  2. 27 6月, 2014 1 次提交
    • O
      ARM: bcm: Fix bcm and multi_v7 defconfigs · bfda90cb
      Olof Johansson 提交于
      BCM (Kona/capri platform) has regressed in two ways on this release. First,
      bcm_defconfig no longer selected the appropriate MMC driver options due to
      changes in dependencies. Secondly, the new MFD and regulator drivers were not
      enabled on multi_v7_defconfig, so that caused the system to fail probing MMC
      there.
      
      Fix by enabling the new options as needed.
      
      Cc: Matt Porter <matt.porter@linaro.org>
      Cc: Christian Daudt <bcm@fixthebug.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      bfda90cb
  3. 26 6月, 2014 3 次提交
  4. 25 6月, 2014 5 次提交
  5. 24 6月, 2014 3 次提交
  6. 23 6月, 2014 2 次提交
    • A
      Merge tag 'imx-fixes-3.16' of... · f340a59f
      Arnd Bergmann 提交于
      Merge tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Pull "i.MX fixes for 3.16" from Shawn Guo:
      
       - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51,
         because controller base CD/WP is not working in esdhc driver due to
         runtime PM support
       - A couple of random ventana gw5xxx board fixes
       - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving
         IPUv3 driver out of staging tree
       - Fix enet/fec clock selection on imx6sl
       - Fix display node on imx53-m53evk board
       - A couple of Cubox-i updates from Russell, which were omitted from
         the merge window due to dependency
      
      * tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.
        ARM: dts: imx51-babbage: Fix esdhc setup
        ARM: dts: mx5: Move the display out of soc {} node
        ARM: dts: mx5: Fix IPU port node placement
        ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE
        ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level
        ARM: dts: cubox-i: add support for PWM-driven front panel LED
        ARM: dts: imx6: ventana: correct gw52xx sgtl5000 clock source
        ARM: dts: imx6qdl-gw5xxx: Fix Linear Technology vendor prefix
        ARM: dts: imx6: ventana: fix include typo
        ARM: dts: imx6sl: correct the fec ipg clock source
        ARM: imx6sl: add missing enet clock for imx6sl
      f340a59f
    • A
      Merge tag 'samsung-fixes-1' of... · 9cbf3d2b
      Arnd Bergmann 提交于
      Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      Merge Samsung fixes for 3.16 from Kukjin Kim:
      
      - use WFI macro in platform_do_lowpower because exynos cpuhotplug
        includes a hardcoded WFI instruction and it causes compile error
        in Thumb-2 mode.
      - fix GIC reg sizes for exynos4 SoCs
      - remove reset timer counter value during boot and resume for mct
        to fix a big jump in printk timestamps
      - fix pm code to check cortex-A9 for another exynos SoCs
      - don't rely on firmware's secondary_cpu_start for mcpm
      
      * tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Don't rely on firmware's secondary_cpu_start for mcpm
        ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC
        clocksource: exynos_mct: Don't reset the counter during boot and resume
        ARM: dts: fix reg sizes of GIC for exynos4
        ARM: EXYNOS: Use wfi macro in platform_do_lowpower
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      9cbf3d2b
  7. 21 6月, 2014 7 次提交
  8. 20 6月, 2014 3 次提交
  9. 19 6月, 2014 1 次提交
  10. 18 6月, 2014 3 次提交
    • K
      tty: serial: msm: Fix section mismatch warning · 4cc29462
      Kumar Gala 提交于
      WARNING: drivers/tty/built-in.o(.data+0x3544): Section mismatch in
      reference from the variable msm_platform_driver to the function
      .init.text:msm_serial_probe()
      The variable msm_platform_driver references
      the function __init msm_serial_probe()
      If the reference is valid then annotate the
      variable with __init* or __refdata (see linux/init.h) or name the variable:
      *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
      Signed-off-by: NKumar Gala <galak@codeaurora.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      4cc29462
    • E
      ARM: mvebu: enable Dove SoC in mvebu_v7_defconfig · 3f620ddc
      Ezequiel Garcia 提交于
      Since commit:
      
      commit d93003e8
      Author: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Date:   Thu Apr 24 22:58:30 2014 +0100
      
          ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B
      
      fixed the error that prevented Dove SoC from being built with
      the rest of the mvebu SoCs, we can now add it to the defconfig.
      
      In addition, this commit enables SERIAL_OF_PLATFORM, which is required
      to have UART on some of the boards.
      Signed-off-by: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      3f620ddc
    • A
      ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC · c0c3c359
      Abhilash Kesavan 提交于
      We have an soc check to ensure that the scu and certain A9 specific
      registers are not accessed on Exynos5250 (which is A15 based).
      Rather than adding another soc specific check for 5420 let us test
      for the Cortex A9 primary part number.
      
      This resolves the below crash seen on exynos5420 during core switching
      after the CPUIdle consolidation series was merged.
      
      [  155.975589] [<c0013174>] (scu_enable) from [<c001b0dc>] (exynos_cpu_pm_notifier+0x80/0xc4)
      [  155.983833] [<c001b0dc>] (exynos_cpu_pm_notifier) from [<c003c1b0>] (notifier_call_chain+0x44/0x84)
      [  155.992851] [<c003c1b0>] (notifier_call_chain) from [<c007a49c>] (cpu_pm_notify+0x20/0x3c)
      [  156.001089] [<c007a49c>] (cpu_pm_notify) from [<c007a564>] (cpu_pm_exit+0x20/0x38)
      [  156.008635] [<c007a564>] (cpu_pm_exit) from [<c0019e98>] (bL_switcher_thread+0x298/0x40c)
      [  156.016788] [<c0019e98>] (bL_switcher_thread) from [<c003842c>] (kthread+0xcc/0xe8)
      [  156.024426] [<c003842c>] (kthread) from [<c000e438>] (ret_from_fork+0x14/0x3c)
      [  156.031621] Code: ea017fec c0530a00 c052e3f8 c0012dcc (e5903000
      Signed-off-by: NAbhilash Kesavan <a.kesavan@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      c0c3c359
  11. 17 6月, 2014 11 次提交
    • R
      ARM: use menuconfig for sub-arch menus · 21278aea
      Rob Herring 提交于
      The System Type menu is getting quite long with platforms and is
      inconsistent in handling of sub-arch specific options. Tidy up the menu
      by making platform options a menuconfig entry containing any platform
      specific config items.
      
      [arnd: change OMAP part according to suggestion from
       Tony Lindgren <tony@atomide.com>]
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      21278aea
    • S
      ARM: multi_v7_defconfig: re-enable SDHCI drivers · 216e9d3e
      Stephen Warren 提交于
      Following 5d01b768 "mmc: simplify SDHCI Kconfig dependencies",
      SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but
      instead depend on it. This means that multi_v7_defconfig no longer
      selects it, and hence many SDHCI drivers are no longer enabled.
      Explicitly enable MMC_SDHCI_PLTFM to solve this.
      
      Fixes: 5d01b768 ("mmc: simplify SDHCI Kconfig dependencies")
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Tested-by: NMatt Porter <mporter@linaro.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      216e9d3e
    • S
      ARM: EXYNOS: Fix compilation warning · 3eb93646
      Sachin Kamat 提交于
      of_get_flat_dt_prop return type is now const.
      Fixes the following compilation warning introduced by commit 9d0c4dfe
      ("of/fdt: update of_get_flat_dt_prop in prep for libfdt")
      
      arch/arm/mach-exynos/exynos.c:259:6: warning:
      assignment discards ‘const’ qualifier from pointer target type [enabled by default]
      Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
      Reviewed-by: NTushar Behera <tushar.behera@linaro.org>
      Cc: Rob Herring <robh@kernel.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      3eb93646
    • O
      ARM: exynos: move sysram info to exynos.c · 1754c42e
      Olof Johansson 提交于
      This solves a problem with building with CONFIG_SMP=n due to missing
      sysram_base_addr (or sysram_ns_base_addr) variables.
      
      The new setup method is more awkward than I'd like for it to be, but
      it can't be done in init_early() since ioremap is not yet available,
      but it needs to happen before SMP.
      Reported-by: NRussell King <linux@arm.linux.org.uk>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Reviewed-by: NTomasz Figa <t.figa@samsung.com>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      1754c42e
    • E
      ARM: dts: Specify the NAND ECC scheme explicitly on Armada 385 DB board · 1ad58443
      Ezequiel Garcia 提交于
      The factory bootloader on A385-DB boards expect the ECC strength to be
      4 bits over 512 bytes. Hence, we need to specify this in the devicetree,
      to prevent the kernel from assuming any different ECC scheme.
      Signed-off-by: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Link: https://lkml.kernel.org/r/1400941030-2123-3-git-send-email-ezequiel.garcia@free-electrons.comSigned-off-by: NJason Cooper <jason@lakedaemon.net>
      1ad58443
    • E
      ARM: dts: Specify the NAND ECC scheme explicitly on Armada 375 DB board · 3364ee57
      Ezequiel Garcia 提交于
      The factory bootloader on A375-DB boards expect the ECC strength to be
      4 bits over 512 bytes. Hence, we need to specify this in the devicetree,
      to prevent the kernel from assuming any different ECC scheme.
      Signed-off-by: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Link: https://lkml.kernel.org/r/1400941030-2123-2-git-send-email-ezequiel.garcia@free-electrons.comSigned-off-by: NJason Cooper <jason@lakedaemon.net>
      3364ee57
    • R
      ARM: exynos: cleanup kconfig option display · e509b289
      Rob Herring 提交于
      The addition of Exynos to multi-platform configs creates a mess of config
      options with options appearing before the Exynos config option. This is
      due to arch/arm/plat-samsung/Kconfig being included out of order with the
      other Samsung platform kconfig files. Reorder the kconfig files and move
      all the options into a sub-menu. Some of the options are dead, so remove
      those as well.
      Signed-off-by: NRob Herring <robh@kernel.org>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Cc: linux-samsung-soc@vger.kernel.org
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      e509b289
    • D
      misc: vexpress: fix error handling vexpress_syscfg_regmap_init() · fc96e661
      Dan Carpenter 提交于
      This function should be returning an ERR_PTR() on failure instead of
      NULL.  Also there is a use after free bug if regmap_init() fails because
      we free "func" and then dereference doing the return.
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: NPawel Moll <pawel.moll@arm.com>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      fc96e661
    • S
      ARM: Remove ARCH_HAS_CPUFREQ config option · 19682f72
      Stephen Boyd 提交于
      This config exists entirely to hide the cpufreq menu from the
      kernel configuration unless a platform has selected it. Nothing
      is actually built if this config is 'Y' and it just leads to more
      patches that add a select under a platform Kconfig so that some
      other CPUfreq option can be chosen. Let's remove the option so
      that we can always enable CPUfreq drivers on ARM platforms.
      Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      19682f72
    • L
      ARM: integrator: fix section mismatch problem · e1318391
      Linus Walleij 提交于
      This addresses a section mismatch problem in the IM-PD1
      driver in the Integrator/AP.
      
      The IM-PD1 contains a VIC interrupt controller and therefore
      the driver calls vic_init_cascaded() which is marked __init as
      irqchips are simply not hot-pluggable and specifically the VIC
      is assumed to initiate only on boot.
      
      However the module driver model of the Integrator LM bus
      assumes that logic tile drivers can be probed at runtime. This
      is not really the case for IM-PD1: these tiles are detected at
      boot and they cannot be plugged into a running system. Before
      this patch it is of course possible to modprobe them later.
      
      By first forcing the IM-PD1 to bool we make sure this driver
      gets compiled into the kernel, and we know it will be probed
      only at boot time when the tiles are detected, so we can tag
      its probe function __init_refok as we know it won't be called
      after boot now, and the section mismatch problem goes away.
      
      As a side effect, sysfs binding from userspace becomes
      impossible, so we tag the driver to suppress the bind/unbind
      sysfs attributes.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      e1318391
    • J
      ARM: mvebu: DT: fix OpenBlocks AX3-4 RAM size · e47043ae
      Jason Cooper 提交于
      The OpenBlocks AX3-4 has a non-DT bootloader.  It also comes with 1GB of
      soldered on RAM, and a DIMM slot for expansion.
      
      Unfortunately, atags_to_fdt() doesn't work in big-endian mode, so we see
      the following failure when attempting to boot a big-endian kernel:
      
        686 slab pages
        17 pages shared
        0 pages swap cached
        [ pid ]   uid  tgid total_vm      rss nr_ptes swapents oom_score_adj name
        Kernel panic - not syncing: Out of memory and no killable processes...
      
        CPU: 1 PID: 351 Comm: kworker/u4:0 Not tainted 3.15.0-rc8-next-20140603 #1
        [<c0215a54>] (unwind_backtrace) from [<c021160c>] (show_stack+0x10/0x14)
        [<c021160c>] (show_stack) from [<c0802500>] (dump_stack+0x78/0x94)
        [<c0802500>] (dump_stack) from [<c0800068>] (panic+0x90/0x21c)
        [<c0800068>] (panic) from [<c02b5704>] (out_of_memory+0x320/0x340)
        [<c02b5704>] (out_of_memory) from [<c02b93a0>] (__alloc_pages_nodemask+0x874/0x930)
        [<c02b93a0>] (__alloc_pages_nodemask) from [<c02d446c>] (handle_mm_fault+0x744/0x96c)
        [<c02d446c>] (handle_mm_fault) from [<c02cf250>] (__get_user_pages+0xd0/0x4c0)
        [<c02cf250>] (__get_user_pages) from [<c02f3598>] (get_arg_page+0x54/0xbc)
        [<c02f3598>] (get_arg_page) from [<c02f3878>] (copy_strings+0x278/0x29c)
        [<c02f3878>] (copy_strings) from [<c02f38bc>] (copy_strings_kernel+0x20/0x28)
        [<c02f38bc>] (copy_strings_kernel) from [<c02f4f1c>] (do_execve+0x3a8/0x4c8)
        [<c02f4f1c>] (do_execve) from [<c025ac10>] (____call_usermodehelper+0x15c/0x194)
        [<c025ac10>] (____call_usermodehelper) from [<c020e9b8>] (ret_from_fork+0x14/0x3c)
        CPU0: stopping
        CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.15.0-rc8-next-20140603 #1
        [<c0215a54>] (unwind_backtrace) from [<c021160c>] (show_stack+0x10/0x14)
        [<c021160c>] (show_stack) from [<c0802500>] (dump_stack+0x78/0x94)
        [<c0802500>] (dump_stack) from [<c021429c>] (handle_IPI+0x138/0x174)
        [<c021429c>] (handle_IPI) from [<c02087f0>] (armada_370_xp_handle_irq+0xb0/0xcc)
        [<c02087f0>] (armada_370_xp_handle_irq) from [<c0212100>] (__irq_svc+0x40/0x50)
        Exception stack(0xc0b6bf68 to 0xc0b6bfb0)
        bf60:                   e9fad598 00000000 00f509a3 00000000 c0b6a000 c0b724c4
        bf80: c0b72458 c0b6a000 00000000 00000000 c0b66da0 c0b6a000 00000000 c0b6bfb0
        bfa0: c027bb94 c027bb24 60000313 ffffffff
        [<c0212100>] (__irq_svc) from [<c027bb24>] (cpu_startup_entry+0x54/0x214)
        [<c027bb24>] (cpu_startup_entry) from [<c0ac5b30>] (start_kernel+0x318/0x37c)
        [<c0ac5b30>] (start_kernel) from [<00208078>] (0x208078)
        ---[ end Kernel panic - not syncing: Out of memory and no killable processes...
      
      A similar failure will also occur if ARM_ATAG_DTB_COMPAT isn't selected.
      
      Fix this by setting a sane default (1 GB) in the dts file.
      Signed-off-by: NJason Cooper <jason@lakedaemon.net>
      Tested-by: NKevin Hilman <khilman@linaro.org>
      Cc: <stable@vger.kernel.org> #v3.13+
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      e47043ae