1. 03 Dec, 2013 3 commits
    • Olof Johansson's avatar
      Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes · 3060817f
      Olof Johansson authored
      From Nicolas Ferre:
      AT91: second round of fixes for 3.13
      - reduce IP frequency for I2C on sama5d3
      - missing aliases directive for USART3 on 9x5 family
      - a PM symbol is missing if !CONFIG_PM
      
      * tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
      3060817f
    • Olof Johansson's avatar
      Merge tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu into fixes · c0c3350c
      Olof Johansson authored
      From Jason Cooper, mvebu DT fixes for v3.13:
       - mvebu
          - PCIe fixes now that we have test devices with more ports.
          - fix access to coherency registers
      
      * tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: re-enable PCIe on Armada 370 DB
        ARM: mvebu: use the virtual CPU registers to access coherency registers
        ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260
        ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable
      c0c3350c
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of... · b8be3a22
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      
      Some omap related fixes that have come up with people moving to device
      tree only based booting for omap2+.
      
      The series contains a handful of fixes for the igep boards as they were
      one of the first omap3 boards to jump over completely to device tree
      based booting. So these can be considered regressions compared to
      booting igep in legacy mode with board files in v3.12.
      
      Also included are few other device tree vs legacy booting regressions:
      
      - yet more missing omap3 .dtsi entries that have showed up booting
        various boards with device tree only
      
      - n900 eMMC device tree fix
      
      - fixes for beagle USB EHCI
      
      - two fixes to make omap2420 MMC work
      
      As we're moving omap2+ to be device tree only for v3.14, I'd like to
      have v3.13 work equally well for legacy based booting and device tree
      based booting. So there will be likely few more device tree related
      booting patches trickling in.
      
      This series also includes a regression fix for the omap timer posted
      mode that may wrongly stay on from the bootloader for some SoCs.
      
      * tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ARM: dts: AM33XX BASE0033: add pinmux and hdmi node to enable display
        ARM: dts: omap3-igep0020: Add pinmuxing for DVI output
        ARM: dts: omap3-igep0020: Add pinmux setup for i2c devices
        ARM: dts: omap3-igep: Update to use the TI AM/DM37x processor
        ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO
        ARM: dts: omap3-igep: Fix bus-width for mmc1
        ARM: OMAP2+: dss-common: change IGEP's DVI DDC i2c bus
        ARM: OMAP2+: Disable POSTED mode for errata i103 and i767
        ARM: OMAP2+: Fix eMMC on n900 with device tree
        ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
        ARM: OMAP2+: Fix more missing data for omap3.dtsi file
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b8be3a22
  2. 02 Dec, 2013 3 commits
  3. 26 Nov, 2013 22 commits
  4. 25 Nov, 2013 11 commits
    • Kevin Hilman's avatar
      Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 192b4bcb
      Kevin Hilman authored
      The imx fixes for 3.13, part 2:
       - Disable S/PDIF "rxtx5" clock option to fix the clocksource breakage
         introduced by S/PDIF driver
      
      * tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: dts: imx6qdl: disable spdif "rxtx5" clock option
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      192b4bcb
    • Doug Anderson's avatar
      ARM: dts: Add max77686 RTC interrupt to cros5250-common · c61248af
      Doug Anderson authored
      Without the interrupt you'll get problems if you enable
      CONFIG_RTC_DRV_MAX77686.  Setup the interrupt properly in the device
      tree.
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Tested-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: stable@vger.kernel.org
      c61248af
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix eMMC on n900 with device tree · edd5eb4e
      Tony Lindgren authored
      Looks like we need to configure the regulators and use the pdata
      quirk to make eMMC work with device tree.
      
      It seems that mostly vaux3 is used, and only some earlier revisions
      used vmmc2. This has been tested to work on devices where the
      system_rev passed by the bootloader has versions 0x0010, 0x2101
      and 0x2204.
      
      Cc: devicetree@vger.kernel.org
      Cc: Pavel Machek <pavel@ucw.cz>
      Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
      Signed-off-by: default avatarSebastian Reichel <sre@debian.org>
      [tony@atomide.com: updated with pinctrl changes and comments from Sebastian]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      edd5eb4e
    • Tony Lindgren's avatar
      ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig · 26f67a31
      Tony Lindgren authored
      We do not have REGULATOR_FIXED selected if no boards are selected
      and we boot with device tree. This can cause various devices to
      fail.
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      26f67a31
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix more missing data for omap3.dtsi file · 7ce93f31
      Tony Lindgren authored
      After dropping the duplicate data in hwmod that now should come from
      the .dts files, I noticed few more entries missing. Let's add these
      as otherwise devices relying on these won't work.
      
      Looks like the side tone entries are bundled into the mcbsp1 to 3,
      so that may needs some special handling in the hwmod code as it's
      currently trying to look up mcbsp2_sidetone and mcbsp3_sidetone
      entries.
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      7ce93f31
    • Dave Martin's avatar
      ARM: vexpress/TC2: Implement MCPM power_down_finish() · 33cb667a
      Dave Martin authored
      This patch implements the power_down_finish() method for TC2, to
      enable the kernel to confirm when CPUs are safely powered down.
      
      The information required for determining when a CPU is parked
      cannot be obtained from any single place, so a few sources of
      information must be combined:
      
        * mcpm_cpu_power_down() must be pending for the CPU, so that we
          don't get confused by false STANDBYWFI positives arising from
          CPUidle.  This is detected by waiting for the tc2_pm use count
          for the target CPU to reach 0.
      
        * Either the SPC must report that the CPU has asserted
          STANDBYWFI, or the TC2 tile's reset control logic must be
          holding the CPU in reset.
      
          Just checking for STANDBYWFI is not sufficient, because this
          signal is not latched when the the cluster is clamped off and
          powered down: the relevant status bits just drop to zero.  This
          means that STANDBYWFI status cannot be used for reliable
          detection of the last CPU in a cluster reaching WFI.
      
      This patch is required in order for kexec to work with MCPM on TC2.
      
      MCPM code was changed in commit 0de0d646 ('ARM: 7848/1: mcpm:
      Implement cpu_kill() to synchronise on powerdown'), and since then it
      will hit a WARN_ON_ONCE() due to power_down_finish not being implemented
      on the TC2 platform.
      Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
      Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
      Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      33cb667a
    • Thierry Reding's avatar
      ARM: tegra: Provide dummy powergate implementation · 9886e1fd
      Thierry Reding authored
      In order to support increased build test coverage for drivers, implement
      dummies for the powergate implementation. This will allow the drivers to
      be built without requiring support for Tegra to be selected.
      
      This patch solves the following build errors, which can be triggered in
      v3.13-rc1 by selecting DRM_TEGRA without ARCH_TEGRA:
      
      drivers/built-in.o: In function `gr3d_remove':
      drivers/gpu/drm/tegra/gr3d.c:321: undefined reference to `tegra_powergate_power_off'
      drivers/gpu/drm/tegra/gr3d.c:325: undefined reference to `tegra_powergate_power_off'
      drivers/built-in.o: In function `gr3d_probe':
      drivers/gpu/drm/tegra/gr3d.c:266: undefined reference to `tegra_powergate_sequence_power_up'
      drivers/gpu/drm/tegra/gr3d.c:273: undefined reference to `tegra_powergate_sequence_power_up'
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      [swarren, updated commit description]
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9886e1fd
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of... · 5c1f34c4
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      Few more fixes for issues found booting older omaps using device tree.
      Also few randconfig build fixes and removal of some dead code for omap4
      as it no longer has legacy platform data based booting support.
      
      * tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init
        ARM: OMAP2+: Remove legacy mux code for display.c
        ARM: OMAP2+: Fix undefined reference to set_cntfreq
        gpio: twl4030: Fix passing of pdata in the device tree case
        gpio: twl4030: Fix regression for twl gpio output
        ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain
        ARM: dts: Fix omap2 specific dtsi files by adding the missing entries
        ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x
        i2c: omap: Fix missing device tree flags for omap2
      5c1f34c4
    • Olof Johansson's avatar
      ARM: omap: fix warning with LPAE build · 6dd1e357
      Olof Johansson authored
      Some omap3 code is throwing a warning:
      arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
      arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
        integer of different size [-Wint-to-pointer-cast]
      
      In reality this code will never actually execute with LPAE=y, since
      Cortex-A8 doesn't support it. So downcasting the __pa() is safe in
      this case.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      6dd1e357
    • Thomas Petazzoni's avatar
      ARM: mvebu: re-enable PCIe on Armada 370 DB · 96039f73
      Thomas Petazzoni authored
      Commit 14fd8ed0 ("ARM: mvebu: Relocate Armada 370/XP PCIe
      device tree nodes") relocated the PCIe controller DT nodes one level
      up in the Device Tree, to reflect a more correct representation of the
      hardware introduced by the mvebu-mbus Device Tree binding.
      
      However, while most of the boards were properly adjusted accordingly,
      the Armada 370 DB board was left unchanged, and therefore, PCIe is
      seen as not enabled on this board. This patch fixes that by moving the
      PCIe controller node one level-up in armada-370-db.dts.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: <stable@vger.kernel.org> # v3.12+
      Fixes: 14fd8ed0 "ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes"
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      96039f73
    • Gregory CLEMENT's avatar
      ARM: mvebu: use the virtual CPU registers to access coherency registers · b6dda00c
      Gregory CLEMENT authored
      The Armada XP provides a mechanism called "virtual CPU registers" or
      "per-CPU register banking", to access the per-CPU registers of the
      current CPU, without having to worry about finding on which CPU we're
      running. CPU0 has its registers at 0x21800, CPU1 at 0x21900, CPU2 at
      0x21A00 and CPU3 at 0x21B00. The virtual registers accessing the
      current CPU registers are at 0x21000.
      
      However, in the Device Tree node that provides the register addresses
      for the coherency unit (which is responsible for ensuring coherency
      between processors, and I/O coherency between processors and the
      DMA-capable devices), a mistake was made: the CPU0-specific registers
      were specified instead of the virtual CPU registers. This means that
      the coherency barrier needed for I/O coherency was not behaving
      properly when executed from a CPU different from CPU0. This patch
      fixes that by using the virtual CPU registers.
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: <stable@vger.kernel.org> # v3.8+
      Fixes: e60304f8 "arm: mvebu: Add hardware I/O Coherency support"
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      b6dda00c
  5. 23 Nov, 2013 1 commit