1. 16 11月, 2012 1 次提交
    • S
      ARM: imx6q: let users input debug uart port number · 49c9e60e
      Shawn Guo 提交于
      imx6q gets 5 uart ports in total.  Different board design may choose
      different port as debug uart.  For example, imx6q-sabresd uses UART1,
      imx6q-sabrelite uses UART2 and imx6q-arm2 uses UART4.  Rather than
      bloating DEBUG_LL choice list with all these uart ports, the patch
      introduces DEBUG_IMX6Q_UART_PORT for users to input uart port number
      when DEBUG_IMX6Q_UART is selected inside DEBUG_LL choice.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      49c9e60e
  2. 23 10月, 2012 1 次提交
    • S
      ARM: imx: select HAVE_IMX_SRC when SMP is enabled · 68b25325
      Shawn Guo 提交于
      With being part of multi-platform support, SMP can be enabled by other
      platform even when SOC_IMX6Q is deselected.  It leads to a situation
      that arch/arm/mach-imx/platsmp.c is built without HAVE_IMX_SRC selection
      which will cause build error.  For example, the following link errors
      will be seen when building imx5 with other v7 platforms.
      
       arch/arm/mach-imx/built-in.o: In function `imx_cpu_die':
       platform-ahci-imx.c:(.text+0x219c): undefined reference to `imx_enable_cpu'
       arch/arm/mach-imx/built-in.o: In function `imx_boot_secondary':
       platform-ahci-imx.c:(.cpuinit.text+0x14): undefined reference to `imx_set_cpu_jump'
       platform-ahci-imx.c:(.cpuinit.text+0x20): undefined reference to `imx_enable_cpu'
      
      Select HAVE_IMX_SRC as long as SMP is enabled to fix the problem.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      68b25325
  3. 19 10月, 2012 1 次提交
    • F
      ARM: mach-imx: Fix selection of ARCH_MXC · 4cc3c840
      Fabio Estevam 提交于
      Since commit c5a0d497(ARM: imx: enable multi-platform build),
      ARCH_MXC is selected by the following logic:
      
      config ARCH_MXC
              def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
      
      , which causes build error on vexpress_defconfig:
      
      arch/arm/mach-imx/hotplug.c:49: undefined reference to `imx_enable_cpu'
      arch/arm/mach-imx/platsmp.c:57: undefined reference to `imx_set_cpu_jump'
      arch/arm/mach-imx/platsmp.c:58: undefined reference to `imx_enable_cpu'
      
      Make ARCH_MXC a user selectable option, so that it does not get built
      by default on other defconfigs that select ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7.
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      4cc3c840
  4. 15 10月, 2012 25 次提交
  5. 14 10月, 2012 1 次提交
    • R
      ARM: config: sort select statements alphanumerically · b1b3f49c
      Russell King 提交于
      As suggested by Andrew Morton:
      
        This is a pet peeve of mine.  Any time there's a long list of items
        (header file inclusions, kconfig entries, array initalisers, etc) and
        someone wants to add a new item, they *always* go and stick it at the
        end of the list.
      
        Guys, don't do this.  Either put the new item into a randomly-chosen
        position or, probably better, alphanumerically sort the list.
      
      lets sort all our select statements alphanumerically.  This commit was
      created by the following perl:
      
      while (<>) {
      	while (/\\\s*$/) {
      		$_ .= <>;
      	}
      	undef %selects if /^\s*config\s+/;
      	if (/^\s+select\s+(\w+).*/) {
      		if (defined($selects{$1})) {
      			if ($selects{$1} eq $_) {
      				print STDERR "Warning: removing duplicated $1 entry\n";
      			} else {
      				print STDERR "Error: $1 differently selected\n".
      					"\tOld: $selects{$1}\n".
      					"\tNew: $_\n";
      				exit 1;
      			}
      		}
      		$selects{$1} = $_;
      		next;
      	}
      	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
      			  /^endif/ or /^endchoice/)) {
      		foreach $k (sort (keys %selects)) {
      			print "$selects{$k}";
      		}
      		undef %selects;
      	}
      	print;
      }
      if (%selects) {
      	foreach $k (sort (keys %selects)) {
      		print "$selects{$k}";
      	}
      }
      
      It found two duplicates:
      
      Warning: removing duplicated S5P_SETUP_MIPIPHY entry
      Warning: removing duplicated HARDIRQS_SW_RESEND entry
      
      and they are identical duplicates, hence the shrinkage in the diffstat
      of two lines.
      
      We have four testers reporting success of this change (Tony, Stephen,
      Linus and Sekhar.)
      Acked-by: NJason Cooper <jason@lakedaemon.net>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Acked-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Acked-by: NSekhar Nori <nsekhar@ti.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      b1b3f49c
  6. 28 9月, 2012 1 次提交
  7. 19 9月, 2012 2 次提交
  8. 18 9月, 2012 2 次提交
  9. 17 9月, 2012 2 次提交
  10. 14 9月, 2012 3 次提交
    • R
      ARM: move all dtb targets out of Makefile.boot · 360a0cab
      Rob Herring 提交于
      In preparation to support multi-platform kernels, move all the dtb targets
      out of the mach Makefile.boot and into the arch/arm/boot/dts/Makefile
      which is closer to the sources.
      
      DTBs are only built when CONFIG_OF is enabled and now use top level
      CONFIG_ARCH_xxx instead of chip or board specific config options.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Andrew Lunn <andrew@lunn.ch>
      Cc: Gregory Clement <gregory.clement@free-electrons.com>
      Acked-by: NShawn Guo <shawn.guo@linaro.org>
      Cc: Viresh Kumar <viresh.linux@gmail.com>
      Cc: Shiraz Hashim <shiraz.hashim@st.com>
      Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      360a0cab
    • A
      ARM: imx: move platform_data definitions · 82906b13
      Arnd Bergmann 提交于
      Platform data for device drivers should be defined in
      include/linux/platform_data/*.h, not in the architecture
      and platform specific directories.
      
      This moves such data out of the imx include directories
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Acked-by: NNicolas Pitre <nico@linaro.org>
      Acked-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      Acked-by: NSascha Hauer <kernel@pengutronix.de>
      Acked-by: NVinod Koul <vinod.koul@linux.intel.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Dan Williams <djbw@fb.com>
      Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
      Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
      Cc: Chris Ball <cjb@laptop.org>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Alan Cox <alan@linux.intel.com>
      Cc: Felipe Balbi <balbi@ti.com>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Cc: Liam Girdwood <lrg@ti.com>
      Cc: Javier Martin <javier.martin@vista-silicon.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
      82906b13
    • M
      ARM: SoC: convert imx6q to SMP operations · e4f2d979
      Marc Zyngier 提交于
      Convert the imx6q platform to use struct smp_operations to provide
      its SMP and CPU hotplug operations.
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Acked-by: NNicolas Pitre <nico@linaro.org>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      e4f2d979
  11. 12 9月, 2012 1 次提交