summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-19Add support for DVI monitors3.0-boundary-imx6-3.0.35-4.0.0-ts1Robert Winkler
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
2013-07-19Revert "nitrogen6x: add OSS audio"Eric Nelson
This reverts commit 58532a1ba7dcc32a6663b439c3224cb5eb110ec3.
2013-07-18boundary defconfigs: add Device Mapper for use with Debian installerEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-18Merge branch 'upstream-pulls' of github.com:kelvinlawson/linux-imx6 into ↵Eric Nelson
kelvinlawson-upstream-pulls
2013-07-18Merge FEC fix from Freescale 3.5.7 kernel (has not made it into Freescale's ↵Kelvin Lawson
3.0.35 kernel but is definitely present in 3.0.35): ENGR00264875 enet: fix DMA map/unmap mismatch Enable "CONFIG_DMA_API_DEBUG" in kernel, and system generate warning when run up. WARNING: /home/b29397/work/projects/linux-2.6-imx/lib/dma-debug.c:865 check_unmap+0x6f8/0x7d8() net eth0: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x00000000443d7040] [size=2048 [<80025f60>] (warn_slowpath_common+0x0/0x6c) from [<80026070>] (warn_slowpath_fmt+0x38/0x40) r9:00000000 r8:00000800 r7:807bfb0c r6:807a3d48 r5:00000000 It dma memory map/unmap mismatch issue. Signed-off-by: Fugang Duan <B38611@freescale.com>
2013-07-17ENGR00271359 Add Multi-touch supportErik Boto
The previous behavior of the driver did not work properly with Qt5 QtQuick multi touch-point gestures, due to how touch-points are reported when removing a touch-point. My interpretation of the available documentation [1] was that the driver should report all touch-points between SYN_REPORTs, but it is not explicitly stated so. I've found another mail-thread [2] where the creator of the protocol states: "The protocol defines a generic way of sending a variable amount of contacts. The contact count is obtained by counting the number of non-empty finger packets between SYN_REPORT events."-Henrik Rydberg I think this verifies my assumption that all touch-points should be reported between SYN_REPORTs, otherwise it can not be used to obtain the count. [1] https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt [2] http://lists.x.org/archives/xorg-devel/2010-March/006466.html Signed-off-by: Erik Boto <erik.boto@pelagicore.com> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com> (cherry picked from commit 7cba001c5a502680f6dbf902821726779a9c9287)
2013-07-17ENGR00271136 Fix build break when CONFIG_CLK_DEBUG is disabledMahesh Mahadevan
clk structure member name is defined only when CONFIG_CLK_DEBUG is enabled. Hence need to encapsulate the code with this config. Patch received from imx community: https://community.freescale.com/thread/308482 Signed-off-by: xiongweihuang Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
2013-07-16Merge branch 'boundary-imx_3.0.35_4.0.0' of ↵Eric Nelson
github.com:boundarydevices/linux-imx6 into boundary-imx_3.0.35_4.0.0
2013-07-13nitrogen6x: add OSS audioEric Nelson
2013-07-13disable SDMA on UARTsEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-12nit6xlite: Add PWM3 backlight (pwm.backlight.2)Eric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-12mx6qsaberlite: Add DVFS, MIPI_CSI2 and PERFMONRobert Winkler
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
2013-07-09nit6xlite: use SDIO set_power callbackEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-09bcmdhd: Don't add chip id into firmware pathEric Nelson
2013-07-09ARM: 7670/1: fix the memset fixNicolas Pitre
Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations") attempted to fix a compliance issue with the memset return value. However the memset itself became broken by that patch for misaligned pointers. This fixes the above by branching over the entry code from the misaligned fixup code to avoid reloading the original pointer. Also, because the function entry alignment is wrong in the Thumb mode compilation, that fixup code is moved to the end. While at it, the entry instructions are slightly reworked to help dual issue pipelines. Signed-off-by: Nicolas Pitre <nico@linaro.org> Tested-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> (cherry picked from commit 418df63adac56841ef6b0f1fcf435bc64d4ed177)
2013-07-09ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) ↵Ivan Djelic
optimizations Recent GCC versions (e.g. GCC-4.7.2) perform optimizations based on assumptions about the implementation of memset and similar functions. The current ARM optimized memset code does not return the value of its first argument, as is usually expected from standard implementations. For instance in the following function: void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter) { memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter)); waiter->magic = waiter; INIT_LIST_HEAD(&waiter->list); } compiled as: 800554d0 <debug_mutex_lock_common>: 800554d0: e92d4008 push {r3, lr} 800554d4: e1a00001 mov r0, r1 800554d8: e3a02010 mov r2, #16 ; 0x10 800554dc: e3a01011 mov r1, #17 ; 0x11 800554e0: eb04426e bl 80165ea0 <memset> 800554e4: e1a03000 mov r3, r0 800554e8: e583000c str r0, [r3, #12] 800554ec: e5830000 str r0, [r3] 800554f0: e5830004 str r0, [r3, #4] 800554f4: e8bd8008 pop {r3, pc} GCC assumes memset returns the value of pointer 'waiter' in register r0; causing register/memory corruptions. This patch fixes the return value of the assembly version of memset. It adds a 'mov' instruction and merges an additional load+store into existing load/store instructions. For ease of review, here is a breakdown of the patch into 4 simple steps: Step 1 ====== Perform the following substitutions: ip -> r8, then r0 -> ip, and insert 'mov ip, r0' as the first statement of the function. At this point, we have a memset() implementation returning the proper result, but corrupting r8 on some paths (the ones that were using ip). Step 2 ====== Make sure r8 is saved and restored when (! CALGN(1)+0) == 1: save r8: - str lr, [sp, #-4]! + stmfd sp!, {r8, lr} and restore r8 on both exit paths: - ldmeqfd sp!, {pc} @ Now <64 bytes to go. + ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. (...) tst r2, #16 stmneia ip!, {r1, r3, r8, lr} - ldr lr, [sp], #4 + ldmfd sp!, {r8, lr} Step 3 ====== Make sure r8 is saved and restored when (! CALGN(1)+0) == 0: save r8: - stmfd sp!, {r4-r7, lr} + stmfd sp!, {r4-r8, lr} and restore r8 on both exit paths: bgt 3b - ldmeqfd sp!, {r4-r7, pc} + ldmeqfd sp!, {r4-r8, pc} (...) tst r2, #16 stmneia ip!, {r4-r7} - ldmfd sp!, {r4-r7, lr} + ldmfd sp!, {r4-r8, lr} Step 4 ====== Rewrite register list "r4-r7, r8" as "r4-r8". Signed-off-by: Ivan Djelic <ivan.djelic@parrot.com> Reviewed-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Dirk Behme <dirk.behme@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> (cherry picked from commit 455bd4c430b0c0a361f38e8658a0d6cb469942b5)
2013-07-07Add AR1010 serial touch screen, enable it in s_defconfigEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-07s: use platform-specific sdio set_power callbackEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-07sdhci/sdhci-esdhc-imx: Allow platform-specific set_power callbackEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06board-mx6_s: export GPIOs, remove buttonsEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06s_defconfig: add userspace SPI device supportEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06board-mx6_s: add GPIOsEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06board-mx6_s: cleanupEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06board-mx6_s: add CSPI2Eric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-06board-mx6_s: Add GPIO pins, CSPI2Eric Nelson
2013-07-06board-mx6_s: clean up tsc2007 stuffEric Nelson
2013-07-05s: cleanup: no MIPI or adV7x devices, camera and HDMI on I2C3Eric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-05video/mxc:sensor_clock: we always use clko2_clk on our boardsEric Nelson
2013-07-05fix typo in ENGR00269604Eric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-07-05ENGR00269604 Fix the set clock-rate for audio & videoMahesh Mahadevan
There is single method to set clock-rate for both audio and video pll-s in i.MX6q clock system implementation. That's possible due to they have similar set of registers with a different bases. But there is also one common register: CCM_ANALOG_MISC2, which contains post-dividers. In current implementation, independently of whether audio or video clock is going to be set, the mask 0xc0000000 is applied to MISC2 register. This means, that if the audio clock rate is changed, the video clock post-dividers possibly will be corrupted. This patch fixes the issue described above. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
2013-07-05Revert "i.MX6: Add fix pll4 set_rate callback"Eric Nelson
This reverts commit c38a24542ba582af2d7852c0e6b61ac9f0313a72.
2013-07-05ENGR00267089 mx6: Amend the definitions of ANADIG_ANA_MISC2_REGx_STEP_TIME_MASKPeter Chan
Correct the definitions of ANADIG_ANA_MISC2_REG0_STEP_TIME_MASK and ANADIG_ANA_MISC2_REG2_STEP_TIME_MASK to 0x03000000 and 0x30000000 respectively Signed-off-by: Peter Chan <B18700@freescale.com>
2013-07-05ENGR00240112-2 crypto: caam: add ecb(aes) crypto algorithm to caam.Zhang Jiejing
add ecb(aes) support for caam algorithm, the caam H/W support both ecb and cbc, add the algorithm into template. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2013-07-05ENGR00240112-1 caam: fix user space crypto API support.Zhang Jiejing
This patch fix the CAAM support for Crypto User Space API support. in the dma_map_sg_chained() function, the chained mode will loop until the scatter list end, but when the scatter list end, it will return null and orignal code will set this to the sg list point used by dma_sync, so it will panic. When do chain dma, use a tmp do going through the list. Signed-off-by Zhang Jiejing <jiejing.zhang@freescale.com>
2013-07-05ENGR00181680-2 No audio when play 3 streams after 3~10 seconds sometimesb02247
sdma: bd is bufferable dma buffer, interrupt handler can not get correct data after sdma script updated. Which will cause there is no interrupt after failed period number times in the interrupt handler. This is a workaround. Signed-off-by: b02247 <b02247@freescale.com>
2013-07-05ENGR00181680-1 No audio when play 3 streams after 3~10 seconds sometimesb02247
sdma: bd is bufferable dma buffer, interrupt handler can not get correct data after sdma script updated. Which will cause there is no interrupt after failed period number times in the interrupt handler. This is a workaround. Signed-off-by: b02247 <b02247@freescale.com>
2013-07-05ENGR00266312 mx6dl: add i2c4 bus support for sabresd/auto, arm2 platformsFugang Duan
imx6dq have 3 i2c controllers and 5 ecspi,imx6dl have 4 i2c4 controllers and 4 ecspi. imx6dl i2c4 clock source is routed from pll3 through to ecspi_root gate. Add i2c4 bus support for sabresd/auto, and arm2 platforms. Signed-off-by: Fugang Duan <B38611@freescale.com>
2013-07-05ENGR00265061 System hang when running the game lsh.emu.apkguoyin.chen
The game will creat a lot of hr timer, and make cpu tick broadcast bit not been clear all time. It will cause user space thread not been scheduled. Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2013-07-05perf tools: Fix getrusage() related build failure on glibc trunkMarkus Trippelsdorf
On a system running glibc trunk perf doesn't build: CC builtin-sched.o builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration] [...] Fix it by including sys/resource.h. Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20120404084527.GA294@x4 Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-07-05preliminary support for Boundary Devices S boardEric Nelson
2013-07-02nitrogen6x: add KSZ9031 supportTroy Kisky
2013-07-02micrel: add ksz9031 supportTroy Kisky
2013-06-28i.MX6: Add fix pll4 set_rate callbackEric Nelson
There is single method to set clock-rate for both audio and video pll-s in i.MX6q clock system implementation. That's possible due to they have similar set of registers with a different bases. But there is also one common register: CCM_ANALOG_MISC2, which contains post-dividers. In current implementation, independently of whether audio or video clock is going to be set, the mask 0xc0000000 is applied to MISC2 register. This means, that if the audio clock rate is changed, the video clock post-dividers possibly will be corrupted. This patch fixes the issue described above. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov at gmail.com> See this post for background: https://lists.yoctoproject.org/pipermail/meta-freescale/2013-June/003376.html Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-06-27board-mx6_nitrogen6x: restore imx6q_add_v4l2_outputTroy Kisky
The commit below deleted too many lines.. commit d682fa41ba5963b83988fc5ce9b7836761d5e7a2 Author: Eric Nelson <eric.nelson@boundarydevices.com> Date: Thu Jun 13 11:17:53 2013 -0700 Fix adv7180 patch. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
2013-06-27mxc_v4l2_capture: fix power off when closing deviceTroy Kisky
There is already a call to power_off_camera() in mxc_v4l_close(), so delete the call to vidioc_int_s_power(). This fixes a situation where the power is off but the driver thinks it is on still. This should be squashed with and separated from commit: add ar1021 touchscreen Signed-off-by: Philip Craig <phil@blackmoth.com.au> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
2013-06-13h: wait for power button press/release in pm_power_offEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-06-13Fix adv7180 patch.Eric Nelson
It seems that some bit of commit f71be6d7a7aef1a496f73a9d9f8316c0e9477bb5 mx6_nitrogen6x: reserve 128M v4l2 memory to prevent dma alloc failure leaked into commit 73898f34936475555d4797c0c64b24c4952c0c9a mx6_nitrogen6x: add adv7180 tv input camera Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2013-06-10SABRE Lite/variants: implicitly set SD2 padsEric Nelson
2013-06-09add h_defconfigTroy Kisky
2013-06-09mx6_h: add initial board fileTroy Kisky