aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'bcm2835-for-3.10-multiplatform' of ↵Arnd Bergmann2013-04-0911-124/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/multiplatform From Stephen Warren <swarren@wwwdotorg.org>: ARM: bcm2835: convert to multi-platform This branch (patch) converts BCM2835 to support being built into a multi-platform single zImage. This mostly entails a few small Kconfig tweaks, move the earlyprintk implementation to the standard multi- platform location, and deleting some unnecessary files. * tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: convert to multi-platform Conflicts: arch/arm/Kconfig arch/arm/Kconfig.debug Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: bcm2835: convert to multi-platformStephen Warren2013-03-1211-124/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows BCM2835 be included in a kernel build that supports multiple SoCs at once, which is useful for distro kernels. This change: * Moves bcm2835's debug-macro.S into ARM's include/debug/, and hooks it into the relevant menu. * Moves bcm2835's Kconfig into its own directory, as seems typical for multi-platform conversions. * Removes bcm2835_soc.h, and moves the content to the files where it was used; just one usage per define. * Deletes some headers and Makefile.boot that aren't needed now that we support multi-platform. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
* | arm: vt8500: Add wm8850 config options to multi_v7_defconfigTony Prisk2013-04-021-0/+8
| | | | | | | | | | | | | | | | | | This patch finally adds the WM8850 SoC to the multi_v7_defconfig. We don't have a seperate defconfig for this SoC as it is only available as a multiplatform option. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> Signed-off-by: Olof Johansson <olof@lixom.net>
* | Merge branch 'prima2/multiplatform' into next/multiplatformArnd Bergmann2013-03-2840-511/+1047
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This series enables multiplatform support on the SIRF prima2/marco/atlas6 platform. The code was already quite tidy, so this is a relatively simple change, and it follows similar changes we made to other ARMv7 based platforms recently. * prima2/multiplatform: ARM: sirf: enable support in multi_v7_defconfig ARM: sirf: enable multiplatform support ARM: sirf: use clocksource_of infrastructure ARM: sirf: move debug-macro.S to include/debug/sirf.S ARM: sirf: enable sparse IRQ ARM: sirf: move irq driver to drivers/irqchip ARM: sirf: fix prima2 interrupt lookup pinctrl: sirf: convert to linear irq domain clocksource: make CLOCKSOURCE_OF_DECLARE type safe ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board arm: prima2: add new SiRFatlas6 machine in common board ARM: smp_twd: convert to use CLKSRC_OF init clocksource: tegra20: use the device_node pointer passed to init clocksource: pass DT node pointer to init functions clocksource: add empty version of clocksource_of_init Conflicts: arch/arm/configs/multi_v7_defconfig arch/arm/mach-spear/spear13xx.c Tested-by: Barry Song <Barry.Song@csr.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: sirf: enable support in multi_v7_defconfigArnd Bergmann2013-03-251-0/+6
| | | | | | | | | | | | | | | | | | | | | This enables all sirf specific drivers in the defconfig. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Barry Song <Baohua.Song@csr.com>
| * | ARM: sirf: enable multiplatform supportArnd Bergmann2013-03-2513-173/+18
| | | | | | | | | | | | | | | | | | All the prerequisites are there now, so we can move sirf into multiplatform. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: sirf: use clocksource_of infrastructureArnd Bergmann2013-03-256-60/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the two sirf clocksource drivers to drivers/clocksource and integrates them into the framework for locating the clock sources automatically. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Barry Song <Baohua.Song@csr.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de>
| * | ARM: sirf: move debug-macro.S to include/debug/sirf.SArnd Bergmann2013-03-253-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new style ll_debug implementation for multiplatform requires the platform glue to be in include/debug, so let's move it there to separate the debugging logic from the platform code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Barry Song <Baohua.Song@csr.com>
| * | ARM: sirf: enable sparse IRQArnd Bergmann2013-03-253-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | Now that both irqchips for sirf are converted to not rely on legacy domains, let's move all of the platform over to sparse IRQ. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: sirf: move irq driver to drivers/irqchipArnd Bergmann2013-03-255-138/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the irqchip drier for prima2 to the current practices by moving it into drivers/irqchip and integrating it into the irqchip_init infrastructure. We also now use a linear irq domain as a preparation for sparse IRQ suport. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de>
| * | ARM: sirf: fix prima2 interrupt lookupArnd Bergmann2013-03-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We must not read the interrupts property manually but instead use irq_of_parse_and_map() to guarantee that we get the correct interrupt number once we stop using the legacy IRQ domain. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Barry Song <Baohua.Song@csr.com>
| * | pinctrl: sirf: convert to linear irq domainArnd Bergmann2013-03-251-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sirf platforms use no hardcoded IRQ numbers, so there is no reason to use the legacy domain, and by converting to the linear domain, we get a more efficient representation of sparse IRQs and remove the dependency on the mach/irqs.h header file. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org>
| * | Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatformArnd Bergmann2013-03-1914-109/+60
| |\ \
| | * | clocksource: make CLOCKSOURCE_OF_DECLARE type safeArnd Bergmann2013-03-193-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that a function pointer passed into CLOCKSOURCE_OF_DECLARE takes the same arguments that we use for calling that function later. Also fix the extraneous semicolon at end of the CLOCKSOURCE_OF_DECLARE definition. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Rob Herring <rob.herring@calxeda.com>
| | * | ARM: smp_twd: convert to use CLKSRC_OF initRob Herring2013-03-1110-37/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have OF based init with CLKSRC_OF, convert smp_twd init function to use it and covert all callers of twd_local_timer_of_register. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Viresh Kumar <viresh.linux@gmail.com> Cc: Shiraz Hashim <shiraz.hashim@st.com> Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Cc: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-omap@vger.kernel.org Cc: spear-devel@list.st.com Reviewed-by: Stephen Warren <swarren@nvidia.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | clocksource: tegra20: use the device_node pointer passed to initRob Herring2013-03-111-41/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've already matched the node, so use the node pointer passed in. The rtc init was intermingled with the timer init, so split this out to a separate init function. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com>
| | * | clocksource: pass DT node pointer to init functionsRob Herring2013-03-114-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where we have multiple nodes of the same type, we may need the node pointer to know which node was matched. Passing the node pointer also keeps the init function from having to match the node a 2nd time. Update bcm2835, vt8500, and tegra20 init functions for the new function prototype. Further tegra20 clean-ups are in follow-up commit. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Tony Prisk <linux@prisktech.co.nz> Tested-by: Michal Simek <michal.simek@xilinx.com>
| | * | clocksource: add empty version of clocksource_of_initRob Herring2013-03-111-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add an empty clocksource_of_init when !CLKSRC_OF. This is needed for builds where no timer has selected CLKSRC_OF. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de>
| * | ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb boardBarry Song2013-03-182-0/+746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | atlas6.dtsi is basically a copy of prima2.dtsi as most components are compatible with prima2 except that: 1. node of l2 cache is deleted 2. node multimedia engine is deleted 3. node of sata is deleted 4. node of sdmmc4 is deleted 5. powervr is moved to "powervr,sgx510" 6. pinctrl is moved to atlas6 as pinmux layout has big changes in atlas6 7. clock is moved to atlas6 as clock layout has changes in atlas6 Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Jiansong Chen <Jiansong.Chen@csr.com>
| * | arm: prima2: add new SiRFatlas6 machine in common boardBarry Song2013-03-182-1/+30
| |/ | | | | | | | | | | | | | | | | | | SiRFatlas6's machine definition is almost seem with SiRFprimaII except that prima2 has a 256MB DMA zone. This patch adds SiRFatlas6 machine in common board files, and also adds atlas6 arch node in Kconfig. Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | ARM: spear: build hotplug.o for armv7-aArnd Bergmann2013-03-191-0/+2
| | | | | | | | | | | | | | | | | | The hotplug.c file uses assembly instructions that are only available on ARMv7 but not on ARMv6. This is ok because we know that code will only run on arm ARMv7 SPEARr13xx, but it produces build errors when we also enable one of the ARMv6 targets in a multiplatform configuration. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | ARM: nomadik: hide MACH_NOMADIK_8815NHK in KconfigArnd Bergmann2013-03-191-0/+2
| | | | | | | | | | | | | | | | | | The nomadik multiplatform support made it possible to select MACH_NOMADIK_8815NHK without selecting ARCH_NOMADIK, which leads to build errors when we also select ARMv6/v7 targets. Adding the ifdef here restores the intended behavior. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | Merge branch 'spear/multiplatform' into next/multiplatformArnd Bergmann2013-03-1565-769/+430
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spear platform has been cleaned up a lot by Viresh Kumar, and is relatively easy to convert to multiplatform, getting us one more step closer to having all ARMv7 platforms included. I originally did this before 3.8 but merging it never worked out so far, mostly because of conflicts against patches in the DMA tree, but also because I did not push very hard for these. * spear/multiplatform: ARM: spear: enable spear13xx in multi_v7_defconfig ARM: spear: fix build error in restart.c ARM: spear: use multiplatform configuration options. ARM: spear: rename duplicate pl080_plat_data ARM: spear: make clock driver independent of headers ARM: spear: move generic.h and pl080.h into private dir ARM: spear: move all files to mach-spear ARM: spear: move spear.h and misc_regs.h into plat-spear ARM: spear: merge Kconfig files ARM: spear: make spear3xx/6xx mach/spear.h files identical ARM: spear: move identical headers to plat-spear/include/mach ARM: spear: unify mach/generic.h and mach/irqs.h ARM: spear13xx: make mach/dma.h local Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: spear: enable spear13xx in multi_v7_defconfigArnd Bergmann2013-03-121-0/+9
| | | | | | | | | | | | | | | | | | | | | SPEAr13xx can now be part of the regular multiplatform defconfig, so let's enable it there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: spear: fix build error in restart.cArnd Bergmann2013-03-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now enable mach-spear without selecting any of the machines in a multiplatform configuration. Doing so causes a build error that is trivial to fix by making both the spear13xx and the spear3xx/6xx portion of this file conditional rather than alternatives. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: use multiplatform configuration options.Arnd Bergmann2013-03-125-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spear platform is now multiplatform capable in principle, and everything still builds when enabled. This slightly rearranges the Kconfig options for spear to enable both single- and multiplatform support. As a side-effect, even building the single spear kernel can now enable spear3xx and spear6xx simultaneously, although not together with spear13xx, because they are a different archicture version (v7 instead of v5). Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: rename duplicate pl080_plat_dataArnd Bergmann2013-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both spear3xx and spear6xx have a global symbol named pl080_plat_data. Eventually, both should be removed, but for now, we can rename one to pl080_plat_data and declare it static, since that one does not actually need to be visible outside of spear6xx.c. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: make clock driver independent of headersArnd Bergmann2013-03-1212-142/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device drivers should not access MMIO registers through hardcoded platform specific address constants. Instead, we can pass the MMIO token to the spear clock driver in the initialization routine to contain that knowledge in the platform code itself. Ideally, the clock driver would use of_iomap() or similar to get the address, and that can be used later, but for now, this is the minimal change. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: move generic.h and pl080.h into private dirArnd Bergmann2013-03-1214-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | No file outside of mach-spear includes these files any more, so they don't have to be globally visible now. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: move all files to mach-spearArnd Bergmann2013-03-1235-51/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are no conflicting files between the three mach-spear* directories and plat-spear any more, so we can now move all file to a common mach-spear directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: move spear.h and misc_regs.h into plat-spearArnd Bergmann2013-03-125-135/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spear13xx version of spear.h is completely different from the newly combined spear3xx/spear6xx version, but we can never build ARMv5 and ARMv7 platforms together, so there is no harm in putting all the contents into a single file and adding appropriate ifdefs. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: merge Kconfig filesArnd Bergmann2013-03-124-60/+47
| | | | | | | | | | | | | | | | | | | | | | | | As a preparation to merging the spear platforms into one directory, this merges the four Kconfig files into one. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: make spear3xx/6xx mach/spear.h files identicalArnd Bergmann2013-03-129-63/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two files are almost identical already basically just differ in the identifier names. By changing the identifiers to be the same, we are able to merge the two as a preparation to building a combined kernel. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: move identical headers to plat-spear/include/machArnd Bergmann2013-03-1221-344/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | As an intermediate step towards unification of the three spear platforms, this gets rid of the mach/* header files that are obviously not platform specific. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear: unify mach/generic.h and mach/irqs.hArnd Bergmann2013-03-128-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | These are indeed easy to combine, as there are no conflicting definitions in generic.h, and irqs.h will be obsolete once we enable SPARSE_IRQ. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | ARM: spear13xx: make mach/dma.h localArnd Bergmann2013-03-123-2/+4
| |/ | | | | | | | | | | | | | | There is no reason for this header file to be globally visible, so let's just move it into the mach directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
* | Merge branch 'cns3xxx/multiplatform' into next/multiplatformArnd Bergmann2013-03-1517-119/+158
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. * cns3xxx/multiplatform: ARM: cns3xxx: initial DT support ARM: cns3xxx: enable multiplatform support ARM: cns3xxx: move debug_ll code to include/debug/ ARM: cns3xxx: enable sparse IRQ support ARM: cns3xxx: make mach header files local Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: cns3xxx: initial DT supportArnd Bergmann2013-03-143-3/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds very minimal support for booting cns3xxx using a device tree. It should support the same devices that cns3420vb provides but gets them from the DT. All devices that don't have their own binding are probed through auxdata. This is completely untested and likely incomplete. Booting through ATAGS is made optional, so it can be turned off by anybody who has a DTB file. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: cns3xxx: enable multiplatform supportArnd Bergmann2013-03-145-77/+13
| | | | | | | | | | | | | | | | | | | | | | | | This moves the cns3xxx configuration option inside of ARCH_MULTIPLATFORM, since there is no reason for not doing it now. We can then also remove the three header files that become obsolete. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: cns3xxx: move debug_ll code to include/debug/Arnd Bergmann2013-03-143-0/+9
| | | | | | | | | | | | | | | | | | | | | This is needed in order to keep debug_ll functionality on cns3xxx working when we enable ARCH_MULTIPLATFORM. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: cns3xxx: enable sparse IRQ supportArnd Bergmann2013-03-143-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This trivially enables sparse IRQ on cns3xxx by moving the nr_irqs definition from mach/irqs.h into the machine descriptor. These interrupts will still get statically assigned, so nothing changes here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: cns3xxx: make mach header files localArnd Bergmann2013-03-149-17/+11
| |/ | | | | | | | | | | | | | | | | The mach/cns3xxx.h and mach/pm.h header files are used only in the platform code itself, so there is no need to make them globally visible. This gets us closer to multiplatform configuration for cns3xxx. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | Merge tag 'nomadik-multiplatform' of ↵Arnd Bergmann2013-03-1510-193/+46
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/multiplatform From Linus Walleij <linus.walleij@linaro.org>: Multiplatform support for the Nomadik - Get rid of the last header files in the <mach/*> namespace - Move the debug macro to the common place - Make the necessary Kconfig fixes and move the platform Kconfig fragment down to the mach directory. - Include necessary defconfig update to get the platform going. * tag 'nomadik-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: delete remnant include files ARM: nomadik: convert to multiplatform ARM: nomadik: move debugmacro to debug includes ARM: nomadik: delete IRQ header Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: nomadik: delete remnant include filesLinus Walleij2013-03-073-70/+0
| | | | | | | | | | | | | | | | This deletes the leftover <mach/timex.h> and <mach/uncompress.h> and Makefile.boot that have no role in a multiplatform environment. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * ARM: nomadik: convert to multiplatformLinus Walleij2013-03-073-43/+38
| | | | | | | | | | | | | | | | | | | | | | This converts the Nomadik to run in multiplatform mode, including the defconfig change. After this the "uImage" target in the kernel tree will no longer work, but we do not care about this. Instead we generate the uImage from the zImage using mkimage or update the bootloader to accept bootz. Some minor updates to the defconfig are done as part of this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * ARM: nomadik: move debugmacro to debug includesLinus Walleij2013-03-072-0/+8
| | | | | | | | | | | | | | This moves the Nomadik debug macro to the debug headers to make way for multiplatform support. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * ARM: nomadik: delete IRQ headerLinus Walleij2013-03-072-80/+0
| | | | | | | | | | | | | | This header is not used any more after the platform was switched to obtain resources from the device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* | Linux 3.9-rc2Linus Torvalds2013-03-101-1/+1
| |
* | Merge branch 'for-linus' of ↵Linus Torvalds2013-03-0971-19/+84
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace Pull namespace bugfixes from Eric Biederman: "This is three simple fixes against 3.9-rc1. I have tested each of these fixes and verified they work correctly. The userns oops in key_change_session_keyring and the BUG_ON triggered by proc_ns_follow_link were found by Dave Jones. I am including the enhancement for mount to only trigger requests of filesystem modules here instead of delaying this for the 3.10 merge window because it is both trivial and the kind of change that tends to bit-rot if left untouched for two months." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Use nd_jump_link in proc_ns_follow_link fs: Limit sys_mount to only request filesystem modules (Part 2). fs: Limit sys_mount to only request filesystem modules. userns: Stop oopsing in key_change_session_keyring
| * | proc: Use nd_jump_link in proc_ns_follow_linkEric W. Biederman2013-03-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update proc_ns_follow_link to use nd_jump_link instead of just manually updating nd.path.dentry. This fixes the BUG_ON(nd->inode != parent->d_inode) reported by Dave Jones and reproduced trivially with mkdir /proc/self/ns/uts/a. Sigh it looks like the VFS change to require use of nd_jump_link happend while proc_ns_follow_link was baking and since the common case of proc_ns_follow_link continued to work without problems the need for making this change was overlooked. Cc: stable@vger.kernel.org Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
generated by cgit v1.1 at 2025-02-13 23:25:35 +0000