10 Jan, 2012
2 commits
-
power management changes for omap and imx
A significant part of the changes for these two platforms went into
power management, so they are split out into a separate branch.* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)
ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
ARM: imx6q: build pm code only when CONFIG_PM selected
ARM: mx5: use generic irq chip pm interface for pm functions on
ARM: omap: pass minimal SoC/board data for UART from dt
arm/dts: Add minimal device tree support for omap2420 and omap2430
omap-serial: Add minimal device tree support
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Get rid of all pdev->id usage
ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init
ARM: OMAP4: PRM: use PRCM interrupt handler
ARM: OMAP3: pm: use prcm chain handler
ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad
ARM: OMAP2+: mux: add support for PAD wakeup interrupts
ARM: OMAP: PRCM: add suspend prepare / finish support
ARM: OMAP: PRCM: add support for chain interrupt handler
ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier
ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup
ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list
... -
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.cLots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.Signed-off-by: Arnd Bergmann
07 Jan, 2012
1 commit
05 Jan, 2012
4 commits
-
Conflicts:
arch/arm/mach-exynos/cpu.cThe changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c. -
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c -
The restart support was missed from the initial imx6q submission.
The mxc_restart() does not work for imx6q. Instead, this patch adds
the restart for imx6q.Signed-off-by: Shawn Guo
Signed-off-by: Russell King -
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Sascha Hauer
Signed-off-by: Russell King
04 Jan, 2012
1 commit
-
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c supportUpdated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
03 Jan, 2012
2 commits
-
MX31PDK board has a MC13783 PMIC, which provides RTC functionality.
Add support for it.
Signed-off-by: Fabio Estevam
Signed-off-by: Sascha Hauer -
Signed-off-by: Gwenhael Goavec-Merou
Signed-off-by: Sascha Hauer
31 Dec, 2011
1 commit
-
The recent suspend testing on !SMP build discovers that the __CPUINIT
annotation for v7_invalidate_l1 should not be there, as the function
is called by resume path for not only SMP but also !SMP build.Signed-off-by: Shawn Guo
30 Dec, 2011
1 commit
-
The recent suspend/resume and reset testing on imx6q discovers that
not only D-Cache but also I-Cache has random data and validity when
the core comes out of a power recycle.This patch adds I-Cache invalidation into v7_invalidate_l1 to make
sure both D-Cache and I-Cache invalidated on power-up.Signed-off-by: Shawn Guo
26 Dec, 2011
2 commits
-
Original patch from Lothar Waßmann, this patch fixes a building error
when CONFIG_CACHE_L2X0 is not defined.Cc: Lothar Waßmann
Signed-off-by: Eric Miao
Signed-off-by: Shawn Guo -
Signed-off-by: Eric Miao
Signed-off-by: Shawn Guo
20 Dec, 2011
1 commit
-
…e/dmart/linux-2.6-arm into devel-stable
19 Dec, 2011
6 commits
-
The i.MX6 Quad SoC will work without the l2x0 L2 cache controller
support built into the kernel, so this patch removes the dependency
on CACHE_L2X0.This makes the l2x0 support optional, so that it can be turned off
when desired for debugging purposes etc.Since SOC_IMX6Q already depends on ARCH_IMX_V6_V7 and
ARCH_IMX_V6_V7 selects MIGHT_HAVE_CACHE_L2X0, there is no need to
select that option explicitly from SOC_IMX6Q.Thanks to Shawn Guo for this suggestion. [1]
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074602.html
Acked-by: Shawn Guo
Tested-by: Shawn Guo
Acked-by: Sascha Hauer -
Making SMP depend on (huge list of MACH_ and ARCH_ configs) is
bothersome to maintain and likely to lead to merge conflicts.This patch moves the knowledge of which platforms are SMP-capable
to the individual machines. To enable this, a new HAVE_SMP config
option is introduced to allow machines to indicate that they can
run in a SMP configuration.Signed-off-by: Dave Martin
Acked-by: Linus Walleij
(for nomadik, ux500)
Acked-by: Tony Lindgren
(for omap)
Acked-by: Kukjin Kim
(for exynos)
Acked-by: Sascha Hauer
(for imx)
Acked-by: Olof Johansson
(for tegra) -
Signed-off-by: Eric Bénard
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer -
in 0d6cfa3a75f5cde5b3ca0dde748fd22625b4f34c I fixed the mach-types
records. We also need to make the name consistent in Kconfig else
the machine_is_eukrea_cpuimx35sd macro fails, and thus audio codec
is not properly initalized.Signed-off-by: Eric Bénard
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer -
commit 8d75a26 "ARM: mx35: use generic function for displaying silicon revision"
disabled IIM clock after reading silicon revision which will prevent
reboot in internal boot mode.Signed-off-by: Eric Bénard
Cc: Jason Liu
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer -
in 0d6cfa3a75f5cde5b3ca0dde748fd22625b4f34c I fixed the mach-types
records. We also need to make the name consistent in Kconfig else
the machine_is_eukrea_cpuimx25sd macro fails, and thus audio codec
is not properly initalized.Signed-off-by: Eric Bénard
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer
14 Dec, 2011
4 commits
-
Signed-off-by: Eric Miao
Signed-off-by: Shawn Guo -
The Sabreauto board was renamed to Armadillo2 recently. To avoid
confusion, rename Sabreauto to Armadillo2/arm2.Signed-off-by: Dirk Behme
Signed-off-by: Shawn Guo -
The default phy RGMII pad settings can not work, tune pad skew.
Signed-off-by: Richard Zhao
Signed-off-by: Shawn Guo -
- Add basic board dts file
- Add board compatible string to mach-imx6q.
- Update fsl DT board doc.Signed-off-by: Richard Zhao
Signed-off-by: Shawn Guo
06 Dec, 2011
1 commit
01 Dec, 2011
2 commits
-
When gpio core dynamically allocate gpio number for a port, it starts
from the end of the total range, 0 ~ ARCH_NR_GPIOS. That said, the
earlier a port gets probed, the bigger gpio number it gets assigned.
To match this, the irq_base for gpio should be assigned from
'MXC_GPIO_IRQ_START + ARCH_NR_GPIOS' decreasingly.Signed-off-by: Shawn Guo
-
The of_irq_init() expects the callback passed by .data of of_device_id
return 'int' instead of 'void'. This patch fixes it to have
irq_init_cb() return the correct value, and in turn have the secondary
interrupt controller (gpio in this case) initialized properly and also
eliminate the error message 'of_irq_init: children remain, but no
parents' which was overlooked before.Signed-off-by: Shawn Guo
24 Nov, 2011
2 commits
22 Nov, 2011
4 commits
-
Conflicts:
arch/arm/mach-imx/mm-imx3.cSigned-off-by: Sascha Hauer
-
This fixes building a kernel for only one of the two SOCs. Without this
patch an i.MX31 only build fails with:arch/arm/mach-imx/built-in.o: In function `imx35_init_early':
mach-bug.c:(.init.text+0x2c): undefined reference to `mxc_iomux_v3_init'
arch/arm/mach-imx/built-in.o: In function `imx35_soc_init':
mach-bug.c:(.init.text+0xe4): undefined reference to `mx35_revision'Signed-off-by: Uwe Kleine-König
Signed-off-by: Sascha Hauer -
Commit 27ad4bf72a ("ARM: imx: move mx3 support to mach-imx") kept
ARCH_MX31 and ARCH_MX35 'for compatibility'. Now that they aren't
actually used anymore, they can be dropped entirely.Signed-off-by: Paul Bolle
Signed-off-by: Sascha Hauer
17 Nov, 2011
1 commit
-
map_io is the only place to call iotable_init.
Signed-off-by: Richard Zhao
[shawn.guo: rename imx_clock_map_io() to imx6q_clock_map_io()]
Signed-off-by: Shawn Guo
16 Nov, 2011
1 commit
-
This patch uses the new cpu_logical_map() macro for converting logical
CPU numbers into physical numbers when releasing CPUs during the SMP
boot and CPU hotplug paths.Cc: Sascha Hauer
Acked-by: Shawn Guo
Signed-off-by: Will Deacon
11 Nov, 2011
3 commits
-
The following error is seen in some case when mounting rootfs from
SD/MMC cards.Waiting for root device /dev/mmcblk0p1...
mmc1: host does not support reading read-only switch. assuming write-enable.
mmc1: new high speed SDHC card at address b368
mmcblk0: mmc1:b368 SDC 3.74 GiB
mmcblk0: p1
mmc1: Timeout waiting for hardware interrupt.
mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
end_request: I/O error, dev mmcblk0, sector 3678225
Buffer I/O error on device mmcblk0p1, logical block 458754
lost page write due to I/O error on mmcblk0p1This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.Signed-off-by: Shawn Guo
Cc: Chris Ball
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer -
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.The patch also change ARCH_MX* to SOC_IMX* for other platforms.
Signed-off-by: Shawn Guo
Cc: Sascha Hauer
Signed-off-by: Sascha Hauer -
The patch removes imx_idle hook and use pm_idle instead to get imx
arch_idle prepared for the cleanup. It's suggested by Russel King
as below.> The final removal of mach/system.h depends on getting rid of the arch_idle
> thing. While going through these headers, I was dismayed to find these:
>
> arch/arm/mach-s3c2410/include/mach/system.h:void (*s3c24xx_idle)(void);
> arch/arm/plat-mxc/include/mach/system.h:extern void (*imx_idle)(void);
>
> when we have a perfectly good pm_idle hook already in place - so there's
> no excuse for these especially when other platforms are already using
> pm_idle to hook their platform specific idle function into. This is
> something that better be gone at the next merge window!Suggested-by: Russell King
Signed-off-by: Shawn Guo
Acked-by: Russell King
Signed-off-by: Sascha Hauer
07 Nov, 2011
1 commit
-
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include
net: sch_generic remove redundant use of
net: inet_timewait_sock doesnt need
...Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h