1. 13 7月, 2013 2 次提交
    • V
      arm: multi_v7_defconfig: add i.MX options and NFS root · 1157d73d
      Vincent Stehlé 提交于
      - Add i.MX serial console support. This gives us the boot messages on
        UART on e.g. the i.MX6Q sabre sd platform.
      - Add the necessary config options, to allow booting with NFS root on
        an i.MX6 sabre sd.
      - Add Freescale LPUART serial console support. This gives us the boot
        messages on UART on e.g. the Vybrid VF610 Tower board.
      Signed-off-by: NVincent Stehlé <vincent.stehle@freescale.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      [olof: squashed three commits down to one]
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1157d73d
    • O
      Merge tag 'omap-for-v3.11/fixes-for-merge-window' of... · f4b96f5e
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Omap fixes and minor defconfig updates that would be good to
      get in before -rc1.
      
      * tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
        ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
        ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
        ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
        ARM: OMAP2+: devices: remove duplicated include from devices.c
        ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
        ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
        ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
        ARM: OMAP2+: Remove obsolete Makefile line
        ARM: OMAP5: Enable Cortex A15 errata 798181
        ARM: scu: provide inline dummy functions when SCU is not present
        ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
        ARM: OMAP2+: timer: initialize before using oh_name
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      
      Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
      f4b96f5e
  2. 09 7月, 2013 1 次提交
  3. 06 7月, 2013 7 次提交
    • A
      ARM: exynos: select PM_GENERIC_DOMAINS only when used · c1fe55e0
      Arnd Bergmann 提交于
      This fixes building exynos kernels with CONFIG_PM disabled.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      c1fe55e0
    • A
      ARM: ixp4xx: avoid circular header dependency · 39f1601c
      Arnd Bergmann 提交于
      With the new linux/reboot.h header file dependency added, we can no
      longer build ixp4xx. The easiest way to avoid that is to remove the
      inclusion of mach/hardware.h from mach/timex.h, which does not need
      that header anyway.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Imre Kaloz <kaloz@openwrt.org>
      Cc: Krzysztof Halasa <khc@pm.waw.pl>
      Cc: Jason Cooper <jason@lakedaemon.net>
      39f1601c
    • A
      ARM: OMAP: omap_common_late_init may be unused · 069d0a78
      Arnd Bergmann 提交于
      Some OMAP SoCs use this function while others do not, and that
      causes a warning when building multi_v7_defconfig. Marking the
      function __maybe_unused silences the harmless warning without the
      need to add complex #ifdef logic.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Tony Lindgren <tony@atomide.com>
      069d0a78
    • A
      ARM: sti: move DEBUG_STI_UART into alphabetical order · 5562b800
      Arnd Bergmann 提交于
      This was accidentally added in the wrong place, messing
      up the ordering of the file.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      5562b800
    • A
      ARM: OMAP: build mach-omap code only if needed · 59d92875
      Arnd Bergmann 提交于
      If we build a kernel with CONFIG_ARCH_OMAP2PLUS enabled but all of the
      individual SoCs disabled, we run into a large number of link errors
      because if incorrect dependencies:
      
      arch/arm/mach-omap2/built-in.o: In function `_add_initiator_dep':
      arch/arm/mach-omap2/omap_hwmod.c:691: undefined reference to `clkdm_add_sleepdep' arch/arm/mach-omap2/built-in.o: In function `_del_initiator_dep':
      arch/arm/mach-omap2/omap_hwmod.c:720: undefined reference to `clkdm_del_sleepdep' arch/arm/mach-omap2/built-in.o: In function `_enable':
      arch/arm/mach-omap2/omap_hwmod.c:2145: undefined reference to `clkdm_in_hwsup'
      arch/arm/mach-omap2/omap_hwmod.c:2147: undefined reference to `clkdm_hwmod_enable'
      arch/arm/mach-omap2/omap_hwmod.c:2191: undefined reference to `clkdm_hwmod_disable'
      arch/arm/mach-omap2/omap_hwmod.c:2146: undefined reference to `clkdm_missing_idle_reporting' arch/arm/mach-omap2/built-in.o: In function `_idle':
      arch/arm/mach-omap2/omap_hwmod.c:2235: undefined reference to `clkdm_hwmod_disable' arch/arm/mach-omap2/built-in.o: In function `_shutdown':
      arch/arm/mach-omap2/omap_hwmod.c:2338: undefined reference to `clkdm_hwmod_disable' arch/arm/mach-omap2/built-in.o: In function `omap_hwmod_get_context_loss_count':
      arch/arm/mach-omap2/omap_hwmod.c:4071: undefined reference to `pwrdm_get_context_loss_count' arch/arm/mach-omap2/built-in.o: In function `omap_pm_clkdms_setup':
      arch/arm/mach-omap2/pm.c:114: undefined reference to `clkdm_allow_idle'
      arch/arm/mach-omap2/pm.c:117: undefined reference to `clkdm_sleep' arch/arm/mach-omap2/built-in.o: In function `omap2_common_pm_late_init':
      arch/arm/mach-omap2/pm.c:294: undefined reference to `omap_voltage_late_init' arch/arm/mach-omap2/built-in.o: In function `omap2_gpio_dev_init':
      arch/arm/mach-omap2/gpio.c:133: undefined reference to `pwrdm_can_ever_lose_context'
      
      We can avoid this if we make CONFIG_ARCH_OMAP2PLUS a silent option that
      gets enabled any time that one of the SoC versions is enabled.
      
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      59d92875
    • A
      ARM: zynq: use DT_MACHINE_START · 514a5908
      Arnd Bergmann 提交于
      The zynq platform code only supports DT based booting, so we
      should use DT_MACHINE_START rather than MACHINE_START.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Michal Simek <michal.simek@xilinx.com>
      514a5908
    • A
      ARM: omap5: omap5 has SCU and TWD · 896eba3b
      Arnd Bergmann 提交于
      These are selected by omap4 but used in common omap4/5
      SMP code, so building an omap5-only kernel is actually
      broken without this patch.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Tony Lindgren <tony@atomide.com>
      896eba3b
  4. 04 7月, 2013 30 次提交