Commit graph

651 commits

Author SHA1 Message Date
Linus Walleij
100642c7b6 ARM: 6366/1: Update U300 defconfig
This mainly removes a lot of unused subsystems (as for the mainline
drivers) in the U300 defconfig, switch of MMC debugging by default
and enables debugfs on the builds. Once we merge the drivers we'll
configure it on again.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-10-04 20:53:32 +01:00
Kevin Hilman
7ad0e386d4 OMAP2+: defconfig: disable CPUfreq
Disable CPUfreq since

1) is not yet supported in mainline, and
2) the current driver fails to suspend properly

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-09-29 10:39:02 -07:00
Kevin Hilman
ecfdd76d2f OMAP2+: defconfig: modularize bluetooth, audio and WLAN
In working towards a smaller default kernel, only devices used for
early boot should be built in.  Toward that end, build the following
as modules by default:

- bluetooth
- audio: ALSA, ASoC
- WLAN

Uncompressed kernel size comparison:

Before:
   text	   data	    bss	    dec	    hex	filename
6557576	 465088	5616024	12638688	 c0d9e0	vmlinux

After:
   text	   data	    bss	    dec	    hex	filename
5616572	 436448	5610800	11663820	 b1f9cc	vmlinux

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-09-29 10:35:34 -07:00
Uwe Kleine-König
6470310865 ARM: mx51_defconfig: add new boards MACH_MX51_3DS and MACH_EUKREA_CPUIMX51
Further remove FIXED_PHY as it breaks the ethernet.
VGA_CONSOLE isn't selectable anymore since fb78b51cb1.
EXT3_DEFAULTS_TO_ORDERED defaults to y since aa32a79638.
INOTIFY is gone since 2dfc1cae4c.
CONFIG_DETECT_SOFTLOCKUP is gone since e16bb1d7fe.
Enable TMPFS for udev.
KEYS is selected by NFS_USE_KERNEL_DNS

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-09-27 12:53:06 +02:00
Uwe Kleine-König
ea9a9b2ba2 ARM: remove mx31pdk_defconfig
This machine is enabled in mx3_defconfig and so mx31pdk_defconfig isn't
really useful.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-09-27 12:53:06 +02:00
Uwe Kleine-König
801561cdda ARM: mx3_defconfig: add new machine MACH_EUKREA_CPUIMX35
Furthermore INOTIFY is gone since

	2dfc1ca (inotify: remove inotify in kernel interface)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-09-27 12:53:05 +02:00
Uwe Kleine-König
0ac15c884e ARM: mx27_defconfig: enable switches used in mx27 code
- enable all mx27 machines (MACH_CPUIMX27, MACH_IMX27_VISSTRIM_M10,
  MACH_PCA100, MACH_MXT_TD60) including optional features for
  CPUIMX27
- eukrea_mbimx27-baseboard.c uses TOUCHSCREEN_ADS7846
- mach-cpuimx27.c uses SERIAL_8250
- several machines make use of SPI_IMX (selects SPI_BITBANG)
- drop VGA_CONSOLE as this isn't selectable anymore since fb78b51cb1
- several machines make use of USB_ULPI (depends on USB, but don't
  enable USB_DEVICE_CLASS as it's deprecated)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-09-27 12:53:04 +02:00
Victor Rodriguez
6c18c91b3a davinci: Initial support for Omapl138-Hawkboard
This patch adds initial support for the Hawkboard-L138 system
It is under the machine name "omapl138_hawkboard".
This system is based on the da850 davinci CPU architecture.
Information on these system may be found at http://www.hawkboard.org.
Basic support for the UART console is included in this patch.
It's tested with latest Angstrom File Systems like ramdisk
from http://alturl.com/imb45.

Signed-off-by: Victor Rodriguez <victor.rodriguez@sasken.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
2010-09-24 07:40:32 -07:00
Michael Williamson
f2dbb6d91b davinci: Initial support for MityDSP-L138/MityARM-1808
This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system
on Module (SOM) under the machine name "mityomapl138".  These SOMs are based
on the da850 davinci CPU architecture.  Information on these SOMs may be
found at http://www.mitydsp.com.

Basic support for the console UART, NAND, and EMAC (MII interface) is
included in this patch.

Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
2010-09-24 07:40:28 -07:00
Michael Williamson
9c6fbbee8d davinci: Add CONFIG_REGULATOR_DUMMY to DA8XX defconfig file.
In order to support reference DA8XX machines not providing a
voltage regulator control for the core voltage, the REGULATOR_DUMMY
option is required.

Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
2010-09-24 07:40:28 -07:00
Tony Lindgren
d31f59f31d omap: Update omap3_defconfig for omap2
We need to enable ARM_ERRATA_411920 for omap2 and
remove the omap2 specific defconfigs.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-09-20 14:58:46 -07:00
Santosh Shilimkar
455d4d2dc7 omap: Update and rename common defconfig for omap2plus devices
This patch addresses below things

- Renaming existing omap3_defconfig which has OMAP2, OMAP3 and OMAP4 builds
  enabled to more appropriate name 'omap2plus_defconfig'
- L1 cache shift is suppose to be 5 on OMAP4 where as it is 6 on previous
  OMAPs. Keeping it to 5 is safer option for OMAP4 and previous OMAPs. For
  OMAP3 only build the shift would be still 6
- Enable needed Errata's for OMAP4 to work with DMA based device drivers
	CONFIG_PL310_ERRATA_588369=y
	CONFIG_ARM_ERRATA_720789=y
- Enable the Micrel ethernet controller
	CONFIG_KS8851=y
	CONFIG_KS8851_MLL=y

With above three changes, OMAP4 ethernet, mmc etc works reliably.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-09-20 14:58:09 -07:00
Tony Lindgren
61e9beafdd omap: Update omap3_defconfig to work with SMP_ON_UP
With the recent changes to core ARM kernel code, we can now
boot SMP kernel on UP systems. Update omap3_defconfig to
enable SMP. This allows us to remove omap_4430sdp_defconfig.

In addition to enabling SMP, we also need to disable some
options to make the system boot:

- For some reason LOCK_STAT causes tons of
  WARNING: at mm/percpu-vm.c:320 pcpu_alloc+0x2fc/0x888()
  so disable it for now.

- MUSB init fails for multi-omap, disable it for now.

- LOCAL_TIMERS hangs on omap4, disable it for now.

Also disable DEBUG_LL as this should be only enabled for
debugging.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-09-20 14:53:38 -07:00
Eric Cooper
709406494c [ARM] Kirkwood: support for Seagate DockStar
This patch adds support for the Seagate FreeAgent DockStar,
a Marvell SheevaPlug variant.

Signed-off-by: Eric Cooper <ecc@cmu.edu>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2010-09-19 22:43:44 -04:00
Tony Lindgren
c66dd2660d omap: Fix omap_4430sdp_defconfig for make oldconfig
Commit ffb63e3402 changed
Kconfig to select support for omap2, 3 and 4 by default.

However, CONFIG_SMP won't currently work properly on
uniprocessor ARMs, or if support for earlier ARM cores
is selected in.

Fix this by updating omap_4430sdp_defconfig to not
select omap2 or 3 at this point.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2010-08-16 09:22:04 +03:00
Russell King
0b019a4155 Merge branches 'master' and 'devel' into for-linus
Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
2010-08-10 23:17:52 +01:00
Russell King
2192482ee5 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
	arch/arm/Kconfig
2010-08-09 14:07:19 +01:00
Kukjin Kim
6901bbc802 ARM: s5pv210_defconfig: Update for removing s5pc110_defconfig
Now that S5PC110 machines and S5PV210 machines can be built into
one kernel, update mach-s5pv210/Kconfig and s5pv210_defconfig.

Tested on Aquila(S5PC110), GONI(S5PC110), SMDKC110(S5PC110)
and SMDKV210(S5PV210).

Created and tested against linux-2.6.35-rc5.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
2010-08-05 18:31:01 +09:00
Vincent Sanders
80690ccc41 Remove ARM default configurations which duplicate omap3_defconfig
These configurations are no longer useful as the systems they support
are covered by the generic omap3_defconfig

Signed-off-by:Vincent Sanders <vince@simtec.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-08-04 15:47:29 +03:00
Russell King
7b70c4275f Merge branch 'devel-stable' into devel
Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/setup.c
	arch/arm/mm/init.c
2010-07-31 14:20:16 +01:00
Nicolas Pitre
5ccd4302a2 [ARM] Kirkwood: add missing machine targets to defconfig
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2010-07-16 22:51:10 -04:00
Russell King
e910b63d00 Merge branch 'l7200' into devel
Conflicts:
	arch/arm/configs/lusl7200_defconfig
2010-07-16 11:08:33 +01:00
Russell King
c9c6fe5033 ARM: Remove support for LinkUp Systems L7200 SDP.
This hasn't been actively maintained for a long time, only receiving
the occasional build update when things break.  I doubt anyone has
one of these on their desks anymore.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-06-24 15:41:31 +01:00
Uwe Kleine-König
07a8c03f3e ARM: reduce defconfigs
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-10 07:12:18 +02:00
Ben Dooks
2992bc0668 ARM: s3c2410_defconfig: Add new machines
Add the SMDK2416, and the GTA02 to the list of machines
that are included in the s3c2410_defconfig.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:05 +09:00
Ben Dooks
856066c307 ARM: s3c6400_defconfig: Add framebuffer and basic LCD
Add the framebuffer driver and some basic LCD configurations
that should be suitable for the SMDK boards.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:04 +09:00
Ben Dooks
ad2cf090e2 ARM: s3c6400_defconfig: Add RTC driver support
Now that the RTC driver supports the S3C64XX, enable
it in the build.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:03 +09:00
Ben Dooks
8a776fb924 ARM: s3c6400_defconfig: Enable USB host side
Enable the USB Host side by adding the USB OHCI and
some basic USB driver modules.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:02 +09:00
Ben Dooks
56a5cbaf2a ARM: s3c6400_defconfig: Add SPI driver
The SPI driver was added last kernel round, so enable
the core SPI and add the 64XX and bitbang driver as
modules.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:01 +09:00
Ben Dooks
e56210caeb ARM: s3c6400_defconfig: Update compiled machines
Add the machines that have been added in the last round
to the list of builds.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-28 19:33:00 +09:00
Ben Dooks
f7b4dc7a14 ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-git
Update the s5pv210_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:39 +09:00
Ben Dooks
fffb79f205 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-git
Update the s5pc110_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:37 +09:00
Ben Dooks
9a4925ee15 ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-git
Update the s5pc100_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:36 +09:00
Ben Dooks
dfd820314b ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git
Update the s5p6442_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:34 +09:00
Ben Dooks
d51843ef19 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git
Update the s5p6440_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:32 +09:00
Ben Dooks
4678ffa502 ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-git
Update the s3c6400_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:31 +09:00
Ben Dooks
4969e243c4 ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-git
Update the s3c2410_defconfig to the latest kernel version v2.6.34-git

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:04:29 +09:00
Linus Torvalds
ec96e2fe95 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
  ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
  ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
  ARM: 6140/1: silence a bogus sparse warning in unwind.c
  ARM: mach-at91: duplicated include
  ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
  ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
  ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
  ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
  ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
  ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
  ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
  ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
  ARM: SPEAR6xx: remove duplicated #include
  ARM: s3c6400_defconfig: Add NAND driver
  ARM: s3c6400_defconfig: enable sound as modules
  ARM: s3c6400_defconfig: enable power management
  ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
  ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
  ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
  ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
  ...
2010-05-25 12:06:33 -07:00
Russell King
d472d1a1c8 Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
	arch/arm/Kconfig
2010-05-24 23:08:36 +01:00
Ben Dooks
d01cd639c9 ARM: s3c6400_defconfig: Add NAND driver
Add the NAND driver to the list of inbuilt devices.

Signed-of-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:13 +01:00
Ben Dooks
443aa17ed8 ARM: s3c6400_defconfig: enable sound as modules
Add the ASoC/ALSA configuration for s3c6400_defconfig as modules

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:12 +01:00
Ben Dooks
13aa16b9cc ARM: s3c6400_defconfig: enable power management
Enable power management in the default build

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:11 +01:00
Ben Dooks
2621a181fd ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
Update the s5pv210_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:10 +01:00
Ben Dooks
63e3de2f9b ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
Update the s5pc110_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:09 +01:00
Ben Dooks
ba7f4daeea ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
Update the s5p6442_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:08 +01:00
Ben Dooks
5435009287 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
Update the s5p6440_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:08 +01:00
Ben Dooks
77f0cfc6e1 ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34
Update the s3c6400_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:07 +01:00
Ben Dooks
59d29f3b51 ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34
Update the s3c2410_defconfig to the latest kernel version v2.6.34

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:06 +01:00
Ben Dooks
de0c141fee ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100
Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes
ARCH_S5PC100 which is sufficient to get the system building.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23 16:27:05 +01:00
Linus Torvalds
1f7f314bf2 Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits)
  OMAP: DSS2: Fix omap_dss_probe() error path
  OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
  board-omap3-beagle: add DSS2 support
  OMAP2: DSS: Add missing line for update bg color
  OMAP3630: DSS2: Updating MAX divider value
  OMAP: RX51: Update board defconfig
  OMAP: DSS2: Add ACX565AKM Panel Driver
  OMAP: RX51: Add Touch Controller in SPI board info
  OMAP: RX51: Add LCD Panel support
  OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency
  OMAP: LCD LS037V7DW01: Add Backlight driver support
  OMAP: DSS2: Taal: Fix DSI bus locking problem
  OMAP: DSS2: Taal: add mutex to protect panel data
  OMAP: DSS2: Make partial update width even
  OMAP: DSS2: Fix device disable when driver is not loaded
  OMAP: DSS2: VENC: don't call platform_enable/disable() twice
  OMAP: DSS2: check lock_fb_info() return value
  OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order
  OMAP: DSS2: Use vdds_sdi regulator supply in SDI
  OMAP: DSS2: Remove redundant enable/disable calls from SDI
  ...
2010-05-21 15:20:57 -07:00
Russell King
9bfe99a8f9 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable 2010-05-20 23:43:18 +01:00
Tony Lindgren
f6304f5804 Merge branch 'omap4-i2c-init' into omap-for-linus 2010-05-20 11:37:23 -07:00
Tony Lindgren
c8f626fe1c omap3: Add stalker board to omap3_defconfig
Add stalker board to omap3_defconfig

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:22 -07:00
Anand Gadiyar
1f6e57ba77 omap3: update omap3_defconfig
- Update the omap3_defconfig to sync up with the generated .config
- Increase CONFIG_LOG_BUF_SHIFT to 16 to allow the entire
  boot log to be captured
  (useful when using boot time tracer, for example)

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:22 -07:00
Jason Lam
b20f010317 omap3: Add OMAP3 Stalker board LK-S defconfig
Add OMAP3 Stalker board LK-S defconfig.

Signed-off-by: Jason Lam <lzg@ema-tech.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:22 -07:00
kishore kadiyala
ebe6d428ed omap4: Enable HSMMC support
Enables HSMMC support for OMAP4430 defconfig

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:22 -07:00
Balaji T K
f9ea6cfb5a omap4: Enable RTC and regulator support
This patch enables RTC and regulator support on omap4430 sdp
platform. Also sync up the defconfig with latest kernel

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:21 -07:00
Santosh Shilimkar
baeb73e802 omap4: Add i2c board support on omap4430 sdp platform
This patch adds the i2c board support for OMAP4430 SDP platform.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:21:21 -07:00
Abraham Arce
2e5f51a539 OMAP4: Networking: Defconfig Support
Enable KS8851 SPI support +

 Networking Support
  - Packet Socket
  - TCP/IP

 Network Filesystems
  - NFS Client
  - Root Filesystem on NFS

Signed-off-by: Abraham Arce <x0066660@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:17:51 -07:00
Tony Lindgren
df760137ad Merge branch 'omap-boards' into omap-for-linus 2010-05-20 11:07:23 -07:00
Janusz Krzysztofik
754b8e6534 OMAP1: Amstrad Delta: modify defconfig for external keyboardsupport
The patch adds a CONFIG directive required for supporting the Amstrad Delta
connected external keyboard by default.

Created and tested against linux-omap master,
commit 104a77440f05430f29f9d3f4ecb88c1536819585 dated 2010-04-27.

Works on top of PATCH v4 4/5(7), "input: serio: add support for Amstrad Delta
serial keyboard port".

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 11:02:43 -07:00
Sriram
38e473a84e AM3517: defconfig update to enable EMAC support
Update the default configuration for AM3517EVM to enable
support for EMAC peripheral.

Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 10:53:55 -07:00
Sriram
e72b9b8072 can: ti_hecc: Enable CAN support on AM3517
Modify the default kernel configuration on AM3517 to enable CAN.

Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 10:53:46 -07:00
Thomas Weber
a29b8204d2 omap: Devkit8000: Update default configuration
This patch updates the new default configuration for the Devkit8000.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 10:48:57 -07:00
Janusz Krzysztofik
d22ae836d6 omap1: amsdelta: defconfig updates
The patch provides the following ams_delta_defconfig updates:
- explicitly select preemptable RCU,
- replace outdated CONFIG_LBD and CONFIG_LSF options with CONFIG_LBDAF,
- activate support for LCD contrast setting (new in 2.6.34),
- turn off verbose bug reporting for smaller kernel.

Created and tested against linux-2.6.34-rc3.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20 10:48:57 -07:00
Roger Quadros
2c59ff5501 OMAP: RX51: Update board defconfig
Add LCD, Boot-up logo, framebuffer console, Keypad
and Power button support

Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
2010-05-18 15:06:05 +03:00
Vaibhav Hiremath
14ec4740ff OMAP: AM3517: Enable DSS2 in AM3517EVM defconfig
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tomi.valkeinen@nokia.com: removed the board file changes]
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
2010-05-18 14:14:28 +03:00
Vaibhav Hiremath
91e8512e75 OMAP: Enable DSS2 in OMAP3EVM defconfig
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tomi.valkeinen@nokia.com: removed the board file changes]
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
2010-05-18 14:14:28 +03:00
Russell King
ac1d426e82 Merge branch 'devel-stable' into devel
Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
2010-05-17 17:24:04 +01:00
Russell King
c39e52a793 Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel
Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig
2010-05-17 11:53:39 +01:00
Russell King
74b8721099 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-05-13 09:56:24 +01:00
Haojian Zhuang
d24123bfae [ARM] mmp: update mmp2 defconfig
Enable MAX8649 & MAX8925 regulator, dynamic debug, Marvell Jasper platform.
Disable DNOTIFY, MAX8660 regulator, 88pm860x PMIC.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-05-11 17:25:05 +02:00
Haojian Zhuang
66b1964750 [ARM] mmp: enable L2 in mmp2
Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-05-11 17:25:04 +02:00
Russell King
257dab8141 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 2010-05-06 08:16:34 +01:00
Stefan Schmidt
12145cae4d [ARM] pxa/imote2: Fix iMote2 defconfig
- Bring in a CMDLINE that actually works and prints to the right tty
- Compile-in JFFS2 to boot into rootfs
- Remove unneeded options for Bluetooth and radio
- Disable CPU_FREQ as it makes the flash driver fail

Thanks Jonathan for spotting what I messed up.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-05-06 11:12:11 +08:00
Tony Lindgren
aea561359a omap2/3/4: Disable CONFIG_FB_OMAP in omap3_defconfig
Looks like CONFIG_FB_OMAP prevents somehow mounting root on MMC
at least on zoom3 for multi-omap. Disable CONFIG_FB until the
omap FB code is fixed.

This allows booting omap3_defconfig on various omaps. Tested on
2420-n8x0, 3430-n900, 3630-zoom3 and 4430-blaze. Note that n8x0
still has issues with starting user space because of TLS and
VFP.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-05 11:11:09 -07:00
Tony Lindgren
df5d9411f9 omap2/3/4: Disable CONFIG_PM_VERBOSE in omap3_defconfig
It's too noisy.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-04 13:19:16 -07:00
Tony Lindgren
0c463d09f4 omap2/3/4: Update PMIC options for TWL and Menelaus chips
These are needed for mounting root on MMC on many boards.
Also disable CONFIG_WATCHDOG_NOWAYOUT, that can keep the
system from running with external watchdogs.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-04 13:19:16 -07:00
Tony Lindgren
75eaf1eaa8 omap2/3/4: Make omap3_defconfig usable on Nokia boards
The bootloader on Nokia boards does not support updating
the kernel cmdline. For the other boards, the bootloader
provided cmdline will be used instead.

To mount root on n8x0, compile in also the MMC_OMAP.
It seems that the best way to mount root with the
new kernels on Nokia boards is to mount root on mmcblk0p2.

Note that n8x0 current has several issues booting with
omap3_defconfig: The bootloader has a 2MB limit for loading
kernels, so you may want to use kexec. Also ARMv6 does
not currently work with ARMv7 for VFP and TLS.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-04 13:19:16 -07:00
Tony Lindgren
7327d6374c omap2/3/4: Add new boards to omap3_defconfig
Enable 2430 omaps and the missing boards.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-04 13:19:16 -07:00
Dinh Nguyen
28a2afe0df mx5: Add USB to Freescale MX51 defconfig
Update mx51_defconfig to include USB EHCI by default.

This patch applies to 2.6.34-rc6.

Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-05-03 15:18:13 +02:00
Anton Vorontsov
478ea14466 ARM: cns3xxx: Add defconfig for CNS3420 validation board
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
2010-05-02 22:01:02 +04:00
Linus Torvalds
6bec11921a Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
  ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
  ARM: 6030/1: KS8695: enable console
  ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
  ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
  ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
  ARM: fix build error in arch/arm/kernel/process.c
2010-04-29 17:17:35 -07:00
Francisco Alecrim
57ed0e7b72 n8x0_defconfig: remove CONFIG_NILFS2_FS override
arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to
symbol NILFS2_FS

Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-04-23 15:37:24 -07:00
Jarkko Nikula
cc352a3432 omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options
Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and
it seems also that the Maemo release works without when testing with the
Maemo 2.6.28 kernel.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-04-23 15:37:24 -07:00
Jarkko Nikula
c8fa4d2738 omap: rx51_defconfig: Remove duplicate phonet
Phonet is enabled by the commit bce54fed94
and this duplicate gives a warning when doing make rx51_defconfig.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-04-23 15:35:11 -07:00
Leo Chen
313af42b5b ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
update bcmring_defconfig to the latest kernel version, this will fix the
KAutobuild error.

Signed-off-by: Leo Hao Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-04-22 12:30:12 +01:00
viresh kumar
b77932a4d2 ARM: 6019/1: ST SPEAr: Added default configuration files for SPEAr machines
Reviewed-by: Linus Walleij <linux.walleij@stericsson.com>

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-04-14 11:34:37 +01:00
Christian Glindkamp
67be0b8dba ARM: 6055/1: AT91: add defconfig for taskit PortuxG20 and Stamp9G20
Support for both boards can easily be built into one kernel image, so
there is no need to add one defconfig for each of them.

Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-04-14 11:24:54 +01:00
Tony Lindgren
b3c7740a12 Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus 2010-03-22 14:06:38 -07:00
Linus Torvalds
9b59a0a4ee Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  ARM/OMAP: Remove the +x bit from a couple of source files
  omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values
  OMAP4: fix temporary hacks that break multi-omap PM
  OMAP2: cpu_is_omap2*: fix compile-time removal of unused code
  omap3: pandora: add missing i2c3 board_info
  omap: mach-omap2/io.c: fix function declarations
  omap: Fix gpio_resume_after_retention
  omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board
  omap: Checkpatch cleanup for blizzard.h
  omap: pass the reboot command to the boot loader
  omap2/3/4: mailbox: remove compiler warning
  OMAP2: serial.c: Fix number of uarts in early_init
  omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors
  omap2: Update n8x0 defconfig to test multi-omap and DMA api changes
  omap2: add USB initialization for tusb6010
  omap4: Fix build break by moving omap_smc1 into a separate .S
  omap2/3/4: ehci: avoid compiler error with touchbook
  omap3: Fix compile for Touch Book early_param
2010-03-18 16:59:30 -07:00
Sergio Aguirre
e6e8ea63f5 omap3: zoom2/3: Register only 1 8250 port
There's no more serial ports available, so, doesn't make sense
to create 4 device nodes.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
2010-03-15 16:34:22 -05:00
Linus Torvalds
dca1d9f6d7 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
  ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
  ARM: S3C2443: Remove #if 0 for clk_mpll
  ARM: S3C2443: Update notes on MPLLREF clock
  ARM: S3C2443: Further clksrc-clk conversions
  ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
  USB: Fix s3c-hsotg build following Samsung platform header moves
  ARM: S3C64XX: Reintroduce unconditional build of audio device
  ARM: 5961/1: ux500: fix CLKRST addresses
  ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
  ASoC: Fix S3C64xx IIS driver for Samsung header reorg
  ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
  [ARM] pxa: fix typo in mxm8x10.h
  [ARM] pxa/raumfeld: set GPIO drive bits for LED pins
  [ARM] pxa/zeus: Add support for mcp2515 CAN bus
  [ARM] pxa/zeus: Add support for onboard max6369 watchdog
  [ARM] pxa/zeus: Add Eurotech as the manufacturer
  [ARM] pxa/zeus: Correct the USB host initialisation flags
  [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
  [ARM] pxa: refactor uncompress.h for non-PXA uarts
  [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
  ...
2010-03-12 16:00:54 -08:00
Wang Qiang
8661970875 NUC900 LCD Controller Driver
An LCD controller driver for nuc900s.  The Linux LOGO is just fine and the
FB-Test application was ok, too.

Signed-off-by: Wang Qiang <rurality.linux@gmail.com>
Cc: Wang Zongshun <mcuos.com@gmail.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-12 15:52:34 -08:00
Tony Lindgren
9e542f37ce omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors
While waiting for the related USB patch, fix compile by enabling
it in the defconfigs. As discussed at:

http://thread.gmane.org/gmane.linux.usb.general/27432/focus=4460

Otherwise we'll get errors like:

drivers/usb/core/hcd.c:1892: error: 'pm_wq' undeclared (first use in this function)
drivers/usb/core/hcd.c:1892: error: (Each undeclared identifier is reported only once
drivers/usb/core/hcd.c:1892: error: for each function it appears in.)

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-03-11 12:35:07 -08:00
Tony Lindgren
79cf5bff25 omap2: Update n8x0 defconfig to test multi-omap and DMA api changes
Recent DMA API changes broke compile for tusb6010. While
testing the fixes for tusb6010, I had to update the n8x0
defconfig quite a bit. Might as well merge it while at it
to make it more usable as we're using this to test the
multi-omap booting between V6 and V7 ARMs.

Also, anybody using n8x0 with a current kernel will most
likely want to mount root on the MMC instead of the onenand
to keep the Maemo install intact.

Enable I2C, REGULATOR, MMC, MFD, PM, and USB. Also change the root
to /dev/mmcblk0p2 instead of the onenand.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-03-11 10:22:39 -08:00
Russell King
988addf82e Merge branch 'origin' into devel-stable
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
Linus Torvalds
7f5b09c15a Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (220 commits)
  USB: backlight, appledisplay: fix incomplete registration failure handling
  USB: pl2303: remove unnecessary reset of usb_device in urbs
  USB: ftdi_sio: remove obsolete check in unthrottle
  USB: ftdi_sio: remove unused tx_bytes counter
  USB: qcaux: driver for auxiliary serial ports on Qualcomm devices
  USB: pl2303: initial TIOCGSERIAL support
  USB: option: add Longcheer/Longsung vendor ID
  USB: fix I2C API usage in ohci-pnx4008.
  USB: usbmon: mask seconds properly in text API
  USB: sisusbvga: no unnecessary GFP_ATOMIC
  USB: storage: onetouch: unnecessary GFP_ATOMIC
  USB: serial: ftdi: add CONTEC vendor and product id
  USB: remove references to port->port.count from the serial drivers
  USB: tty: Prune uses of tty_request_room in the USB layer
  USB: tty: Add a function to insert a string of characters with the same flag
  USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration()
  USB: tty: kill request_room for USB ACM class
  USB: tty: sort out the request_room handling for whiteheat
  USB: storage: fix misplaced parenthesis
  USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers
  ...
2010-03-03 08:48:58 -08:00
Russell King
882d01f96b Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
2010-03-02 23:40:15 +00:00
Russell King
64ed28a87a Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
	arch/arm/Kconfig
2010-03-02 23:31:07 +00:00