aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAgeFilesLines
* merge opensource jb u5codeworkx2012-09-2219-133/+8526
| | | | Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
* applied patches from i9305 jb sources, updated mali to r3p0codeworkx2012-09-181-0/+1
| | | | Change-Id: Iec4bc4e2fb59e2cf5b4d25568a644d4e3719565e
* i9300: updated cm defconfigcodeworkx2012-08-031-1/+1
| | | | Change-Id: I5c2522eaca861a607f1fd74650a5994a13cd9067
* samsung opensource update4codeworkx2012-08-031-1/+1
| | | | Change-Id: I9db25f213bb1577c4468873c66b230a0566b6cf2
* gcc 4.6 compatDaniel Hillenbrand2012-07-221-1/+1
|
* updated cm defconfigDaniel Hillenbrand2012-07-211-4/+8
|
* samsung opensource update3Daniel Hillenbrand2012-07-211-4/+8
|
* updated cm defconfigDaniel Hillenbrand2012-07-211-34/+9
|
* samsung opensource update 2Daniel Hillenbrand2012-07-211-46/+21
|
* i9300: cifs and google usb gadgetcodeworkx2012-06-051-20/+38
|
* added cm defconfigcodeworkx2012-06-021-0/+3206
|
* samsung update 1codeworkx2012-06-0211-1354/+3206
|
* ARM: pxa: fix inconsistent CONFIG_USB_PXA27XHaojian Zhuang2011-12-094-4/+4
| | | | | | | | | | | | | | commit c0a39151a4055332897cba615623d3de2f3896df upstream. Since CONFIG_USB_GADGET_PXA27X and other macros are renamed to CONFIG_USB_PXA27X. Update them in arch/arm/mach-pxa and arch/arm/configs to keep consistent. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtc: fix build warnings in defconfigsWanlong Gao2011-06-155-5/+5
| | | | | | | | | | | | | RTC_CLASS is changed to bool, so 'm' is invalid. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-05-277-655/+149
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits) ARM: 6945/1: Add unwinding support for division functions ARM: kill pmd_off() ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks ARM: 6943/1: mm: use TTBR1 instead of reserved context ID ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7 ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area ARM: add sendmmsg syscall ARM: 6863/1: allow hotplug on msm ARM: 6832/1: mmci: support for ST-Ericsson db8500v2 ARM: 6830/1: mach-ux500: force PrimeCell revisions ARM: 6829/1: amba: make hardcoded periphid override hardware ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID ARM: 6827/1: mach-netx: delete hardcoded periphid ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2 ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM at91: drop at572d940hf support at91rm9200: introduce at91rm9200_set_type to specficy cpu package at91: drop boot_params and PLAT_PHYS_OFFSET ...
| * Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into ↵Russell King2011-05-265-590/+147
| |\ | | | | | | | | | devel-stable
| | * at91: drop at572d940hf supportJean-Christophe PLAGNIOL-VILLARD2011-05-251-358/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no-one use it and it's nearly impossible get a board to work on it and the Mainline implementation was never finished Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Patrice Vilchez <patrice.vilchez@atmel.com> Cc: Andrew Victor <linux@maxim.org.za>
| | * at91sam9261: rename at91sam9261ek to at91sam9261 defconfigJean-Christophe PLAGNIOL-VILLARD2011-05-251-11/+74
| | | | | | | | | | | | | | | | | | | | | and update it with ubi, sound, nfs support etc... Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
| | * at91sam9263: merge all boards defconfig into only oneJean-Christophe PLAGNIOL-VILLARD2011-05-253-221/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on at91sam9263ek Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Grégory Hermant <gregory.hermant@calao-systems.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | Merge branch 'for-rmk' of ↵Russell King2011-05-252-65/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c
| | * Merge branch 'dev/removing-s5p6442' into for-nextKukjin Kim2011-05-162-65/+48
| | |\
| | | * ARM: S5P6442: Removing ARCH_S5P6442Kukjin Kim2011-05-121-65/+0
| | | | | | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * | ARM: exynos4_defconfig: Update for adding machinesKukjin Kim2011-05-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds MACH_ARMLEX4210 and MACH_NURI in exynos4_defconfig. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | | | Merge branch 'omap-for-linus' of ↵Linus Torvalds2011-05-261-76/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits) OMAP3: PM: Boot message is not an error, and not helpful, remove it OMAP3: cpuidle: change the power domains modes determination logic OMAP3: cpuidle: code rework for improved readability OMAP3: cpuidle: re-organize the C-states data OMAP3: clean-up mach specific cpuidle data structures OMAP3 cpuidle: remove useless SDP specific timings usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled usb: otg: OMAP4430: Fixing the omap4430_phy_init function usb: musb: am35x: fix compile error when building am35x usb: musb: OMAP4430: Power down the PHY during board init omap: drop board-igep0030.c omap: igep0020: add support for IGEP3 omap: igep0020: minor refactoring omap: igep0020: name refactoring for future merge with IGEP3 omap: Remove support for omap2evm arm: omap2plus: GPIO cleanup omap: musb: introduce default board config omap: move detection of NAND CS to common-board-devices omap: use common initialization for PMIC i2c bus omap: consolidate touch screen initialization among different boards ...
| | | |
| | \ \
| *-. \ \ Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-nextTony Lindgren2011-05-171-76/+7
| |\ \ \ \ | | | |/ / | | |_| / | |/| |
| | * | omap: Run make savedefconfig on omap2plus_defconfig to shrink itTony Lindgren2011-05-031-76/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit ffb63e3 (omap2/3/4: Select all omaps and boards by default) many explicit settings can be dropped from the defconfig. This shrinks it down a bit more and makes it easier to patch later on. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | Merge branch 'devel-stable' into for-linusRussell King2011-05-233-12/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h
| * \ \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2011-05-202-1/+2
| |\ \ \ | | | | | | | | | | | | | | | devel-stable
| | * | | MX1: Add ARMadeus Systems APF9328 board supportGwenhael Goavec-Merou2011-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APF9328 is an i.MXL based SOM (System On Module) that can be plugged on several docking/development boards. Here only basic module support is added (Ethernet, Serial, NOR Flash). Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Eric Jarrige <eric.jarrige@armadeus.org> Signed-off-by: Nicolas Colombain <nicolas.colombain@armadeus.com> Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | | ARM: mxc: don't allow to compile together i.MX51 and i.MX53Uwe Kleine-König2011-05-191-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two SoCs have different PHYS_OFFSETs so it's not (yet) possible to compile a single (working) kernel for these. LAKML-Reference: 1302464943-20721-4-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King2011-05-111-0/+48
| |\ \ \ | | | |/ | | |/|
| * | | ARM: Sync Marvell Dove defconfig with latest kernelKonstantin Porotchkin2011-05-031-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-generate defconfig for Marvell Dove platform Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| * | | ARM: Moving Marvell Dove platform defaults to ARMv7Konstantin Porotchkin2011-05-031-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | Disabled legacy support for ARMv6 architecture on Dove platform. Latest Dove HW uses only ARMv7 model. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' ↵Russell King2011-05-235-162/+4
|\ \ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | and 'spear' into for-linus
| | | | * ARM: 6933/1: SPEAR6xx: Rename spear600_defconfig as spear6xx_defconfigviresh kumar2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Stanley Miao <stanley.miao@windriver.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | | * ARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfigRyan Mallon2011-05-203-105/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need one defconfig for SPEAr3xx now since we can build all three boards into one kernel. Reviewed-by: Stanley Miao <stanley.miao@windriver.com> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: 6888/1: remove ns9xxx portUwe Kleine-König2011-04-281-56/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | The port is actually unmaintained and only received global cleanups and a few build fixes since mid 2008. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'consolidate-clksrc', 'consolidate-flash', ↵Russell King2011-05-236-239/+132
|\ \ \ \ \ | |_|_|/ / |/| | | / | | | |/ | | |/| 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
| | | * ARM: mach-stmp378x: remove machWolfram Sang2011-05-021-128/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mach has not seen any updates since the initial inclusion besides generic cleanup. Furthermore: - The i.MX23 covered in mach-mxs is just a renamed version of the STMP378x. - mach-stmp378x has a lot of reinvented interfaces, leaking all sorts of mach-related includes into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. So drivers cannot be reused. mach-mxs does it better. - There is only one board defined (which I couldn't find any trace of despite being a development board). It has been converted to mach-mxs in a previous patch. Since the only user of this mach was converted, it means that mach-stmp378x can go. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: mach-stmp37xx: remove machWolfram Sang2011-05-021-108/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mach has not seen any updates since the initial inclusion besides generic cleanup. Furthermore: - It has a lot of reinvented interfaces, leaking all sorts of mach-related includes into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. So, drivers cannot be reused. mach-mxs is very similar and does it better. - It can be doubted that this worked at all. Check the DMA routines in stmp37xx.c for copy/paste bugs. A lot of APBX-related stuff is actually writing into registers for APBH. - There is only one board defined (which I couldn't find any trace of despite being a development board). In this board, only two devices have resources, the debug uart and the application uart. Neither of those have the needed custom drivers merged (and never will). debug uart is amba-pl011 which has an in-kernel driver without the mach-specific-stuff. appuart has a driver which was introduced for mach-mxs, and this one is reusable for a properly done mach. So, this single board registers only unsupported devices and the generic code looks suspicious and has poor design. Delete this stuff. If there is interest, it is wiser to restart using mach-mxs. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: configs: add defconfig for mach-mxsWolfram Sang2011-05-021-0/+129
| | |/ | | | | | | | | | | | | | | | | | | | | | Covers MX23, MX28 and STMP378x. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flashMarc Zyngier2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | ARM: 6903/1: Realview: Use physmap driver instead of integrator-flashMarc Zyngier2011-05-202-2/+2
|/ / | | | | | | | | | | | | | | | | Tested on a PB11-MPCore. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | arm: at91: minimal defconfig for at91x40 SoCGreg Ungerer2011-04-231-0/+48
|/ | | | | | | A minimal defconfig for build testing the AT91x40 SoC. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegraLinus Torvalds2011-03-241-3/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://android.git.kernel.org/kernel/tegra: ARM: tegra: harmony: initialize the TPS65862 PMIC ARM: tegra: update defconfig ARM: tegra: harmony: update PCI-e initialization sequence ARM: tegra: trimslice: enable MMC/SD slots ARM: tegra: enable new drivers in defconfig ARM: tegra: Add Toshiba AC100 support ARM: tegra: harmony: Set WM8903 gpio_base ARM: tegra: harmony: I2C-related portions of audio support ARM: tegra: harmony: register i2c devices ARM: tegra: seaboard: register i2c devices ARM: tegra: harmony: Beginnings of audio support ARM: tegra: create defines for SD-related GPIO names ARM: tegra: add devices.c entries for audio
| * ARM: tegra: update defconfigMike Rapoport2011-03-151-2/+10
| | | | | | | | | | | | | | | | | | * Enable TPS6586x PMIC driver * Enable RealTek 8169 used on TrimSlice * Allow booting with root on NFS Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: tegra: enable new drivers in defconfigOlof Johansson2011-03-071-1/+16
| | | | | | | | | | | | | | | | | | | | Enable new platforms and tegra drivers in tegra_defconfig. Also enable some of the common devices several platforms, and GUID partition tables to make it possible to boot a tegra_defconfig kernel with a ChromiumOS filesystem. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Stephen Warren <swarren@nvidia.com>
* | Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linuxPaul Mundt2011-03-221-0/+11
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/board-overo.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | OMAP2/3/4: DSS2: Enable Display SubSystem as modulesSamreen2011-03-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling all the display interface options to be built as module And enabling all the display panels to be built as modules. Signed-off-by: Samreen <samreen@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
* | | Merge branch 'omap-for-linus' of ↵Linus Torvalds2011-03-171-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits) omap: zoom: host should not pull up wl1271's irq line arm: plat-omap: iommu: fix request_mem_region() error path OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430 omap4: mux: Remove duplicate mux modes omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected omap4: board-omap4panda: Initialise the serial pads omap3: board-3430sdp: Initialise the serial pads omap4: board-4430sdp: Initialise the serial pads omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init omap2+: mux: Remove the use of IDLE flag omap2+: Add separate list for dynamic pads to mux perf: add OMAP support for the new power events OMAP4: Add IVA OPP enteries. OMAP4: Update Voltage Rail Values for MPU, IVA and CORE OMAP4: Enable 800 MHz and 1 GHz MPU-OPP OMAP3+: OPP: Replace voltage values with Macros OMAP3: wdtimer: Fix CORE idle transition Watchdog: omap_wdt: add fine grain runtime-pm ... Fix up various conflicts in - arch/arm/mach-omap2/board-omap3evm.c - arch/arm/mach-omap2/clock3xxx_data.c - arch/arm/mach-omap2/usb-musb.c - arch/arm/plat-omap/include/plat/usb.h - drivers/usb/musb/musb_core.h
generated by cgit v1.1 at 2024-09-21 22:28:40 +0000