- Dec 22, 2012
-
-
Kukjin Kim authored
Commit db5b0ae0 ("Merge tag 'dt' of git://git.kernel.org/.../arm-soc" ) causes a duplicated build target. This patch fixes it and sorts out the build target alphabetically so that we can recognize something wrong easily. Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
- Dec 21, 2012
-
-
Tony Lindgren authored
Commit 787314c3 ("Merge tag 'iommu-updates-v3.8' of git://git./linux/kernel/git/joro/iommu" ) did not account for the changed header location. The headers were made local to mach-omap2 as they are specific to omap2+ only, and we wanted to get most of the #include <plat/*.h> headers fixed up anyways for the ARM multiplatform support. We attempted to avoid this kind of merge conflict early on by setting up a minimal git branch shared by the arm-soc tree and the iommu tree, but looks like we still hit a merge issue there as the branches got merged as various topic branches. Cc: Joerg Roedel <joro@8bytes.org> Signed-off-by:
Tony Lindgren <tony@atomide.com> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
Peter Ujfalusi authored
prom_add_property() has been renamed to of_add_property() This patch fixes the following comilation error: arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’: arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1 make[1]: *** Waiting for unfinished jobs.... Signed-off-by:
Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by:
Tony Lindgren <tony@atomide.com> Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Olof Johansson authored
This is the rename portion of "ARM: sunxi: Change device tree naming scheme for sunxi" that were missed when the patch was applied. Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Vaibhav Bedia authored
Merge commit 752451f0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux" ) resulted in a build breakage for OMAP arch/arm/mach-omap2/i2c.c: In function 'omap_pm_set_max_mpu_wakeup_lat_compat': arch/arm/mach-omap2/i2c.c:130:2: error: implicit declaration of function 'omap_pm_set_max_mpu_wakeup_lat' make[1]: *** [arch/arm/mach-omap2/i2c.o] Error 1 Fix this by including the appropriate header file with the function prototype. Reported-by:
Fengguang Wu <fengguang.wu@intel.com> Signed-off-by:
Vaibhav Bedia <vaibhav.bedia@ti.com> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
- Dec 20, 2012
-
-
Will Deacon authored
Commit 34ae6c96 ("ARM: 7298/1: realview: fix mapping of MPCore private memory region") accidentally broke the definition for the base address of the private peripheral region on revision B Realview-EB boards. This patch uses the correct address for REALVIEW_EB11MP_PRIV_MEM_BASE. Cc: <stable@vger.kernel.org> Acked-by:
Marc Zyngier <marc.zyngier@arm.com> Tested-by:
Florian Fainelli <florian@openwrt.org> Signed-off-by:
Will Deacon <will.deacon@arm.com> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Will Deacon authored
flush_cache_louis flushes the D-side caches to the point of unification inner-shareable. On uniprocessor CPUs, this is defined as zero and therefore no flushing will take place. Rather than invent a new interface for UP systems, instead use our SMP_ON_UP patching code to read the LoUU from the CLIDR instead. Cc: <stable@vger.kernel.org> Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> Tested-by:
Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by:
Will Deacon <will.deacon@arm.com> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Al Viro authored
find_vma() is *not* safe when somebody else is removing vmas. Not just the return value might get bogus just as you are getting it (this instance doesn't try to dereference the resulting vma), the search itself can get buggered in rather spectacular ways. IOW, ->mmap_sem really, really is not optional here. Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk> Cc: <stable@vger.kernel.org> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Al Viro authored
Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
-
Al Viro authored
All architectures have CONFIG_GENERIC_KERNEL_THREAD CONFIG_GENERIC_KERNEL_EXECVE __ARCH_WANT_SYS_EXECVE None of them have __ARCH_WANT_KERNEL_EXECVE and there are only two callers of kernel_execve() (which is a trivial wrapper for do_execve() now) left. Kill the conditionals and make both callers use do_execve(). Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
-
Padmavathi Venna authored
I2S controller has an internal mux for RCLK source clks. The list of source clk names were passed through platform data in non-dt case. The variable holding the list of RCLK source clk names is not required, as the list of clks need to be registered with clkdev using generic connection id. This is required as part of adding DT support for I2S controller driver. Signed-off-by:
Padmavathi Venna <padma.v@samsung.com> Acked-by:
Sangbeom Kim <sbkim73@samsung.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Padmavathi Venna authored
I2S controller has an internal mux for RCLK source clks. The list of source clk names were passed through platform data in non-dt case. The variable holding the list of RCLK source clk names is not required, as the list of clks need to be registered with clkdev using generic connection id. This is required as part of adding DT support for I2S controller driver. Signed-off-by:
Padmavathi Venna <padma.v@samsung.com> Acked-by:
Sangbeom Kim <sbkim73@samsung.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Padmavathi Venna authored
I2S controller has an internal mux for RCLK source clk. The list of source clk names were passed through platform data in non-dt case. Register the existing RCLK source clocks with clkdev using generic connection id. This is required as part of adding DT support for I2S controller driver. Signed-off-by:
Padmavathi Venna <padma.v@samsung.com> Acked-by:
Sangbeom Kim <sbkim73@samsung.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Padmavathi Venna authored
I2S controller has an internal mux for RCLK source clk. The list of source clk names were passed through platform data in non-dt case. Register the existing RCLK source clocks with clkdev using generic connection id. This is required as part of adding DT support for I2S controller driver. Signed-off-by:
Padmavathi Venna <padma.v@samsung.com> Acked-by:
Sangbeom Kim <sbkim73@samsung.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Padmavathi Venna authored
I2S controller has an internal mux for RCLK source clks. The list of source clk names were passed through platform data in non-dt case. Register the existing RCLK source clocks with clkdev using generic connection id. This is required as part of adding DT support for I2S controller driver. Signed-off-by:
Padmavathi Venna <padma.v@samsung.com> Acked-by:
Sangbeom Kim <sbkim73@samsung.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Dongjin Kim authored
Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412. Signed-off-by:
Dongjin Kim <tobetter@gmail.com> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Sachin Kamat authored
When DRM support for Samsung SoC and Samsung S3C framebuffer support are selected, the kernel crashes as it does not get the required platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD to fix this. Signed-off-by:
Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Sachin Kamat authored
When DRM support for Samsung SoC and Samsung S3C framebuffer support are selected, the kernel crashes as it does not get the required platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD to fix this. Fixes the following boot time crash: Unable to handle kernel NULL pointer dereference at virtual address 00000000 PC is at 0x0 LR is at s3c_fb_probe+0x198/0x788 [<c0152270>] (s3c_fb_probe+0x198/0x788) from [<c019e52c>] (platform_drv_probe+0x18/0x1c) [<c019e52c>] (platform_drv_probe+0x18/0x1c) from [<c019d2e4>] (driver_probe_device+0x70/0x1f0) [<c019d2e4>] (driver_probe_device+0x70/0x1f0) from [<c019d4f0>] (__driver_attach+0x8c/0x90) [<c019d4f0>] (__driver_attach+0x8c/0x90) from [<c019bc3c>] (bus_for_each_dev+0x50/0x7c) [<c019bc3c>] (bus_for_each_dev+0x50/0x7c) from [<c019cb4c>] (bus_add_driver+0x170/0x23c) [<c019cb4c>] (bus_add_driver+0x170/0x23c) from [<c019d9a4>] (driver_register+0x78/0x144) [<c019d9a4>] (driver_register+0x78/0x144) from [<c000862c>] (do_one_initcall+0x34/0x174) [<c000862c>] (do_one_initcall+0x34/0x174) from [<c020ed7c>] (kernel_init+0x100/0x2a0) [<c020ed7c>] (kernel_init+0x100/0x2a0) from [<c000e118>] (ret_from_fork+0x14/0x3c) Signed-off-by:
Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Sachin Kamat authored
When DRM support for Samsung SoC and Samsung S3C framebuffer support are selected, the kernel crashes as it does not get the required platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD to fix this. Without this patch the following crash occurs during bootup: Unable to handle kernel NULL pointer dereference at virtual address 00000000 PC is at 0x0 LR is at s3c_fb_probe+0x198/0x788 [<c01520e8>] (s3c_fb_probe+0x198/0x788) from [<c01a3dd4>] (platform_drv_probe+0x18/0x1c) [<c01a3dd4>] (platform_drv_probe+0x18/0x1c) from [<c01a2b8c>] (driver_probe_device+0x70/0x1f0) [<c01a2b8c>] (driver_probe_device+0x70/0x1f0) from [<c01a2d98>] (__driver_attach+0x8c/0x90) [<c01a2d98>] (__driver_attach+0x8c/0x90) from [<c01a14e4>] (bus_for_each_dev+0x50/0x7c) [<c01a14e4>] (bus_for_each_dev+0x50/0x7c) from [<c01a23f4>] (bus_add_driver+0x170/0x23c) [<c01a23f4>] (bus_add_driver+0x170/0x23c) from [<c01a324c>] (driver_register+0x78/0x144) [<c01a324c>] (driver_register+0x78/0x144) from [<c000862c>] (do_one_initcall+0x34/0x174) [<c000862c>] (do_one_initcall+0x34/0x174) from [<c01de210>] (kernel_init+0x100/0x2a0) [<c01de210>] (kernel_init+0x100/0x2a0) from [<c000e118>] (ret_from_fork+0x14/0x3c) Signed-off-by:
Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
- Dec 19, 2012
-
-
Michael Spang authored
Signed-off-by:
Michael Spang <spang@chromium.org> Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Kukjin Kim authored
Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Kukjin Kim authored
Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
Kukjin Kim authored
This fixes following: arch/arm/mach-exynos/built-in.o: In function `exynos5_reserve': arch/arm/mach-exynos/mach-exynos5-dt.c:177: undefined reference to `s5p_fdt_find_mfc_mem' arch/arm/mach-exynos/mach-exynos5-dt.c:177: undefined reference to `s5p_fdt_find_mfc_mem' arch/arm/mach-exynos/mach-exynos5-dt.c:178: undefined reference to `s5p_mfc_reserve_mem' Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com>
-
- Dec 18, 2012
-
-
Afzal Mohammed authored
rtc-omap driver is now capable of handling kicker mechanism, hence remove kicker handling at platform level, instead provide proper device name so that driver can handle kicker mechanism by itself Signed-off-by:
Afzal Mohammed <afzal@ti.com> Acked-by:
Sekhar Nori <nsekhar@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Daniel Mack <zonque@gmail.com> Cc: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
Maxime Ripard authored
There is several different SoCs sharing the sun5i codename: A10s, A12 and A13. Since there is enough differences to not consider those the same SoCs, change a bit the naming scheme to reflect this. Moreover, some boards like the olinuxino come in A10s and A13 variants, which also share the same SoC codename. So change the naming scheme to reflect both the codename and the market name of the SoCs used in the dtsi and in the board files Signed-off-by:
Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by:
Arnd Bergmann <arnd@arndb.de> Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Linus Walleij authored
Commit db298da2 "ARM: nomadik: move platform_data definition" moved the Ux500-specific musb header from <mach/usb.h> to <linux/platform_data/usb-musb-ux500.h> However that makes some board code fail to compile now: CC arch/arm/mach-ux500/board-mop500.o linux/arch/arm/mach-ux500/cpu-db8500.c: In function 'u8500_init_devices': linux/arch/arm/mach-ux500/cpu-db8500.c:226:2: error: implicit declaration of function 'ux500_add_usb' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[3]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [arch/arm/mach-ux500] Error 2 make[2]: *** Waiting for unfinished jobs.... So fix this up by adding the proper include file that appears to have been brought in implicitly one or another way in the past. Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Linus Walleij authored
With recent changes in the kernel, the MMCI and PL011 UART drivers will autonomously request their pins to be muxed in, so this machine-specific pin hogging code is just interfering with the proper mechanism and causing regressions in the v3.8 kernel. Delete it and the problems go away. Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Olof Johansson authored
arch/arm/mach-davinci/board-da850-evm.c: In function 'da850_evm_init': arch/arm/mach-davinci/board-da850-evm.c:1516:2: error: implicit declaration of function 'sram_get_gen_pool' [-Werror=implicit-function-declaration] arch/arm/mach-davinci/board-da850-evm.c:1516:31: warning: assignment makes pointer from integer without a cast [enabled by default] Signed-off-by:
Olof Johansson <olof@lixom.net> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com>
-
Olof Johansson authored
In file included from arch/arm/mach-exynos/clock-exynos5.c:29:0: arch/arm/mach-exynos/common.h:28:12: warning: 'exynos_pm_late_initcall' defined but not used [-Wunused-function] Signed-off-by:
Olof Johansson <olof@lixom.net> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Shawn Guo <shawn.guo@linaro.org>
-
- Dec 17, 2012
-
-
Fabio Estevam authored
Move platform-mx2-emma to arch/arm/mach-imx/devices and fix the following build error: make[2]: *** No rule to make target `arch/arm/mach-imx/devices/platform-mx2-emma.o', needed by `arch/arm/mach-imx/devices/built-in.o'. Stop. Signed-off-by:
Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de>
-
Sascha Hauer authored
The MIPI/HSP clocks were recently turned on in the i.MX51 clock tree. It turned out that the system does not work properly when the MIPI/HSP clocks are enabled, but the IPU clock is disabled. This happens when IPU support is disabled. In this case the IPU clock gets disabled when the clock framework turns off unused clock in a late_initcall. This is broken since: | commit 9a2d4825 | Author: Sascha Hauer <s.hauer@pengutronix.de> | Date: Tue Jun 5 13:53:32 2012 +0200 | | ARM i.MX5: switch IPU clk support to devicetree bindings | | The i.MX5 clk support has platform based clock bindings for the | IPU. IPU support is devicetree only, so move them over to devicetree | based bindings. Also, enable MIPI clocks which do not have a device | associated with, but still need to be enabled to do graphics on | i.MX51. This patch fixes this by setting some reserved bits in the CCM as recommended in the reference manual. Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de> Tested-by:
Shawn Guo <shawn.guo@linaro.org>
-
Fabio Estevam authored
FEC controller is connected to AIPI2 bus. Also fix the AIPI1 address range. Signed-off-by:
Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de>
-
Pali Rohár authored
This is needed to make the battery monitor actually work on Nokia N900. Signed-off-by:
Pali Rohár <pali.rohar@gmail.com> Acked-by:
Tony Lindgren <tony@atomide.com> Signed-off-by:
Anton Vorontsov <anton.vorontsov@linaro.org>
-
Javier Martinez Canillas authored
commit 966458f8 OMAP: remove vram allocator Removed the OMAP specific vram allocator but OMAP2 common was still trying to use it and this lead to the following build error: CC arch/arm/mach-omap2/common.o arch/arm/mach-omap2/common.c:19:23: fatal error: plat/vram.h: No such file or directory compilation terminated. make[1]: *** [arch/arm/mach-omap2/common.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by:
Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by:
Tony Lindgren <tony@atomide.com>
-
- Dec 16, 2012
-
-
Pawel Moll authored
The .notes, being read-only data by nature, were placed between read-write .data and .bss. This was harmful in case of the XIP kernel, as being placed in the RAM range, most likely far from the ROM address, was inflating the XIP images. Moving the .notes at the end of the read-only section (consisting of .text, .rodata and unwind info) fixes the problem. Reported-by:
Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by:
Pawel Moll <pawel.moll@arm.com> Tested-by:
Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Alexander Shiyan authored
This modification is needed to proper boot the custom machines with the IDs that are not described in the mach-types.h table. Signed-off-by:
Alexander Shiyan <shc_work@mail.ru> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Shawn Guo authored
Commit 91a9fec0 (ARM: move debug macros to common location) moves arch/arm/kernel/debug.S and arch/arm/kernel/head.S to CONFIG_DEBUG_LL_INCLUDE, but leaves arch/arm/boot/compressed/head.S still with mach/debug-macro.S. This causes the following build error on platforms that moved to new DEBUG_LL inclusion mechanism, when arch/arm/boot/compressed/head.S is compiled with DEBUG turned on. AS arch/arm/boot/compressed/head.o arch/arm/boot/compressed/head.S:49:30: fatal error: mach/debug-macro.S: No such file or directory compilation terminated. Fix the problem by replacing mach/debug-macro.S inclusion with CONFIG_DEBUG_LL_INCLUDE one. Reported-by:
Steev Klimaszewski <steev@genesi-usa.com> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
- Dec 15, 2012
-
-
Bo Shen authored
Change the value of status to disabled to keep the consistent Signed-off-by:
Bo Shen <voice.shen@atmel.com> Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
Paul Walmsley authored
Fix the following sparse warnings in the OMAP3/4 CPUIdle code: arch/arm/mach-omap2/cpuidle34xx.c:272:1: warning: symbol 'omap3_idle_dev' was not declared. Should it be static? arch/arm/mach-omap2/cpuidle34xx.c:274:23: warning: symbol 'omap3_idle_driver' was not declared. Should it be static? arch/arm/mach-omap2/cpuidle44xx.c:164:1: warning: symbol 'omap4_idle_dev' was not declared. Should it be static? arch/arm/mach-omap2/cpuidle44xx.c:166:23: warning: symbol 'omap4_idle_driver' was not declared. Should it be static? Also fix the following checkpatch warnings: WARNING: please, no space before tabs #44: FILE: arch/arm/mach-omap2/cpuidle34xx.c:105: +^I.name = ^I"omap3_idle",$ WARNING: please, no space before tabs #45: FILE: arch/arm/mach-omap2/cpuidle34xx.c:106: +^I.owner = ^ITHIS_MODULE,$ ERROR: code indent should use tabs where possible #211: FILE: arch/arm/mach-omap2/cpuidle44xx.c:74: + /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */$ Signed-off-by:
Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@ti.com> Acked-by:
Santosh Shilimkar <santosh.shilimkar@ti.com>
-
Paul Walmsley authored
Booting OMAP4460 Pandaboard ES with a recent u-boot results in this warning: WARNING: at arch/arm/mach-omap2/dpll3xxx.c:427 omap3_noncore_dpll_enable+0xf4/0x110() The OMAP4 DPLL parent clock names only listed the reference clocks, not the bypass clocks. Fix by adding the bypass clocks to the DPLL parent lists. Signed-off-by:
Paul Walmsley <paul@pwsan.com> Cc: Mike Turquette <mturquette@linaro.org>
-