openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
199,488 Commits 18 Branches 27 Tags 3.4 GiB
Commit Graph

577 Commits

Author SHA1 Message Date
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