summaryrefslogtreecommitdiff
path: root/drivers/media
AgeCommit message (Collapse)Author
2012-05-14media: video: tegra: ov5640: add supportCharlie Huang
add ov5640 yuv sensor support - initial. bug 921322 Change-Id: I813afa8963e39afe475f9fdd43152cfaf1a16ae1 Signed-off-by: Charlie Huang <chahuang@nvidia.com> Reviewed-on: http://git-master/r/99506 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Frank Chen <frankc@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2012-05-04media: video: tegra: ov5650: read sensor fuse idCharlie Huang
The sequence of read fuse id is: 1. write to OTP index register 0x3d00. 2. read out byte from ox3d04. 3. repeat step 1 to the next byte with its index respectively. also fixed ov5650_read_reg always fail issue. bug 957657 Change-Id: I649a7765320d0d4be8111a7f523d8487b872b620 Signed-off-by: Charlie Huang <chahuang@nvidia.com> Reviewed-on: http://git-master/r/98330 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Wei Chen <wechen@nvidia.com> Reviewed-by: Frank Chen <frankc@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2012-05-01media: video: tegra: sh532u focus driverErik Lilliebjerg
- Abort initialization if an I2C error to avoid excessive load on the I2C bus since it is heavily used during initialization. - Updated to the latest NVC framework. - Added feature that allows for the key focus points to be set at runtime and the relative positions recalculated. Bug 929133 Bug 938934 Change-Id: Ida4ab885bf35057ae6df131e3ec3587a891a7dc9 Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com> Reviewed-on: http://git-master/r/93944 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-04-30media: video: tegra: ar0832: adjust frame rateJihoon Bang
Change line_length for 1080p mode in order to change frame rate from 31.30 to 29.50 fps. The reason that new fps is not 30 is because flicker detection requires fps not to be multiples of 60/50Hz. This change helps save power and lower the chance of frame drop. Bug 928296 Change-Id: I4fda13d9334c725754b3f5eab034309a1dfef3dc Signed-off-by: Jihoon Bang <jbang@nvidia.com> Reviewed-on: http://git-master/r/83636 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2012-04-24media: video: tegra: tegra_camera: re-arch power and clockJihoon Bang
There are a couple of issues found in tegra_camera. 1. clock enable/disable is controlled by user space. -> If client process crashes, there is no way to disable clock. 2. power enable/disable is associated with clock enable. -> There is no reason to relate power with clock. -> There is only one regulator for this driver. -> As same as #1, it may leave power up when client process crashes. 3. driver allows multiple clients to access. -> This is not the case for this driver. This changes addresses the problems described above. Bug 948780 Change-Id: Ie534771327175f56cf0e138f1c07096ddba470a8 Signed-off-by: Jihoon Bang <jbang@nvidia.com> Reviewed-on: http://git-master/r/92386 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
2012-04-23video: tegra: nvavp: Add force clock stay on APIHyung Taek Ryoo
Add nvavp_force_clock_stay_on ioctl which provides way for user-mode driver to stay on AVP clock state. This change is to fix LP0 resume fail during Widevine playback. Since VDE/BSEV clocks are used by OTF driver in secure world during closing sesssion, the change makes VDE/BSEV clocks running while entering LP0. Bug 960130 Bug 961015 Change-Id: I7eaaa9a33537a72b6ae0a016372bc513fef532e2 Reviewed-on: http://git-master/r/96302 Reviewed-by: Hyung Taek Ryoo <hryoo@nvidia.com> Tested-by: Hyung Taek Ryoo <hryoo@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Karan Jhavar <kjhavar@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
2012-04-19drivers: resolve compilation time warningsSanjay Singh Rawat
bug 949219 Change-Id: I5942ba86bd1cbe1f1bd06a7c9f51a10d83e6cabb Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/92819 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
2012-04-12video: tegra: nvavp: Remove T30 A01 workaroundJuha Tukkinen
Remove CONFIG_TEGRA_SMMU_BASE_AT_E0000000 workaround as T30 A01 is no longer supported. Change-Id: Ic47d0aa16c555bd7821416fff29d723924c6118b Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com> Reviewed-on: http://git-master/r/95645 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Peter De Schrijver <pdeschrijver@nvidia.com> Reviewed-by: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
2012-04-10video: tegra: dtv: Remove check for dma req list before cancellingLaxman Dewangan
Removing the checking whether dma req queue is empty or not before canceling/stopping dma. This function cannot guarantee correct result as there may be the race between hw and sw status update. If client wants to cancel dma req, it can directly call tegra_dma_cancel(). As the function tegra_dma_is_empty() does not return correct result, it will be depreciated from the dma apis. Change-Id: I3f5ebee8a7be345b02fcd8a69530c9b53207ef28 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/95090 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
2012-04-10nvavp: Add ioctl for wake_avpMandar Potdar
Add wake_avp ioctl which provides way for user-mode driver to simply wake-up the AVP. bug 914504 Change-Id: I3075ba944d39749559f2c340a4851902821c344f Signed-off-by: Mandar Potdar <mpotdar@nvidia.com> Reviewed-on: http://git-master/r/93877 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Gajanan Bhat <gbhat@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
2012-04-05dmaengine/dma_slave: introduce inline wrappersAlexandre Bounine
Add inline wrappers for device_prep_slave_sg() and device_prep_dma_cyclic() interfaces to hide new parameter from current users of affected interfaces. Convert current users to use new wrappers instead of direct calls. Suggested by Russell King [https://lkml.org/lkml/2012/2/3/269]. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> cherry-picked from mainline commit 16052827d98fbc13c31ebad560af4bd53e2b4dd5 Change-Id: I929a49556539621a0546829e88b3caa498c94be2 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/94463
2012-03-22video: tegra: nvavp: Fix for high SMMU apartureKaz Fukuoka
- With this fix NVAVP works with CONFIG_TEGRA_SMMU_BASE_AT_E0000000. Change-Id: I9c267bc9b008a57f6f0cc4e9b27dbee0501e6a77 Signed-off-by: Kaz Fukuoka <kfukuoka@nvidia.com> Reviewed-on: http://git-master/r/91316 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2012-03-20arm: tegra: nvmap: Update nvmap_alloc api.Krishna Reddy
Update nvmap_alloc api to take heap_mask as arg. This is to let clients specify the specific heap needed. Change-Id: I9950b3e60e6dac0301b6dc66be3e9d0bab8e0fee Signed-off-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-on: http://git-master/r/90471 Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User
2012-03-06drivers: media: tegra: Fix compilation errorChao Xu
Change-Id: If3a7c3911add67ff9f9aecd3c2b933a8553747f3 Signed-off-by: Chao Xu <cxu@nvidia.com> Reviewed-on: http://git-master/r/87313 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2012-03-02dtv: Added power management supportAdam Jiang
Added suspend/resume function in kernel model to support power management. fixed bug 914638 Change-Id: I2746710b6eba6d2528f27b4226383985e314943f Signed-off-by: Adam Jiang <chaoj@nvidia.com> Reviewed-on: http://git-master/r/86757 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-28media: tegra: avp: set emc to max for video onlyBharat Nihalani
emc should be set to MAX only in case of video and not otherwise Bug 941448 Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-on: http://git-master/r/85766 (cherry picked from commit 736072f72b468449246f5c943f87ce83092579c4) Change-Id: I8bda6c47a07534ef35305795449835364a129864 Reviewed-on: http://git-master/r/86306 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-23media: video: tegra: nvavp: Fix build warningHiroshi DOYU
Use correct type. Change-Id: Ic08214f97d721311dde07ac35664bc3b766ba131 Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/84948 Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2012-02-17dtv: Fixed file-private_data assigned errorAdam Jiang
NULL pointer caused kernel crash when tegra_dtv driver was opened. This patch fixed the bug. fixed Bug 940932 Change-Id: I09f8caff789ea8e1222f4afd9bf73ef890472583 Signed-off-by: Adam Jiang <chaoj@nvidia.com> Reviewed-on: http://git-master/r/84284 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2012-02-17media: video: ov14810: Add new 720p modeKrupal Divvela
Add a new 1280x720@120 fps - 4lane mode to ov14810 sensor. Bug 935663 Change-Id: I3e8e552071e41bf6932582ae3a0b2467b380eecd Signed-off-by: Krupal Divvela <kdivvela@nvidia.com> Reviewed-on: http://git-master/r/84041 Reviewed-by: Amit Arora <amita@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-16media: video: tegra: Set EMC rate to max when VDE is enabledPrashant Gaikwad
Do not set EMC rate to minimum when module other than VDE is enabled. This reverts the max rate set when VDE was enabled if VDE is still enabled. Bug 930230 Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> (cherry picked from commit 692291955e650c87b7cf6ecac03df2ef0445609d) Change-Id: Ief0e1d6116f064ba09b17ba01c7df0dc7905e0a0 Reviewed-on: http://git-master/r/84057 Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com> Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-15media: video: tegra: set camera emc clk preferenceshivabassu boragalli
Set camera emc clock to 300Mhz for T20. This change fixes the display corruption observed after video recording and adb cable is disconnected. Bug 930239 Signed-off-by: Shivabassu Boragalli <sboragalli@nvidia.com> Reviewed-on: http://git-master/r/83031 (cherry picked from commit 425cabdc52868d5dca9fd9cd9a82f18d41f0a957) Change-Id: I29b0d83f0cb3e69e48d25d896ff3c88c2e3e7673 Reviewed-on: http://git-master/r/83398 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2012-02-15ARM: tegra: nvavp: Fix a build errorHiro Sugawara
Change-Id: I6e010e39bc11291e6ff812185db0482e793784ea Reviewed-on: http://git-master/r/83577 Reviewed-by: Hiro Sugawara <hsugawara@nvidia.com> Tested-by: Hiro Sugawara <hsugawara@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
2012-02-14media: video: tegra: enable VCLK on tegra2shivabassu boragalli
yuv sensor on tegra2 uses VIP clock. This change enables VCLK pad to get external clock for VI. Bug 930769 Bug 936053 Change-Id: I4958d354a59dec0a92ca9b049ff22b7ca4cac0ad Signed-off-by: Shivabassu Boragalli <sboragalli@nvidia.com> Reviewed-on: http://git-master/r/83394 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-14media: video: ov14810: Don't reprogram uCKrupal Divvela
Do not reprogram the micro controller everytime camera is opened. Bug 935336 Change-Id: Ib9f67fce07332e15e812be7a9d4efef802a7bd58 Signed-off-by: Krupal Divvela <kdivvela@nvidia.com> Reviewed-on: http://git-master/r/83059 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Prayas Mohanty <pmohanty@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com>
2012-02-13media: video: tegra: nvavp: Fix resource cleanupKamal Kannan Balagopalan
Fix bug in releasing nvmap client handles when nvavp release is invoked. Bug 930028 Signed-off-by: Kamal Kannan Balagopalan <kbalagopalan@nvidia.com> Reviewed-on: http://git-master/r/78594 (cherry picked from commit 232e208f6c12d6112efe96f434b34c2b8c83d809) Change-Id: I94f6990dddf7e683adbd896e059ba1b5e5aa3a75 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/82708 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-01Merge remote-tracking branch 'origin/dev/k3.3-rc1-iommu' into ↵Rohan Somvanshi
android-tegra-nv-3.1 Change-Id: I9001bb291779f107bbcb593d48f9f0f734074d0e
2012-01-31media: fix corner case in tegra_mediaserverColin Patrick McCabe
Reviewed-on: http://git-master/r/77465 Change-Id: I653afbb6f766493e5d458b2ba4babb8e400c30c1 Signed-off-by: Colin Patrick McCabe <cmccabe@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78016 Reviewed-by: Automatic_Commit_Validation_User
2012-01-31media: tps61050: fix NVC_IOCTL_PWR_RDColin Patrick McCabe
Reviewed-on: http://git-master/r/77403 Change-Id: If51967720de2f4dc1634906fa263c693aef87d75 Signed-off-by: Colin Patrick McCabe <cmccabe@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78012 Reviewed-by: Automatic_Commit_Validation_User
2012-01-31tegra_mediaserver: Add missing mutex unlockRon Vaughn
Add a mutex_unlock() that was missing in the failure case of the mediasrv_unlocked_ioctl() function. Bug 918148 Reviewed-on: http://git-master/r/71470 Change-Id: Id935e2eadfcd5ca3ebf7a086afbcfd4224c52604 Signed-off-by: Ron Vaughn <rvaughn@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78008 Reviewed-by: Automatic_Commit_Validation_User
2012-01-30media: video: ov5650: add sensor group hold.Frank Chen
Grouphold gain and coarse_time register writes. Make gain and coarse_time set in one ioctl call. Bug 924213 Reviewed-on: http://git-master/r/74622 Change-Id: I648e4c24c1a048629757abc21afba092d1484d04 Signed-off-by: Yining Deng <ydeng@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77762 Reviewed-by: Automatic_Commit_Validation_User
2012-01-30media: video: tegra: nvavp: Fix suspend/resumeIsaac Richards
Mark host1x as busy only when clocks are enabled, instead of unconditionally at load/unload and suspend/resume time. Shutdown the avp device entirely during suspend, and restart it on resume if if necessary. Bug 929279 Reviewed-on: http://git-master/r/77054 Change-Id: I0c66c26302fe307bea396e1c547a67b3417e26ec Signed-off-by: Isaac Richards <irichards@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77749 Reviewed-by: Automatic_Commit_Validation_User
2012-01-30media: video: tegra: Override no regulator deviceNitin Pai
Dont fail if there is no regulator device. For all other cases return failure. Bug 898252 Reviewed-on: http://git-master/r/73026 Change-Id: Iab987a5d948cd7f3c3373cd3d12f52d480767772 Signed-off-by: Nitin Pai <npai@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77745 Reviewed-by: Automatic_Commit_Validation_User
2012-01-30media: video: tegra: return next avaiable clockJihoon Bang
tegra_camera_clk_set_rate sets the clock rate which is equal to or greater than requested clock rate. In this way, user space code doesn't have to scan through to find next available higher clock through system call. Remove setting VI/ICP clock to register directly. Bug 917641 Reviewed-on: http://git-master/r/75097 Change-Id: Iecbeacecb34c6b6f71228932ba4b046658ff905d Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77727 Reviewed-by: Automatic_Commit_Validation_User
2012-01-30media:video:tegra: Fix ov2710 stress test timeout issueFrank Chen
Put sensor to software standby mode before updating registers. This helps to sync sensor internal timing. Bug 914391 Reviewed-on: http://git-master/r/76148 Change-Id: I4ee0d918a0c792e0b40c14c9530002d3672be0f8 Signed-off-by: Frank Chen <frankc@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77307 Reviewed-by: Automatic_Commit_Validation_User
2012-01-24video: tegra: host: Access nvhost_master via drvdataTerje Bergstrom
Use standard drvdata interface for storing and accessing nvhost_master. Reviewed-on: http://git-master/r/72846 Change-Id: I191987c8f6d313a6ede9b59f723269cb6a197e8a Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/76815 Reviewed-by: Automatic_Commit_Validation_User
2012-01-24media: video: tegra: Add GPL license to torch and focuserPreetham Chandru
sh532u focuser driver, ssl3250a torch driver and tps61050 torch driver make references to kernel functions which are GPL-only symbols. L4T requires that these drivers be built as modules and without making it GPL compatible, the module fails to get loaded. Hence GPL license is added. Bug: 928498 Signed-off-by: Preetham Chandru R <pchandru@nvidia.com> Reviewed-on: http://git-master/r/76172 (cherry picked from commit 148d4d99066f904141c85a0fad36483bc1570d02) Change-Id: I11ab4b20bab504cb11b04a6e7746e0bae02d9fbf Reviewed-on: http://git-master/r/76786 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Amit Pandya <apandya@nvidia.com> Tested-by: Preetham Chandru <pchandru@nvidia.com> Reviewed-by: Kiran Adduri <kadduri@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-23iommu/omap: eliminate the public omap_find_iommu_device() methodOhad Ben-Cohen
Eliminate the public omap_find_iommu_device() method, and don't expect clients to provide the omap_iommu handle anymore. Instead, OMAP's iommu driver now utilizes dev_archdata's private iommu extension to be able to access the required iommu information. This way OMAP IOMMU users are now able to use the generic IOMMU API without having to call any omap-specific binding method. Update omap3isp appropriately. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Hiroshi Doyu <hdoyu@nvidia.com>
2012-01-23iommu/omap: eliminate the public omap_find_iommu_device() methodOhad Ben-Cohen
Eliminate the public omap_find_iommu_device() method, and don't expect clients to provide the omap_iommu handle anymore. Instead, OMAP's iommu driver now utilizes dev_archdata's private iommu extension to be able to access the required iommu information. This way OMAP IOMMU users are now able to use the generic IOMMU API without having to call any omap-specific binding method. Update omap3isp appropriately. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Hiroshi Doyu <hdoyu@nvidia.com> Conflicts: drivers/media/video/omap3isp/ispccdc.c Change-Id: Ia9b3421662fab7bb4bee298693ed6da716599ee5
2012-01-23iommu/core: Add bus_type parameter to iommu_domain_allocJoerg Roedel
This is necessary to store a pointer to the bus-specific iommu_ops in the iommu-domain structure. It will be used later to call into bus-specific iommu-ops. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Conflicts: drivers/iommu/iommu.c Change-Id: Iddbd561739552b663a4be293f1992314eb0f775a
2012-01-23iommu/omap: Fix build error with !IOMMU_SUPPORTJoerg Roedel
Without this patch it is possible to select the VIDEO_OMAP3 driver which then selects OMAP_IOVMM. But the omap iommu driver is not compiled without IOMMU_SUPPORT enabled. Fix that by forcing OMAP_IOMMU and OMAP_IOVMM are enabled before VIDEO_OMAP3 can be selected. Cc: Ohad Ben-Cohen <ohad@wizery.com> Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
2012-01-23omap: iommu: omapify 'struct iommu' and exposed APIOhad Ben-Cohen
Prepend 'omap_' to OMAP's 'struct iommu' and exposed API, to prevent namespace pollution and generally to improve readability of the code that still uses the driver directly. Update the users as needed as well. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Conflicts: arch/arm/plat-omap/include/plat/iommu.h arch/arm/plat-omap/include/plat/iovmm.h drivers/iommu/omap-iommu.c drivers/iommu/omap-iovmm.c drivers/media/video/omap3isp/isp.c drivers/media/video/omap3isp/isp.h drivers/media/video/omap3isp/ispccdc.c drivers/media/video/omap3isp/ispstat.c drivers/media/video/omap3isp/ispvideo.c Change-Id: I6e4825d93115596184ed3e2274fa759d13a5d6dc
2012-01-23omap: iommu/iovmm: move to dedicated iommu folderOhad Ben-Cohen
Move OMAP's iommu drivers to the dedicated iommu drivers folder. While OMAP's iovmm (virtual memory manager) driver does not strictly belong to the iommu drivers folder, move it there as well, because it's by no means OMAP-specific (in concept. technically it is still coupled with OMAP's iommu). Eventually, iovmm will be completely replaced with the generic, iommu-based, dma-mapping API. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Conflicts: arch/arm/plat-omap/Kconfig drivers/iommu/Kconfig drivers/iommu/Makefile Change-Id: Ie437869b8cbb92ea8fafc3d18333331a3b51ec06
2012-01-20DTV: dma: fixed dma burst size issue DTV xmitAdam Jiang
Since dtv interface was designed based on SPI bus, it shares the same dma configuration with SPI bus. However, it is not proper because DTV interface has to transmit data in 4 words long constantly. The patch added an option in tegra_dma_req to set burst size to be fixed 4 words. fixed Bug 910227 Change-Id: I1436f0c8d108dd39edc57ae4c9cb750d9574b62c Reviewed-on: http://git-master/r/75509 Reviewed-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Adam Jiang <chaoj@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/76461 Reviewed-by: Automatic_Commit_Validation_User
2012-01-16media: tegra: avp: Fix wrong cast of phys_addr_tKaz Fukuoka
- Avoid casting phys_addr_t to (void *) bug 917233 Change-Id: I3cfca66ea43341ec803268aa0e4c8496eab16047 Signed-off-by: Kaz Fukuoka <kfukuoka@nvidia.com> Reviewed-on: http://git-master/r/74377 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-on: http://git-master/r/75142 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-16media: video: tegra: set camera emc clk preferenceNathan Lord
Camera requires the emc clk to be a reasonable value, as sensors with high framerates and resolutions will stress memory bandwidth. Set to 150 MHz for now. It will likely need to be fine-tuned and possibly increased as sensors with higher framerates and resolutions come onto the market, but for power considerations it should only be bumped higher if camera really needs the extra throughput. Bug 913674 Change-Id: I3e900d1a3f468dd0181c42f5a47629fd3b9551b9 Reviewed-on: http://git-master/r/73891 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Nathan Lord <nlord@nvidia.com> Tested-by: Nathan Lord <nlord@nvidia.com> Reviewed-by: Jihoon Bang <jbang@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-on: http://git-master/r/75141 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-13Tegra: DTV: Added dtv driverAdam Jiang
Tegra2/3 has a dedicated Digital TV interface for receiving serial TS stream. This is the initial version for the DTV interface. The driver provided a device node as /dev/tegra_dtv and enabled several ioctls to configure hardware. User land applications could get serial TS data via system call read() on the device node. The read() operation is blocked io. Fixed Bug 904626 Fixed Bug 881303 Change-Id: Iad4629bed3c4c959b9178b387b084cdeaf7c3f69 Signed-off-by: Adam Jiang <chaoj@nvidia.com> Reviewed-on: http://git-master/r/66625 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bitan Biswas <bbiswas@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com> Reviewed-on: http://git-master/r/74891 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2012-01-12video: tegra: host: Move device data to nvhost_deviceTerje Bergstrom
Move all device data from nvhost_channeldesc, nvhost_moduledesc and nvhost_module to nvhost_device. nvhost_devices are also assigned into a hierarchy to prepare for implementation of runtime power management. Change-Id: I1e18daae8fe538086cd1f453d316e0f73e9d7d92 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/72844 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Reviewed-on: http://git-master/r/74560 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-11media: s5p-fimc: Use correct fourcc for RGB565 colour formatSylwester Nawrocki
commit f83f71fda27650ae43558633be93652577dbc38c upstream. With 16-bit RGB565 colour format pixels are stored by the device in memory in the following order: | b3 | b2 | b1 | b0 | ~+-----+-----+-----+-----+ | R5 G6 B5 | R5 G6 B5 | This corresponds to V4L2_PIX_FMT_RGB565 fourcc, not V4L2_PIX_FMT_RGB565X. This change is required to avoid trouble when setting up video pipeline with the s5p-tv devices, so the colour formats at both devices can be properly matched. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I192b2a0d9c24c2906af52aa69c7c386b9c505a82 Reviewed-on: http://git-master/r/74188 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-11media: omap_vout: Fix compile error in 3.1Gary Thomas
commit d1ee8878a142f81ea1b40d602c6360b752829437 upstream. This patch is against the mainline v3.1 release (c3b92c8) and fixes a compile error when building for OMAP3+DSS+VOUT Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Ief9a3646b41226da3aa5b7681e42a6e25a46e08b Reviewed-on: http://git-master/r/74182 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
2012-01-10media: video: tegra: change emc clk operation sequencePuneet Saxena
first set emc clock rate and then enable it to take effect of the operation. bug 882076 Reviewed-on: http://git-master/r/68611 (cherry picked from commit 57e48fefa323fabd2cfb52093e6b0a600a18e7b0) Change-Id: I69ad717ccbfd020202ed2f12390ae8b535ff127e Signed-off-by: Puneet Saxena <puneets@nvidia.com> Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-on: http://git-master/r/73705 Reviewed-by: Automatic_Commit_Validation_User (cherry picked from commit 8751a59f5cfd2fe4c0ed88b5417ebab7f04a447e) Reviewed-on: http://git-master/r/73966 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>