AgeCommit message (Collapse)Author
2014-10-28video: tegra: nvmap: prevent null pointer dereferenceColibri_T30_LinuxImageV2.3Beta3_20141031Colibri_T20_LinuxImageV2.3Beta3_20141031Apalis_T30_LinuxImageV2.3Beta3_20141031Mariusz Glebocki
2014-10-28apalis/colibri t30: fix audio hub lock-upMarcel Ziswiler
This patch fixes a clock related audio hub driver lock-up observed when booting with mainline U-Boot which we are in the process of migrating to now.
2014-10-28mmc: tegra: mark host as CMD23 capableStefan Agner
Newer eMMC standards use CMD23 for multi-block transfer. These command has the advantage that only one command is necessary, no stop command after the transfer is required. The kernel already supports this command, but we need to enable the capability on the host level. Tests verified that the MMC code detects that SD-card do not support CMD23 and hence don't use that command.
2014-10-28yaffs: fix spinning when flush inodesStefan Agner
While in list_for_each_entry() of yaffs_flush_inodes, the fs code can delete inodes. This leads to an endless loop which causes a softlockup. Typically this happend in sync_supers when creating and deleting files while under CPU load. This fix checks whether we get twice the same inode. If this is true, we just retry again. This is an alternative fix to the proposed fix Jisheng Zhang: yaffs: fix softlockup cauesed by inode deleted when scanning s_inodes list
2014-09-25yaffs: fix function prototypeStefan Agner
The fsync function in the fs.h header file in our kernel version has two additional function introduced by this commit: 02c24a82187d5a628c68edfe71ae60dc135cd178 fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers Update the function prototype for YAFFS2 too to avoid missinterpreted datasync parameter and to avoid warnings.
2014-09-16ASoC: sgtl5000: Fix the cache handlingFabio Estevam
Since commit e5d80e82e32e (ASoC: sgtl5000: Convert to use regmap directly) a kernel oops is observed after a suspend/resume sequence. The kernel oops happens inside sgtl5000_restore_regs() as codec->reg_cache is no longer a valid pointer. Add the remaining register entries into sgtl5000_reg_defaults[] and remove sgtl5000_restore_regs() completely, which allows suspend/resume to work fine and make the code simpler. Tested on a im53-qsb board. Reported-by: Shawn Guo <> Signed-off-by: Fabio Estevam <> Tested-by: Shawn Guo <> Signed-off-by: Mark Brown <> (cherry picked from commit 29aa37cddfb9b721013ff28608200d73a9426368)
2014-09-16ASoC: sgtl5000: fix codec clock source transition to avoid clockless momentOskar Schirmer
Powering down PLL before switching to a mode that does not use it is a bad idea. It would cause the SGTL5000 be without internal clock supply, especially on the I2C interface, which would make subsequent access to it fail. Thus, in case of not using PLL any longer, first set the mode control, then power down PLL. Signed-off-by: Oskar Schirmer <> Signed-off-by: Mark Brown <> (cherry picked from commit e06e4c2d530fd4995c41083009647263ccd77d3b)
2014-09-16ASoC: sgtl5000: fix buggy 'Capture Attenuate Switch' controlLothar Waßmann
The SGTL5000 Capture Attenuate Switch (or "ADC Volume Range Reduction" as it is called in the manual) is single bit only. Signed-off-by: Lothar Waßmann <> Reviewed-by: Fabio Estevam <> Signed-off-by: Mark Brown <> (cherry picked from commit 65f2b226763bc348a9b9145aa5e17e7e3f6d8c35)
2014-09-16ASoC: sgtl5000: prevent playback to be muted when terminating concurrent captureLothar Waßmann
When a sound capture/playback is terminated while a playback/capture is running, power_vag_event() will clear SGTL5000_CHIP_ANA_POWER in the SND_SOC_DAPM_PRE_PMD event, thus muting the respective other channel. Don't clear SGTL5000_CHIP_ANA_POWER when both DAC and ADC are active to prevent this. Signed-off-by: Lothar Waßmann <> Reviewed-by: Fabio Estevam <> Signed-off-by: Mark Brown <> (cherry picked from commit f091f3f07328f75d20a2a5970d1f8b58d95fc990)
2014-09-16ASoC: sglt5000: Fix the default value of CHIP_SSS_CTRLFabio Estevam
According to the sgtl5000 reference manual, the default value of CHIP_SSS_CTRL is 0x10. Reported-by: Oskar Schirmer <> Signed-off-by: Fabio Estevam <> Signed-off-by: Mark Brown <> Cc: (cherry picked from commit 016fcab8ff46fca29375d484226ec91932aa4a07)
2014-09-16ASoC: sgtl5000: Fix VAG_POWER enabling/disabling orderMarek Vasut
The VAG_POWER must be enabled after all other bits in CHIP_ANA_POWER and disabled before any other bit in CHIP_ANA_POWER. See the SGTL5000 datasheet (Table 31, BIT 7, page 42-43). Failing to follow this order will result in ugly loud "POP" noise at the end of playback. To achieve such order, use the _PRE and _POST DAPM widgets to trigger the power_vag_event, where the event type check has to be fixed accordingly as well. Signed-off-by: Marek Vasut <> Signed-off-by: Mark Brown <> (cherry picked from commit dd4d2d6dfb49e8916064f2cb07f0ad7b32a82fb7)
2014-09-16ASoC: sgtl5000: Fix driver probe after resetFabio Estevam
After a 'reboot' command in Linux or after pressing the system's reset button the sgtl5000 driver fails to probe: sgtl5000 0-000a: Device with ID register ffff is not a sgtl5000 sgtl5000 0-000a: ASoC: failed to probe CODEC -19 imx-sgtl5000 sound.12: ASoC: failed to instantiate card -19 imx-sgtl5000 sound.12: snd_soc_register_card failed (-19) sgtl5000 codec does not have a reset line, nor a reset command in software, so after a system reset the codec does not contain the default register values from sgtl5000_reg_defaults[] anymore, as these are only valid after a power-on-reset cycle. Fix this issue by explicitly reading all the reset register values from sgtl5000_reg_defaults[] and writing them back into sgtl5000 to ensure a sane state. Signed-off-by: Fabio Estevam <> Tested-by: Eric Nelson <> Signed-off-by: Mark Brown <> (cherry picked from commit af8ee11209e749c75eabf32b2a4ca631f396acf8) Conflicts: sound/soc/codecs/sgtl5000.c
2014-09-03arm: tegra30: pcie: do not disable clk after deasserting resetsApalis_T30_LinuxImageV2.3Beta2_20140903Shreshtha SAHU
Do not disable and re-enable clocks after deasserting PCIE, AFI and PCIEX resets. Deasserting the resets should be followed by programming the PCIE. Bug 1521306 Change-Id: Idc43bc9b21cac3818852ed059fe512f4cd75b748 Signed-off-by: Shreshtha SAHU <>
2014-09-03uvcvideo: Add a mapping for H.264 payloadsStephan Lachowsky
Signed-off-by: Laurent Pinchart <> Signed-off-by: Mauro Carvalho Chehab <>
2014-08-04Revert "fbcon: workaround full screen custom boot logo issue and disable cursor"Colibri_T30_LinuxImageV2.3Beta1_20140804Colibri_T20_LinuxImageV2.3Beta1_20140804Apalis_T30_LinuxImageV2.3Beta1_20140804colibriMarcel Ziswiler
The whole rounding stuff really depends on a specific resolution. This reverts commit 4dd83942b418b937e3da02746baabf63f37fe682.
2014-08-04fbcon: workaround full screen custom boot logo issue and disable cursorRaul Munoz
Force round down in division calculating required logo height as preceding code did round up as follows: logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height); Which resulted in no boot-logo shown at all due to not enough lines being available. Additionally disable cursor for custom boot logo.
2014-08-04Revert "fbcon: workaround full screen boot-logo issue"Marcel Ziswiler
Using this unconditionally cuts the birds feet (;-p). This reverts commit 491f263ebfb338c59abfbde6d4e0e7256a0150fa.
2014-07-28ARM: 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 <> Tested-by: Alexander Holler <> Signed-off-by: Russell King <>
2014-07-28ARM: 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 <> Reviewed-by: Nicolas Pitre <> Signed-off-by: Dirk Behme <> Signed-off-by: Russell King <>
2014-07-26apalis/colibri t20/t30: enable vlan functionalityMarcel Ziswiler
Enable VLAN networking functionality. While at it also enable some more kernel modules for Apalis T30 PCIe based devices like the Intel E1000E NICs, Intel IWLAGN Wi-Fi cards, PCIe serial cards and XHCI based USB 3.0 controllers.
2014-07-26Revert "asoc: tegra20_ac97: fix sampling rate"Marcel Ziswiler
This reverts commit f162e88fc6aac0fef03c49c1ac596995a03ff134. Somehow NVIDIA's media player does not like it to be fixed as it starts stuttering like crazy at times. Still keep the dangerous time out handling clean-up. While at it get rid of the excessive dev_info() logging as well.
2014-07-25cgroup: remove synchronize_rcu() from cgroup_attach_{task|proc}()Li Zefan
These 2 syncronize_rcu()s make attaching a task to a cgroup quite slow, and it can't be ignored in some situations. A real case from Colin Cross: Android uses cgroups heavily to manage thread priorities, putting threads in a background group with reduced cpu.shares when they are not visible to the user, and in a foreground group when they are. Some RPCs from foreground threads to background threads will temporarily move the background thread into the foreground group for the duration of the RPC. This results in many calls to cgroup_attach_task. In cgroup_attach_task() it's task->cgroups that is protected by RCU, and put_css_set() calls kfree_rcu() to free it. If we remove this synchronize_rcu(), there can be threads in RCU-read sections accessing their old cgroup via current->cgroups with concurrent rmdir operation, but this is safe. # time for ((i=0; i<50; i++)) { echo $$ > /mnt/sub/tasks; echo $$ > /mnt/tasks; } real 0m2.524s user 0m0.008s sys 0m0.004s With this patch: real 0m0.004s user 0m0.004s sys 0m0.000s tj: These synchronize_rcu()s are utterly confused. synchornize_rcu() necessarily has to come between two operations to guarantee that the changes made by the former operation are visible to all rcu readers before proceeding to the latter operation. Here, synchornize_rcu() are at the end of attach operations with nothing beyond it. Its only effect would be delaying completion of write(2) to sysfs tasks/procs files until all rcu readers see the change, which doesn't mean anything. Signed-off-by: Li Zefan <> Signed-off-by: Tejun Heo <> Reported-by: Colin Cross <> Conflicts: kernel/cgroup.c
2014-07-25apalis/colibri t30: use hda hdmi audio and split sound initMarcel Ziswiler
Use HDA HDMI audio now on Colibri T30 as well allowing for up to 7.1 multi-channel playback. Split board sound initialisation between Apalis and Colibri T30 in order to distinguish better between default SPDIF being supported out-of-the-box on Apalis vs. this being an optional feature for the Colibri. Therefore remove SPDIF for the Colibri T30. While at it add csus clock required for vi_sensor camera master clock on Apalis T30 and clk_out_2/extern2 for Colibri T30, fix debug UART1 initialisation, get rid of spurious CONFIG_SND_USB enable and further clean-up both board platform data files.
2014-07-25apalis/colibri t30: make hda 2nd sound card hackMarcel Ziswiler
Hack HDA driver to make it the 2nd rather than the first sound card as the first one should be the SGTL5000 which is always present on our T30 modules. Especially on Ixora where there is no HDA codec on the carrier board HDA being the first sound card does not make much sense even more though as there was no primary device (e.g. device=hw:0,0).
2014-07-25apalis/colibri t20/t30: enable fhandle for systemdMarcel Ziswiler
Enable CONFIG_FHANDLE required for systemd >= 209 according to While at it put them all 3 on par concerning ARM Errata configuration.
2014-07-23apalis/colibri t30: fix issue with slow spdif clockMarcel Ziswiler
Fix issue with slow SPDIF clock by just doubling desired rate prior to doing any further calculations on it. BTW: A proper fix might involve overall clock doubler configuration.
2014-07-22apalis/colibri t20/t30: fix/introduce spi device controller dataMarcel Ziswiler
Fix (Colibri) resp. introduce (Apalis) SPI device controller data to properly use HW based chip select with one clock of setup and hold time each for both MCP2515 CAN controller(s) as well as spidev.
2014-07-21mmc: card: retry if transfer aborted due to out of rangeStefan Agner
This works around a issue we see when using eMMC 4.5 on tegra SDHCI host controller.
2014-07-21mmc: tegra: use 1.8V quirk only on affected instancesStefan Agner
The 1.8V quirk also affected the internal eMMC which disabled newer modes such as SDR50, SDR104 and DDR50. This in turn lead to an out of spec usage since the clock was still 50MHz. By creating a no_1v8 field in the platform data we can now enable this work around on a per-instance basis. Hence we enable the quirk only on the controllers which are connected to the external SD-slots.
2014-07-16arm: tegra3: PCIe Clock and Reset Conform to SpecificationEric Yuen
PCIe Reset line must be asserted for at least 100us after clock is enabled. PEX 2 Controller Register fix, offsets are not at constant intervals. Bug 1521306 Reviewed-on: http://git-master/r/225399 (cherry picked from commit df0760bf515236bed2e87e590509642ab72a01b5) Change-Id: I7b44ea51e7e02f2bca93cfc75ed85e01ab91fe03 Signed-off-by: Shreshtha Sahu <>
2014-07-14fbcon: workaround full screen boot-logo issueRaul Munoz
Force round down in division calculating required logo height as preceding code did round up as follows: logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height); Which resulted in no boot-logo shown at all due to not enough lines being available.
2014-07-08asoc: tegra20_ac97: fix sampling rateMarcel Ziswiler
The AC97 sampling rate is really fixed to 48 kHz at all times. While at it clean-up dangerous time out handling.
2014-07-08Linux playback channel fixDaniel Kochmanski
2014-07-08AC97 working capture deviceDaniel Kochmanski
2014-07-08media: vi driver on Colibri T20 is working againWojciech Bieganski
This commit resolves an issue of non-working vi camera driver on Colibri T20 occured after a l4t-r16-r4 merge.
2014-07-08media: AS0260 camera driver improvementsWojciech Bieganski
2014-05-09colibri t20/t30: add spi controller platform data for hw csMarcel Ziswiler
Add SPI controller platform data required for use of hardware chip selects. While at it pull-up SPI chip select pin due to NVIDIA's designers taking the term chip select a little too personal: they indeed only select a chip otherwise all the chip select pins are just left floating!
2014-05-09colibri t20/t30: clarify mcp2515 resetMarcel Ziswiler
The MCP2515 on the Colibri EvalBoard V3.1a actually uses regular system reset aka RESET_OUT# on SODIMM 87 to reset the MCP2515. Therefore clean-up resp. remove any MECS Tellurium legacy in that respect. While at it adjust copyright year, re-order some include, clean-up some struct spacing, re-order clocks and improve some comments.
2014-05-08media: enabled CSI mode in AS0260 camera driverWojciech Bieganski
2014-04-29arm: tegra: dc: disable dc when framebuffer off detectedStefan Agner
Don't initialize the whole display controller (dc) when framebuffer mode is set to off. This avoids creation of the /dev/tegra_dc_x device. The tegra X driver requires for each tegra_dc_x device an framebuffer device with the same id. This patch avoids creation of both, which makes the tegra X driver load correctly. Note: Turning off tegrafb0 still leads to kernel crash due to hard coded device enumeration.
2014-04-22can: mcp251x: fix locking in BERR counter functionalityMarcel Ziswiler
Symptoms: The interface stops receiving CAN frames when reception of CAN frame and call to the introduced get_berr_counter function coincide. Reproduction: Ip requests, among others, the berr field for the can interfaces. NOTE that it does so even if called as 'ip link show lo', as interface-based filtering is only done after the system calls to receive interface information. Run candump on a MCP-based can interface that has a lot of traffic (via 'cangen -g1' on another can node). On the system with the MCP chip, run while /bin/true; do ip link > /dev/null ; done; Reception of CAN-frames (as shown by candump) will cease within seconds. This issue got introduced by commit 1b59090a47101b4bf379d2c35986ad3f0bcb2aa1 as access to the SPI registers of the MCP251x were not locked. Issue report and patch courtesy David R. Piegdon of Indurad GmbH.
2014-04-22media: added improved Aptina AS0260 driverWojciech Bieganski
Driver features: 1. Supported formats: - Full HD, 1920x1080, 8.5 FPS, YUYV - VGA, 640x480, 30 FPS, YUYV 2. Available controls with enabled AE (auto exposure): - brightness [0...255], - contrast [16...64], - saturation [0...256], - hue [-2200...2200], - gamma [100...280]. 3. Works only in parallell interface mode (CSI in progress). 4. No external tools needed (for i2c).
2014-04-22media: image from analog cameras is back to full speedWojciech Bieganski
This commit restores the full framerate (25 FPS), after a drop to 16 FPS caused by a l4t-r16-r4 merge.
2014-04-22media: added camera settings per decoderWojciech Bieganski
This commit adds settings such as: - values of horizontal/vertical active start, - enabling/disabling internal sync, to the private data of decoders: MAX9526, ADV7180, TVP5150, OV7670 and AS0260. The feature is available through *_tegra_camera_platform_data struct initialised in board-*.c files.
2014-04-04media: fixes in board-*.c files for Colibri T20/T30 and Apalis T30Wojciech Bieganski
This commit fixes the crash that occures while loading tegra_v4l2_camera module caused by its new features (private data per sensor). updated files: arch/arm/mach-tegra/board-apalis_t30.c arch/arm/mach-tegra/board-colibri_t20.c arch/arm/mach-tegra/board-colibri_t30.c
2014-04-04media: symbol tegra_powergate_partition now exportsWojciech Bieganski
This commit fixes the kernel compilation error with the lack of the export of tegra_powergate_partition symbol in arch/arm/mach-tegra/powergate.c
2014-04-04media: a quick fix to make tegra_v4l2_camera module reloadableWojciech Bieganski
2014-04-04media: tegra_v4l2: add CSI pad calibrationBryan Wu
Bug 1369083 Change-Id: I1a81bcb62e8f6bb654ffbebba09661187ab4b512 Signed-off-by: Bryan Wu <> Reviewed-on: http://git-master/r/309536 Tested-by: Vikram Fugro <> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Kaustubh Purandare <> Reviewed-by: Winnie Hsu <> Reviewed-by: Matthew Pedro <>
2014-04-04media: tegra_v4l2: add dual camera supportBryan Wu
Add support for dual cameras from both CSI-A and CSI-B: - move all the CSI settings into video buffer struct - queue the video buffer struct to a dedicated queue - process one video buffer struct from the queue at one time Bug 1369083 Change-Id: Ie64d69282ab991b66e97327e288a2bacde088bd6 Signed-off-by: Bryan Wu <> Reviewed-on: http://git-master/r/246269 (cherry picked from commit 228b0c2d9ae3fa1121f88836626d654ae0fc4ff0) Reviewed-on: http://git-master/r/279987 Reviewed-by: Matthew Pedro <> Tested-by: Matthew Pedro <> Conflicts: drivers/media/video/tegra_v4l2_camera.c
2014-04-04media: tegra_v4l2: pass platform_data via soc_camera_linkBryan Wu
soc_camera_link supports passing power on/off control callback to soc_camera stack. So the power control can be handled by soc_camera stack instead of our Tegra V4L2 host driver. Also pass other platform_data fields via soc_camera_link instead of a hacking nvhost_device_data struct. Bug 1240806 Bug 1369083 Change-Id: I443a7d28196cc8292805da70d2d5ff1c3cd50a5d Signed-off-by: Bryan Wu <> Reviewed-on: http://git-master/r/246267 (cherry picked from commit 9083d270bf93b583cd5bf5151a52ea250f8541a3) Reviewed-on: http://git-master/r/279986 Reviewed-by: Matthew Pedro <> Tested-by: Matthew Pedro <> Conflicts: drivers/media/video/tegra_v4l2_camera.c