summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-12packaging: use upstream tagssandbox/pcoval/tizenPhilippe Coval1-0/+3
Change-Id: I19ec564fa7fb0e6b88ed64390efd33b430b25894 Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
2014-06-12ASoC: samsung: odroidx2/u3: Remove unnecessary system clock settingHuang Chao1-9/+0
This patch removes the redundant sysclk setting of odroid cpu_dai. Since the audio working mode has been changed from I2S master mode to I2S slave mode, so we don't need to set the cpu_dai I2S clock mode to operation any more. Besides, the hw_params function will set cpu_dai I2S sysclk to CDCCLK mode, which makes the cpu_dai to use the system clock generated by audio codec max98090. Change-Id: Ia09f9774c07d22991a706eff6553892b9d7ca39c Signed-off-by: Huang Chao <chao7.huang@samsung.com>
2014-06-12ASoC: samsung: odroidx2/u3: Add secondary I2S bind DAI linkHuang Chao1-0/+13
This patch enables the I2S0 secondary DAI and create a related audio playback device node, which will use the internal DMA (IDMA) platform driver for PCM data transfer. IDMA can support up to two channel sound for playback. Change-Id: If7a84437cf0dda6d018ced22f52e4e995b72f01c Signed-off-by: Huang Chao <chao7.huang@samsung.com>
2014-06-12ASoC: samsung: odroidx2/u3: Fix the checking out code style problemHuang Chao1-1/+1
This patch fix the redundant line continuation problem checked over: ./scripts/checkpatch.pl -f ./sound/soc/samsung/odroidx2_max98090.c WARNING: Avoid unnecessary line continuations \#52: FILE: sound/soc/samsung/odroidx2_max98090.c:52: + ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? \ total: 0 errors, 1 warnings, 145 lines checked ./sound/soc/samsung/odroidx2_max98090.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Change-Id: Idf5a7c8a57c06e5b35401c24141d740887c5d65c Signed-off-by: Huang Chao <chao7.huang@samsung.com>
2014-06-11usb: gadget: f_fs: resurect usb_functionfs_descs_head structureMichal Nazarewicz1-0/+7
Even though usb_functionfs_descs_head structure is now deprecated, it has been used by some user space tools. Its removel in commit [ac8dde1: “Add flags to descriptors block”] was an oversight leading to build breakage for such tools. Bring it back so that old user space tools can still be build without problems on newer kernel versions. Reported-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Reported-by: Krzysztof Opasiak <k.opasiak@samsung.com> Cc: <stable@vger.kernel.org> # 3.14 Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Commit taken from linux-usb mailing list. Not merged yet but required to fix build of FFS apps. Change-Id: I90fc3786f043aca9463e255ad9900c2d341fd17b Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2014-06-11ASoC: samsung: add audio interface support for BT, modem, idmaInha Song1-16/+56
- Support for BT and mode, add Digital Audio Interface 2 and 3. - Support for idma, modify Secondary DAI's cpu_dai_name and platform_name. Change-Id: I90fc3786f043aca9463e255ad3388c2d341fd17b Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11ASoC: samsung: Modify i2s driver to support idmaInha Song1-4/+21
i2s-sec driver uses the internal dma. Because ASoC idma devices are not registered as platform device, asoc_idma_platform_register() should be called for idma registration. Change-Id: Iaf7b0c0e3cdf66f4eda720cd705cf802c391d76b Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11arm: dts: exynos4: add i2s0 irq number for exynos4Inha Song1-0/+1
Add i2s0 irq number by referring to the GIC interrupt table of exynos4. Change-Id: I29cab56b672fa353f5acaecd34ed76804c182cbd Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11ASoC: Samsung: Add irq member in s3c_dma_params structInha Song1-0/+1
ASoC dma/idma devices are not registered as platform device any more. In order to save irq value, "irq" member is added to the s3c_dma_params data structure. Change-Id: I1bfd0cfd9a6b4d67582dddade52b4eb4822afcac Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11ASoC: Samsung: Don't register idma device as platform deviceInha Song2-23/+11
Previously, the ASoC idma was instantiated via a platform_device. But it was a virtual device with sole purpose to call snd_soc_register_platform(). Each Samsung DAI now registers the ASoC 'platform' itself. Change-Id: Ie1c9b2bdf5522dc085fe2bbb271cd9ceb86252f7 Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11usb: gadget: ffs: race between ffs_epfile_io() and ffs_func_eps_disable()Chao Bi1-0/+7
ffs_epfile_io() is called from userspace, while ffs_func_eps_disable() might be called from USB disconnect interrupt, the two functions would run in parallel but they are not well protected, that epfile->ep would be removed by ffs_func_eps_disable() during ffs_epfile_io() is referring this pointer, then it leads to kernel PANIC. The scenario is as below: Thread 1 Thread 2 | | SyS_read dwc3_gadget_disconnect_interrupt | | ffs_epfile_read reset_config | | ffs_epfile_io ffs_func_eps_disable | | ----- usb_ep_disable(): epfile->ep->ep->desc = NULL | | usb_ep_align_maybe(): ----- it refers ep->desc->wMaxPacketSize ----- Signed-off-by: Chao Bi <chao.bi@intel.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [backport from upstream commit 97839ca4b06ab27790700ad7da6be9a75fc0cc1d] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I97839ca4b06ab27790700ad7da6be9a75fc0cc1d
2014-06-11usb: gadget: f_fs: add missing spinlock and mutex unlockRobert Baldyga1-2/+6
This patch adds missing spin_unlock and mutex_unlock calls in error handling code. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [backport from upstream commit 48968f8d5f2234fb1768c55cf7d96d0b87446cd6] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I48968f8d5f2234fb1768c55cf7d96d0b87446cd6
2014-06-11usb: gadget: return the right length in ffs_epfile_io()Chuansheng Liu1-13/+15
When the request length is aligned to maxpacketsize, sometimes the return length ret > the user space requested len. At that time, we will use min_t(size_t, ret, len) to limit the size in case of user data buffer overflow. But we need return the min_t(size_t, ret, len) to tell the user space rightly also. [ balbi@ti.com: also fix comment's indentation ] Acked-by: Michal Nazarewicz <mina86@mina86.com> Reviewed-by: David Cohen <david.a.cohen@linux.intel.com> Signed-off-by: Chuansheng Liu <chuansheng.liu@intel.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [backport from upstream commit cfe919b53b807ab32e89e1c662c6d242948449bd] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: Icfe919b53b807ab32e89e1c662c6d242948449bd
2014-06-11usb: gadget: f_fs: Add flags to descriptors blockMichal Nazarewicz3-102/+91
This reworks the way SuperSpeed descriptors are added and instead of having a magic after full and high speed descriptors, it reworks the whole descriptors block to include a flags field which lists which descriptors are present and makes future extensions possible. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [backport from upstream commit 410b1f0e1c86443c57dc70d78db7aec193c79787] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I410b1f0e1c86443c57dc70d78db7aec193c79787
2014-06-11usb: gadget: f_fs: Add support for SuperSpeed ModeManu Gautam3-50/+147
Allow userspace to pass SuperSpeed descriptors and handle them in the driver accordingly. This change doesn't modify existing desc_header and thereby keeps the ABI changes backward compatible i.e. existing userspace drivers compiled with old header (functionfs.h) would continue to work with the updated kernel. Signed-off-by: Manu Gautam <mgautam@codeaurora.org> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [backport from upstream commit 8d4e897bd0150fab594a871484e554472ee01452] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I8d4e897bd0150fab594a871484e554472ee01452
2014-06-11usb: gadget: f_fs: fix aio supportMarek Szyprowski1-1/+1
Fix incompatible function signature caused by mainline backport Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I7913fd834366aa23fc9261c4d5548c03fa8085ec
2014-06-11ARM: odroidx2/u3: Fix interrupt line assignmentŁukasz Stelmach1-1/+1
According to circuit diagram[1] MAX98090 codec is hooked to GPX0[0] and not to GPX0[1]. [1] https://drive.google.com/file/d/0B4UPrML8Nk9lSk5aai1MQ1VVTmc/edit?usp=sharing Change-Id: I5d7d56c866dd4e7e6dcce744f43646babc7119d4 Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
2014-06-11ARM: dts: Exynos4412-odroid: set available memory to 2 GiBMarek Szyprowski2-2/+2
Both Odroid X2 and U2/U3 boards have 2 GiB of memory, so set the amount of memory in the DTS file to 2 GiB. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: If435a2bc15af15ddaede4f9664b144540cc620a6
2014-06-11ARM: Exynos: fix reboot hang on Odroid X2/U2/U3 with eMMC memoryMarek Szyprowski3-0/+102
Odroid X/X2/U2/U3 require special handling of SD4_nRESET_OUT line for eMMC memory to perform complete reboot. This patch adds code for performing such reset. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-id: I0dd05288da3d5e661772914cc853a1267609fc6d
2014-06-11arm: tizen_odroid_defconfig: enable l2cache and tizen global lockMarek Szyprowski1-5/+12
Enable Outer L2 CACHE controller and Tizen Global Lock. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: Ie2b56773ef69fa12c2a8788272ffd99c75c0a0d7
2014-06-11ARM: config: enable ISDB-T usb tuner stick of S870Liu Peiwen1-1/+42
ISDB-T usb stick S870 consists of DIB8000 tuner ,RC controller and usb interface, RC_CORE ,VIDEO_IR_I2C and MEDIA_RC_SUPPORT are enabled for supporting RC controller, DVB_USB for supporting USB interface,DVB_DIB8000 for supporting tuner component. Change-Id: I03a05c21762b133130ba22aa8d267b3b0b1b0740 Signed-off-by: Liu Peiwen <peiwen.liu@samsung.com>
2014-06-11drm/exynos: do hdmi power control by crtc DPMSJoonyoung Shim3-1/+12
The hdmi should turn off after mixer turns off by H/W limitation. Otherwise, the TV power domain is not disabled. Generally, first it's called DPMS function of encoder than DPMS function of crtc at from DPMS off to DPMS on. It can be solution about the H/W dependency to control hdmi power by crtc DPMS instead of encoder DPMS. Change-Id: I86e39c438453af5bcc19b7109d2e3569d629d52f Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-06-11drm: exynos: mixer: fix using usleep() in atomic contextTomasz Stanislawski1-1/+1
This patch fixes calling usleep_range() after taking reg_slock using spin_lock_irqsave(). The mdelay() is used instead. Waiting in atomic context is not the best idea in general. Hopefully, waiting occurs only when Video Processor fails to reset correctly. Change-Id: Ib2bf151cb4dcb45ab42e9d8f85bf27e1fab21757 Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
2014-06-11arm: tizen_defconfig: Disable unused configurationInha Song1-6/+3
This patch disable unused configuration - ASoC: SMDK_WM8994: Machine, PCM, S/PDIF driver Change-Id: I41fd503587fb7c0344add8b2a6db2f83ad1e9662 Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11ASoC: samsung: Expand odroidx2 compatible of match tableHuang Chao1-0/+1
This patch updates the compatible match table for odroid. Since the machine driver is not only used on odroidx2 board, but is also used on odroidu3 board, so it's better to expand the compatible match table string for compatibility concern. Change-Id: I668ab8236091d1336a0101142cbbadf6a0e23591 Signed-off-by: Huang Chao <chao7.huang@samsung.com>
2014-06-11arm: dts: trats2: change sound device nameInha Song1-1/+1
Change sound device name from "exynos4-wm1811" to "trats2-wm1811" Change-Id: Ibd94d99c1957359dd3a220dcb3908ca76c0700ce Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-06-11arm: config: tizen: update to enable AudioInha Song1-1/+1
The machine driver name was changed from "exynos4-wm1811" to "trats2-wm1811". Change-Id: I452b1321310d342a142e94e1671269e1e794b646 Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-05-30ASoC: Samsung: standardize machine driver namesInha Song3-36/+36
The machine driver name of the existing "exynos4-wm1811" is Inappropriate. Codec is dependent on board, not SoC. So, Change machine dirver name from "exynos4-wm1811" to "trats2-wm1811" to be used in trats2. Change-Id: I06149430562514485a10eb580ab722857662aa22 Signed-off-by: Inha Song <ideal.song@samsung.com>
2014-05-30dts: arm: exynos4412-trats2: define address/size-cellsChanho Park1-0/+3
This patch fixes compile warning when building a exynos4412-trats2.dtb. The two field should be defined in the parent node. Change-Id: I8cfab92992e8ebd3fb010c6bca73575c3d189f7f Signed-off-by: Chanho Park <chanho61.park@samsung.com>
2014-05-30drm/panel/s6e8aa0: add backlight supportAndrzej Hajda2-0/+57
The patch adds backlight support to s6e8aa0 panel. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Change-Id: I8cf8717c84da1619ceb8a0d841935255f917030d
2014-05-29DVB : frontend: enable no_poweroff to avoid firmware reloaded in xc5000 tunerLiu Peiwen1-1/+1
If open and close frontend cyclicly, firmware will be loaded repeatly without no_poweroff setting, and TV service can not tolorate the waste of time of loading firmware. Change-Id: I8a2276424a283a9d52e512e61a055c5375e6c15c Signed-off-by: Liu Peiwen <peiwen.liu@samsung.com>
2014-05-29Sound: Odroid: add DT binding document for OdroidChen Zhen1-0/+17
This patch adds binding document for the Samsung OdroidX2/U3. Change-Id: Ifd4cb398e939c14deb717bcb34d0ebb5a4cbb70e Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
2014-05-28au0828: Cancel stream-restart operation if frontend is disconnectedChangbing Xiong1-0/+2
If the tuner is already disconnected, It is meaningless to go on doing the stream-restart operation, It is better to cancel this operation. Change-Id: Ie63854352383cd300eb3626e63143e6a73d519d8 Signed-off-by: Changbing Xiong <cb.xiong@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-28ASoC: max98090: add DT binding document for MAX98090 CODECStephen Warren1-0/+43
This binding mainly serves to document the list of input and output pins that may be used in a sound card's audio routing table. Change-Id: I95e020b542edd908627f60f4fac9d11c2ab6d2b7 Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-26ASoC: samsung: set clk_id to 0 to avoid misunderstandingChen Zhen1-2/+2
it's obviously that codec driver has no routing handle for clk_id, so just supply 0 for it. Change-Id: I29b14ef8110b580a52502497728c049284b050a1 Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
2014-05-23ebtables: ebtables support enable in Tizen linux-3.10.Jacek Pielaszkiewicz1-1/+26
Change-Id: Ib9650cf5fca7139a68af88edbcfb2f90777d8227 Signed-off-by: Jacek Pielaszkiewicz <j.pielaszkie@samsung.com>
2014-05-23ASoC: samsung: set format constant in the dai_linkChen Zhen1-12/+2
Change-Id: I93731b6d92954be19f752a2b4283a611e7a793de Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
2014-05-20sii9234: Power on sii9234 only when MHL cable is connected.Jonghwa Lee1-2/+0
Change-Id: I9a1719f3e1f366bb9328fff48b6ada73022286e2 Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
2014-05-20Revert "regulator: Handle suspend and resume of regulators"Jonghwa Lee1-28/+0
This reverts commit bdc1383dd59ea144e4acdb97c6077c09f371df78. I revert the commit because it is not merged to ML. Change-Id: I8c616af1429a4c53d263c99baa05d35e379635e5 Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
2014-05-21PM / devfreq : Make exynos4 busfreq driver to use PPMU not DMC internal one.Jonghwa Lee4-104/+107
This patch modifies exynos4 busfreq driver to use global PPMU not DMC block's internal PMU. The PPMU has different event set with DMC's and it'll be more adaquate to profile bus utilization. Change-Id: Ia5f6801cf6081edf5c76cad2af86978843bdf91a Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
2014-05-16ASoC: samsung: use codec as master instead of I2S(slave)Chen Zhen1-55/+30
In order to don't change the EPLL, the reasonable way is to make the codec as master instead of i2s. Signed-off-by: Chen Zhen <zhen1.chen@samsung.com> Change-Id: Ia457d7625c9a87ac6c854176c0fe03f500923825 Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
2014-05-16clk: samsung: exynos4: Add ppmu clock's identical numberChanwoo choi1-0/+22
This patch add ppmu clock's identical number to get clock pointer on other device driver through DT binding. Change-Id: Ic55036e9c90409c8385dd365e75b4fbeefc0829c Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
2014-05-15PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugsSaravana Kannan1-11/+20
The current devfreq_update_status() has the following bugs: - If previous frequency doesn't have a valid level, it does an out of bounds access into the trans_table and causes memory corruption. - When the new frequency doesn't have a valid level, the time spent in the new frequency is counted towards the next valid frequency switch instead of being ignored. - The time spent on the previous frequency is added to the new frequency's stats instead of the previous frequency's stats. This patch fixes all of this. Change-Id: I9e3bb6ac6490d8f2e4bca2fd0d082f2fbd4a5b2e Signed-off-by: Saravana Kannan <skannan@codeaurora.org> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
2014-05-15PM / devfreq: create_freezable_workqueue() doesn't return an ERR_PTRDan Carpenter1-2/+2
The create_freezable_workqueue() function returns a NULL on error and not an ERR_PTR. Change-Id: If805c1068d00d3a2e6897c890475e35c780ef8c7 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
2014-05-15PM / devfreq: fix typo "CPU_EXYNOS4.12" twicePaul Bolle1-1/+1
Dependencies on CPU_EXYNOS4212 and CPU_EXYNOS4412 for the "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" were added in commit 7b4050381127ae11fcfc74a106d715a5fbbf888a ("PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412."). The tree (at that time, v3.3, and currently) makes clear that this should have been dependencies on SOC_EXYNOS4212 and SOC_EXYNOS4412. Change-Id: Ica470368f1e609199a5454d0de9d0448de2bccd2 Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
2014-05-15PM / devfreq: fix missing unlock on error in exynos4_busfreq_pm_notifier_event()Wei Yongjun1-0/+1
Add the missing unlock before return from function exynos4_busfreq_pm_notifier_event() in the error handling case. This issue introduced by commit 8fa938 (PM / devfreq: exynos4_bus: honor RCU lock usage) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> [Resolved path conflicts by MyungJoo Ham] Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Change-Id: I6fed109f21b18b458d7f0311961a85f5b2ba4756
2014-05-15PM / devfreq: add comments and DocumentationMyungJoo Ham3-0/+32
- Added missing ABI documents - Added comments to clarify the objectives of functions Change-Id: Ic2206ad6671156eedb28d450046e8e2ea876b18c Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Rajagopal Venkat <rajagopal.venkat@linaro.org>
2014-05-15PM / devfreq: account suspend/resume for statsRajagopal Venkat1-3/+12
devfreq stats is not taking device suspend and resume into account. Fix it. Change-Id: I224e046c15b40a384e6c548c6bd569e90a877945 Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
2014-05-15PM / devfreq: Add Exynos5-bus devfreq driver for Exynos5250Abhilash Kesavan6-0/+646
Exynos5-bus device devfreq driver monitors PPMU counters and adjusts operating frequencies and voltages with OPP. ASV should be used to provide appropriate voltages as per the speed group of the SoC rather than using a constant 1.025V. Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> [myungjoo.ham@samsung.com: minor style update] Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Jonghwan Choi <jhbird.choi@samsung.com> Cc: Kukjin Kim <kgene.kim@samsung.com> Change-Id: I9cfb1f88fc61623425f34013d7c0f3a9bb474c55
2014-05-15PM / devfreq: Move exynos4 devfreq driver into a new sub-directoryAbhilash Kesavan3-2/+4
In anticipation of the new exynos5 devfreq and ppmu driver, create an exynos sub-directory. Move the existing exynos4 devfreq driver into the same. Change-Id: I4734de3aa1da881996c580145cdc2f78d8df2553 Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>