1. 05 Mar, 2014 11 commits
    • Liu Ying's avatar
      ARM: imx: clk-vf610: Suppress duplicate const sparse warning · b78f1e80
      Liu Ying authored
      There should be no duplicate const specifiers for those static
      constant character string arrays defined for clock mux options.
      Also, the arrays are only taken as the 5th argument for the
      imx_clk_mux() function, which is in the type of 'const char
      **parents'.  So, let's remove the 2nd const specifier right
      after 'char'.
      
      This patch fixes these sparse warnings:
      arch/arm/mach-imx/clk-vf610.c:66:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:67:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:68:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:69:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:70:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:71:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:72:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:73:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:74:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:75:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:76:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:77:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:78:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:79:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:80:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:81:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:83:25: warning: duplicate const
      arch/arm/mach-imx/clk-vf610.c:84:25: warning: duplicate const
      Signed-off-by: default avatarLiu Ying <Ying.Liu@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      b78f1e80
    • Liu Ying's avatar
      ARM: imx: clk-imx6sl: Suppress duplicate const sparse warning · b21c22e3
      Liu Ying authored
      There should be no duplicate const specifiers for those static
      constant character string arrays defined for clock mux options.
      Also, the arrays are only taken as the 5th argument for the
      imx_clk_mux() function, which is in the type of 'const char
      **parents'.  So, let's remove the 2nd const specifier right
      after 'char'.
      
      This patch fixes these sparse warnings:
      arch/arm/mach-imx/clk-imx6sl.c:21:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:22:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:23:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:24:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:25:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:26:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:27:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:28:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:29:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:30:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:31:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:32:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:33:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:34:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:35:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:36:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:37:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:38:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:39:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:40:25: warning: duplicate const
      arch/arm/mach-imx/clk-imx6sl.c:41:25: warning: duplicate const
      Signed-off-by: default avatarLiu Ying <Ying.Liu@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      b21c22e3
    • John Tobias's avatar
      ARM: imx: add select on ARCH_MXC for cpufreq support · 5a1513f6
      John Tobias authored
      Move ARCH_HAS_CPUFREQ, ARCH_HAS_OPP and PM_OPP on ARCH_MXC so that
      the user can enable the cpufreq support for iMX6Q and/or iMX6SL.
      Signed-off-by: default avatarJohn Tobias <john.tobias.ph@gmail.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      5a1513f6
    • Denis Carikli's avatar
      ARM: imx_v6_v7_defconfig: Enable some drivers used on the cpuimx35. · 80130a59
      Denis Carikli authored
      The eukrea cpuimx35 has a pcf8563 RTC and a LCD gpio regulator.
      
      We enable the respective drivers in order to be able to use theses
        features with this configuration.
      
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Eric Bénard <eric@eukrea.com>
      Signed-off-by: default avatarDenis Carikli <denis@eukrea.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      80130a59
    • Denis Carikli's avatar
      ARM i.MX35: build in pinctrl support. · c51bcd15
      Denis Carikli authored
      shawn.guo: While at it, we drop 'select PINCTRL' from SOC_IMX35, since
      it's been covered by ARCH_MXC.
      
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: devicetree@vger.kernel.org
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Eric Bénard <eric@eukrea.com>
      Signed-off-by: default avatarDenis Carikli <denis@eukrea.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      c51bcd15
    • Denis Carikli's avatar
      ARM: imx_v6_v7_defconfig: Enable backlight gpio support. · 94645973
      Denis Carikli authored
      The eukrea mbimxsd51 has a gpio backlight for its
        LCD display, so we turn that driver on.
      
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Eric Bénard <eric@eukrea.com>
      Signed-off-by: default avatarDenis Carikli <denis@eukrea.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      94645973
    • Anson Huang's avatar
      ARM: imx: add cpuidle support for i.mx6sl · 751f7e99
      Anson Huang authored
      Add cpuidle support for i.MX6SL, currently only support
      two cpuidle levels(ARM wfi and WAIT mode), and add software
      workaround for WAIT mode errata as below:
      
      ERR005311 CCM: After exit from WAIT mode, unwanted interrupt(s) taken
                during WAIT mode entry process could cause cache memory
                corruption.
      
      Software workaround:
          To prevent this issue from occurring, software should ensure that
      the ARM to IPG clock ratio is less than 12:5 (that is < 2.4x), before
      entering WAIT mode.
      Signed-off-by: default avatarAnson Huang <b20788@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      751f7e99
    • Anson Huang's avatar
      ARM: imx: AHB rate must be set to 132MHz on i.mx6sl · 848db4a0
      Anson Huang authored
      The reset value of AHB divider is 3, so current AHB rate
      is 99MHz which is not correct for kernel, need to ensure
      AHB rate is 132MHz in clk driver, as ipg is sourcing from
      AHB, and it should be 66MHz by default.
      Signed-off-by: default avatarAnson Huang <b20788@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      848db4a0
    • Fabio Estevam's avatar
      ARM: imx: Use INT_MEM_CLK_LPM as the bit name · fa6be65e
      Fabio Estevam authored
      Bit 17 of register CCM_CGPR is called INT_MEM_CLK_LPM as per the mx6
      reference manual, so use this name instead.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      fa6be65e
    • Fabio Estevam's avatar
      ARM: imx_v6_v7_defconfig: Select PCI support · c0bea59c
      Fabio Estevam authored
      Let PCI driver be enabled by default.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Reviewed-by: default avatarMarek Vasut <marex@denx.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      c0bea59c
    • Shawn Guo's avatar
      Merge tag 'kconfig-cleanup-for-3.15' into imx/soc · c1b2a174
      Shawn Guo authored
      - Remove common kconfig options required by multi-platform builds out
      of individual platforms as they are redundant.
      - Make SMP, CACHE_L2X0 and GPIO config options user visible on
      multi-platform builds as most platforms enable these options and all
      platforms can run with them enabled.
      - Make multi-platform v6 default to more optimal v6k rather than v6
      - Remove the last bit of mach-virt and convert it to just a kconfig
      option.
      
      Conflicts:
      	arch/arm/mach-omap2/Kconfig
      c1b2a174
  2. 24 Feb, 2014 3 commits
    • Linus Torvalds's avatar
      Linux 3.14-rc4 · cfbf8d48
      Linus Torvalds authored
      cfbf8d48
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 72673429
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A collection of fixes for ARM platforms.  Most are fixes for DTS
        files, mostly from DT conversion on OMAP which is still finding a few
        issues here and there.
      
        There's a couple of small stale code removal patches that we usually
        queue for the next release instead, but they seemed harmless enough to
        bring in now.
      
        Also, a fix for backlight on some PXA platforms, and a cache
        configuration fix for Tegra, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
        MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
        ARM: tegra: only run PL310 init on systems with one
        ARM: tegra: Add head numbers to display controllers
        ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
        ARM: tegra: fix RTC0 alias for Cardhu
        ARM: dove: dt: revert PMU interrupt controller node
        Documentation: dt: OMAP: Update Overo/Tobi
        ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
        ARM: dts: omap3-tobi: Use the correct vendor prefix
        ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
        ARM: OMAP2+: Remove legacy macros for zoom platforms
        ARM: OMAP2+: Remove MACH_NOKIA_N800
        ARM: dts: N900: add missing compatible property
        ARM: dts: N9/N950: fix boot hang with 3.14-rc1
        ARM: OMAP1: nokia770: enable tahvo-usb
        ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
        ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
        ARM: dts: omap3-gta04: Fix mmc1 properties.
        ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
        ARM: OMAP2+: add missing ARCH_HAS_OPP
        ...
      72673429
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 24c85258
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "Mostly unexciting driver fixes, plus one fix to lower the severity of
        the log message when we don't use an optional regulator - the fixes
        for ACPI system made this come up more often and it was correctly
        observed that it was causing undue concern for users"
      
      * tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: max14577: Fix invalid return value on DT parse success
        regulator: core: Change dummy supplies error message to a warning
        regulator: s5m8767: Add missing of_node_put
        regulator: s5m8767: Use of_get_child_by_name
        regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
      24c85258
  3. 23 Feb, 2014 10 commits
  4. 22 Feb, 2014 7 commits
    • Greg Kroah-Hartman's avatar
      Revert "tty: Set correct tty name in 'active' sysfs attribute" · 5c0a2450
      Greg Kroah-Hartman authored
      This reverts commit d8a5dc30.
      
      This breaks plymouth installs, either because plymouth is using the file
      "incorrectly" or because the patch is incorrect.  Either way, this needs
      to be reverted until it is all figured out.
      Reported-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Reported-by: default avatarRay Strode <halfline@gmail.com>
      Cc: Lennart Poettering <lennart@poettering.net>
      Cc: Kay Sievers <kay@vrfy.org>
      Cc: Jiri Slaby <jslaby@suse.cz>
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Cc: Werner Fink <werner@suse.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5c0a2450
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5580723f
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixlets: a fair number of them resulting from the new
        SCHED_DEADLINE code"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/deadline: Remove useless dl_nr_total
        sched/deadline: Test for CPU's presence explicitly
        sched: Add 'flags' argument to sched_{set,get}attr() syscalls
        sched: Fix information leak in sys_sched_getattr()
        sched,numa: add cond_resched to task_numa_work
        sched/core: Make dl_b->lock IRQ safe
        sched/core: Fix sched_rt_global_validate
        sched/deadline: Fix overflow to handle period==0 and deadline!=0
        sched/deadline: Fix bad accounting of nr_running
      5580723f
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9b3e7c9b
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixlets from all around the place"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/uncore: Fix IVT/SNB-EP uncore CBOX NID filter table
        perf/x86: Correctly use FEATURE_PDCM
        perf, nmi: Fix unknown NMI warning
        perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64) arches
        perf trace: Add fallback definition of EFD_SEMAPHORE
        perf list: Fix checking for supported events on older kernels
        perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly
        perf probe: Do not add offset twice to uprobe address
        perf/x86: Fix Userspace RDPMC switch
        perf/x86/intel/p6: Add userspace RDPMC quirk for PPro
      9b3e7c9b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0f0ca143
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Fix writing the minimum temperature in max1668 driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (max1668) Fix writing the minimum temperature
      0f0ca143
    • Linus Torvalds's avatar
      Merge branch 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs · 645ceee8
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "This is the first pull request I've had to do for you, so I'm still
        sorting things out.  The reason I'm sending this and not Ben should be
        obvious from the first commit below - SGI has stepped down from the
        XFS maintainership role.  As such, I'd like to take another
        opportunity to thank them for their many years of effort maintaining
        XFS and supporting the XFS community that they developed from the
        ground up.
      
        So I haven't had time to work things like signed tags into my
        workflows yet, so this is just a repo branch I'm asking you to pull
        from.  And yes, I named the branch -rc4 because I wanted the fixes in
        rc4, not because the branch was for merging into -rc3.  Probably not
        right, either.
      
        Anyway, I should have everything sorted out by the time the next merge
        window comes around.  If there's anything that you don't like in the
        pull req, feel free to flame me unmercifully.
      
        The changes are fixes for recent regressions and important thinkos in
        verification code:
      
              - a log vector buffer alignment issue on ia32
              - timestamps on truncate got mangled
              - primary superblock CRC validation fixes and error message
                sanitisation"
      
      * 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs:
        xfs: limit superblock corruption errors to actual corruption
        xfs: skip verification on initial "guess" superblock read
        MAINTAINERS: SGI no longer maintaining XFS
        xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
        xfs: ensure correct log item buffer alignment
        xfs: ensure correct timestamp updates from truncate
      645ceee8
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · a9d3f94e
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
        * Handle PERF_RECORD_HEADER_EVENT_TYPE properly. (Jiri Olsa)
      
        * Fix checking for supported events on older kernels in
          'perf list' (Vince Weaver)
      
        * Do not add offset twice to uprobe address in
          'perf probe' (Masami Hiramatsu)
      
        * Fix perf trace's ioctl 'request' beautifier build problems
          on !(i386 || x86_64) arches (Arnaldo Carvalho de Melo)
      
        * Fix 'perf trace' build by adding a fallback definition for
          EFD_SEMAPHORE (Ben Hutchings)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      a9d3f94e
    • Krzysztof Kozlowski's avatar
      regulator: max14577: Fix invalid return value on DT parse success · 08221fc4
      Krzysztof Kozlowski authored
      This fixes bug introduced in 667a6b7a (regulator: max14577: Add missing
      of_node_put). The DTS parsing function returned number of matched
      regulators as success status which then was compared against 0 in probe.
      
      Result was a probe fail after successful parsing the DTS:
      max14577-regulator: probe of max14577-regulator failed with error 2
      Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Reviwed-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      08221fc4
  5. 21 Feb, 2014 9 commits