Jiyoung Jeong [Thu, 26 Jul 2018 09:28:00 +0000 (18:28 +0900)]
[9610] dirvers: modem_if: Handling dsds from persist.radio.multisim.config
Change-Id: I2d7880bac84daa8b242d2eda4576e95a32d2152a
Signed-off-by: Jiyoung Jeong <ji_0.jeong@samsung.com>
kiwoo Kwon [Wed, 1 Aug 2018 03:35:10 +0000 (12:35 +0900)]
[9610] arm64: dts: add pinctrl for nfc clkout1
Change-Id: Ia611bbbe4d3211c21550425b4e9111f7a3869446
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>
Jaehyoung Choi [Fri, 3 Aug 2018 03:14:50 +0000 (12:14 +0900)]
[COMMON] Fix CHUB, NFC build error
Change-Id: Id0243a801771368c17a7acb6d92a4525646f8658
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Boojin Kim [Wed, 18 Jul 2018 03:48:00 +0000 (12:48 +0900)]
[COMMON] chub: ipc: update ipc version (180725)
Change-Id: Ic950bd75ce4db9c42271cd3c15eb8e8a3213a4ae
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Thu, 26 Jul 2018 07:32:47 +0000 (16:32 +0900)]
[COMMON] drivers: soc: cal-if: update shub pmucal
Add to set bira information from OTP
Change-Id: I84001bdc9e8489f02a3a4f70e9425cf74966e344
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Wed, 11 Jul 2018 07:06:40 +0000 (16:06 +0900)]
[COMMON] chub: add board clock control
Change-Id: I45f36d0b88a0969e50fe2f1254b21cbe927257b6
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Sukwon Ryoo <sw.ryoo@samsung.com>
Boojin Kim [Wed, 11 Jul 2018 06:55:47 +0000 (15:55 +0900)]
[9610][ERD] dtsi: chub: add board dt for chub
Change-Id: I8d4abf4e182a118cb5651eb6d92ff403e847c6df
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Wed, 11 Jul 2018 01:23:42 +0000 (10:23 +0900)]
[COMMON] chub: update ipc log
Change-Id: Id0de1fe62825bc7ced85a611fa0e6661ab4ba0ed
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Wed, 4 Jul 2018 02:13:55 +0000 (11:13 +0900)]
[COMMON] chub: nanohub: don't reset on chub error status
Change-Id: I9de4781534031db97eac28e0ecd160d46cb31cec
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Mon, 2 Jul 2018 12:40:59 +0000 (21:40 +0900)]
[COMMON] chub: add itmon notifier
Change-Id: I9c2147ebd3f58e3a4afde843dc0674f07b91607f
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Boojin Kim [Tue, 10 Jul 2018 02:18:49 +0000 (11:18 +0900)]
Revert "chub: disable silent-reset"
This reverts commit
cf3574b499e6edc410de2ff3fc124457a1608db2.
Change-Id: I7ae071d5241783d846a9ca403d0545b83153b144
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
kiwoo Kwon [Wed, 1 Aug 2018 03:55:36 +0000 (12:55 +0900)]
[9610] add nfc driver
Change-Id: Ic09739f15ba007780774a3d515411aaf8205862a
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>
kiwoo Kwon [Wed, 1 Aug 2018 03:53:04 +0000 (12:53 +0900)]
[9610][ERD] configs: run savedefconfig for nfc
Change-Id: I48fdef09ce0803fddf332860889454e4022c0213
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>
kiwoo Kwon [Wed, 1 Aug 2018 03:44:31 +0000 (12:44 +0900)]
[9610][ERD] dts: add nfc driver and LDO37 config for nfc
Change-Id: I273b4a7c4bfab2d820a8679380e8c3bd30cc1669
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>
Sangkyu Kim [Tue, 31 Jul 2018 07:12:33 +0000 (16:12 +0900)]
[COMMON] arm64: fix conflict file related cpu
Change-Id: I678a907cc4a6e0a6ca3604165ddbcda8b445db60
Signed-off-by: Sangkyu Kim <skwith.kim@samsung.com>
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Youngwan Kim [Tue, 31 Jul 2018 05:29:10 +0000 (14:29 +0900)]
[COMMON] lib: libdss: Modify build script using Makefile variable
Change-Id: I51114809b01cce728d26368787ecdd5a08389371
Signed-off-by: Youngwan Kim <y103.kim@samsung.com>
Cho KyongHo [Tue, 31 Jul 2018 06:44:20 +0000 (15:44 +0900)]
media: vb2-core: remove unused variables
Change-Id: I15c473297a591bdd78d729ec102202d0475778a4
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
Jaehyoung Choi [Tue, 31 Jul 2018 07:16:22 +0000 (16:16 +0900)]
[COMMON] Fix various files for build error
modified: drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c
modified: drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c
modified: drivers/media/radio/s610/radio-s610.c
modified: drivers/soc/samsung/debug/exynos9610-itmon.c
modified: drivers/staging/nanohub/chub.c
modified: drivers/staging/nanohub/main.c
modified: drivers/usb/dwc3/core.c
modified: drivers/usb/dwc3/gadget.c
Change-Id: I9a3c871cf7af204d7ada67d041ade593794cf98c
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Cho KyongHo [Tue, 31 Jul 2018 06:44:04 +0000 (15:44 +0900)]
android: ion: fix merge conflict
Change-Id: I67384400657ce896baccc67e7f94ac7bd2988116
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
Jaehyoung Choi [Tue, 31 Jul 2018 07:23:16 +0000 (16:23 +0900)]
[COMMON] Fix various file for merge conflict
modified: arch/arm64/include/asm/cputype.h
modified: arch/arm64/include/asm/simd.h
modified: arch/arm64/kernel/process.c
modified: drivers/cpufreq/cpufreq_times.c
modified: drivers/usb/dwc3/core.c
modified: include/linux/cpufreq_times.h
modified: include/linux/fscrypt.h
modified: include/linux/fscrypt_notsupp.h
modified: kernel/sched/cpufreq_schedutil.c
modified: kernel/sched/cputime.c
modified: net/netfilter/xt_qtaguid.c
Change-Id: I1604d7ee8166932e5329c188c4edb1c828202234
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Hyunki Koo [Mon, 28 May 2018 07:51:05 +0000 (16:51 +0900)]
[COMMON] soc: samsung: exynos-reboot: Add reboot mode
This patch add recovery and fastboot modet
Change-Id: If8c490f3ec23c88e16718aed6d1a03da02ce48a4
Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com>
Soomin Kim [Mon, 30 Jul 2018 10:30:32 +0000 (19:30 +0900)]
[COMMON] thermal: samsung: Resolve conflict
TMU driver has faced with conflict during
kernel minor upgrade. This is caused by
'exynos_tmu.c' is maintained. So, redundant
code is removed.
Change-Id: I7c2b530668c89845599eaeba4537bd2c0ea60855
Signed-off-by: Soomin Kim <sm8326.kim@samsung.com>
Kisang Lee [Mon, 30 Jul 2018 10:48:27 +0000 (19:48 +0900)]
[9610] usb: dwc3: modify code to fix conflict
Change-Id: I99a9bd21bc713548e267fe9d6515264cc95d44b5
Signed-off-by: Kisang Lee <kisang80.lee@samsung.com>
JaeHun Jung [Mon, 30 Jul 2018 11:26:08 +0000 (20:26 +0900)]
[COMMON] mmc: dw_mmc: Fix minor version merge conflict
Change-Id: I7821c349ada1c4e516de0217004e98f45890cd01
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>
Kyungwoo Kang [Tue, 31 Jul 2018 00:04:57 +0000 (09:04 +0900)]
[9610] serial: samsung: Fix conflict for ERD minor up
Change-Id: I0f77abb692169085c751e04a077b7ebbe2c343e1
Signed-off-by: Kyungwoo Kang <kwoo.kang@samsung.com>
Jaehyoung Choi [Mon, 30 Jul 2018 09:19:22 +0000 (18:19 +0900)]
Merge commit '
818299f6bdae' into android-exynos-4.14-ww-9610-minor_up-dev
Change-Id: If392685ce2016eb81671b5788a2c45c8be4d8901
Jaehyoung Choi [Mon, 30 Jul 2018 05:46:15 +0000 (14:46 +0900)]
Revert "[9610] vipx : adds driver files"
This reverts commit
a9687ded4651f0432d9f94965c59e53f883a9cf3.
Change-Id: I6a965c6259f317cf78dcec9f0003c84cf162e57a
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:45 +0000 (14:45 +0900)]
Revert "[9610] drivers: leds: modified leds-s2mpb02.c due to change of kernel version"
This reverts commit
959521d19fd728d1197e24371c63657a3b6c5ec2.
Change-Id: Ifd6753ccb0eccdb1a433b057388f1b6449678ca5
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:43 +0000 (14:45 +0900)]
Revert "[9610][ERD] dtsi: modify erd9610 Flash GPIO syntax"
This reverts commit
cb934d1ac8c764239d521b960437b973f5d40d58.
Change-Id: Ie98e7d24c997b17932fab014b348df4dc74b34f8
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:42 +0000 (14:45 +0900)]
Revert "[HACK] drivers: leds: disable s2mpb02 FLED1 fault shutdown control"
This reverts commit
cea420834233fd03aa7bfe1ba553951a5520260e.
Change-Id: I913e762cdddd5fc22f206c9e7cfd503fcb96fcc8
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:40 +0000 (14:45 +0900)]
Revert "[9610] bcm: disable debug configuration"
This reverts commit
2e510c7b1848f4dfb1dd946bae24195882c6f6f9.
Change-Id: Ie090936416c24a33dbc5b8c97661cb5ec4929fea
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:38 +0000 (14:45 +0900)]
Revert "[HACK][COMMON] fimc-is2: featured size check between per-frame and s_fmt size"
This reverts commit
3f6dd326a2c22bc461a987b0d05c44ca40bb9b9a.
Change-Id: Iaa9f81d4cc252d3e697dd7293325ce68feac435a
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:37 +0000 (14:45 +0900)]
Revert "[HACK][9610] fimc-is2: add DISABLE_CHECK_PERFRAME_FMT_SIZE define"
This reverts commit
3227a5b0833e9cf5e8a378dabdebc252c83573bb.
Change-Id: I71548849194b137e82bf2011a1f8b5c2f96b95ca
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:33 +0000 (14:45 +0900)]
Revert "[9610] fimc-is2: Modify a scenario for DVFS"
This reverts commit
2097f1078f5ceedcb2fd35a4d02311dd1e41f2bd.
Change-Id: I48fefb702ed190fcb041ff79ff12df86e4e9b787
Jaehyoung Choi [Mon, 30 Jul 2018 05:45:32 +0000 (14:45 +0900)]
Revert "[9610] dtsi: Change are DVFS levels match to scenarios"
This reverts commit
7770d276142164e6f7677edb9b4e20f6b8a95c55.
Change-Id: Ib8899b13c0c4353f574bd4208d16f527a7fcdc95
dan huh [Mon, 23 Jul 2018 07:59:09 +0000 (16:59 +0900)]
[9610] dtsi: Change are DVFS levels match to scenarios
PR JIRA ID: CPR-89
Change-Id: Ib85e2cd6ba527269fdf71a9a05094ce9efdc2158
Signed-off-by: dan huh <dan.huh@samsung.com>
dan huh [Fri, 20 Jul 2018 02:17:14 +0000 (11:17 +0900)]
[9610] fimc-is2: Modify a scenario for DVFS
PR JIRA ID: CPR-89
Change-Id: I5ebb2f68b94272aa9a91710bdd154877c0e46f72
Signed-off-by: dan huh <dan.huh@samsung.com>
Wooyeon Kim [Wed, 25 Jul 2018 05:08:00 +0000 (14:08 +0900)]
[HACK][9610] fimc-is2: add DISABLE_CHECK_PERFRAME_FMT_SIZE define
PR JIRA ID: CPR-90
Change-Id: Ida4f542b49b7f467a97b0a63b677588ce29fc2f2
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Wooyeon Kim [Wed, 25 Jul 2018 05:04:13 +0000 (14:04 +0900)]
[HACK][COMMON] fimc-is2: featured size check between per-frame and s_fmt size
- for support Full device reprocessing in 1x3 MC-SC
per-frame image format changing & buffer size changing is needed
- for not affect V4l2 limitation, s_fmt size need to set to smaller than
per-frame size. and feature size checking between per-frame and s_fmt
PR JIRA ID: CPR-90
Change-Id: Ib966612002265c908a169bebbb67abf7eb9d09db
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Jaejoon Yoo [Wed, 25 Jul 2018 05:05:55 +0000 (14:05 +0900)]
[9610] bcm: disable debug configuration
Change-Id: I21e0478ca60e10bed80829fad480aba3e4131b38
Signed-off-by: Jaejoon Yoo <joonyj7.yoo@samsung.com>
Jieun Yi [Mon, 23 Jul 2018 02:51:07 +0000 (11:51 +0900)]
[HACK] drivers: leds: disable s2mpb02 FLED1 fault shutdown control
Change-Id: I9a3f3e34d985dad0c04bda6b4cd9a8762d71513a
Signed-off-by: Jieun Yi <jieun.yi@samsung.com>
Wooyeon Kim [Mon, 23 Jul 2018 04:34:11 +0000 (13:34 +0900)]
[9610][ERD] dtsi: modify erd9610 Flash GPIO syntax
Change-Id: I97f8f6cb30b6d2af03092610fee26790a5aaef63
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Jieun Yi [Tue, 10 Jul 2018 06:34:54 +0000 (15:34 +0900)]
[9610] drivers: leds: modified leds-s2mpb02.c due to change of kernel version
Change-Id: Id1d5f538968f55ae94a6c66203ae4f85ab6c5ca7
Signed-off-by: Jieun Yi <jieun.yi@samsung.com>
Tae-Sik Lee [Wed, 25 Jul 2018 08:34:59 +0000 (17:34 +0900)]
[9610] vipx : adds driver files
Change-Id: Iafe587895d40ac68d131abce07fd5d056212e0bd
Signed-off-by: Tae-Sik Lee <zmin.yi@samsung.com>
Wanhyuk Seo [Tue, 24 Jul 2018 12:01:03 +0000 (21:01 +0900)]
Revert "[9610] media: radio: Modify clock management"
This reverts commit
a92d4ab30b96f292f17ae316c671f7568b601da6.
Change-Id: Ifaec3e608d2c1c459bb42497dc88b6115075ab75
Yunsu Kim [Fri, 13 Jul 2018 01:35:15 +0000 (10:35 +0900)]
[9610] media: radio: Modify clock management
Change-Id: Idb071669f52c5536c9b215803d706541b65354d5
Signed-off-by: Yunsu Kim <iamyunsu.kim@samsung.com>
Nick Oestergaard [Mon, 9 Jul 2018 14:17:04 +0000 (16:17 +0200)]
[9610] wlbt: Move /efs to /mnt/vendor/efs
In Android P, Google forced that a "RW dir" cannot be located in root.
This is a problem when using system-on-root.
SCSC-Bug-Id: SSB-41783
Change-Id: Id3abf12573ebf3f88bfb3b0c527dd0340d58637e
Signed-off-by: Nick Oestergaard <nick.oe@samsung.com>
Nick Oestergaard [Mon, 9 Jul 2018 14:17:30 +0000 (16:17 +0200)]
[9610] wlbt: Let kernel driver present a fallback bdaddr
A new kernel module parameter with a suggested address that the host
stack can use as a fallback. We use the SOC ID as is used if there is
no android stack, i.e. btcli. This will make sure we do not touch that
stack and the address will be the same in btcli as is used by the stack.
SCSC-Bug-Id: SSB-41759
Change-Id: Iff679b464622920e01fe617f32ee98ab23fdf1d8
Signed-off-by: Nick Oestergaard <nick.oe@samsung.com>
Soren Andersen [Fri, 3 Nov 2017 00:38:45 +0000 (01:38 +0100)]
[9610] wlbt: Added support for ANT recovery
Added support for recovery for the ANT driver
Change-Id: Ieed2671f71a44962a75d137478382eedc29b13c3
SCSC-Bug-Id: SSB-33203
Signed-off-by: Soren Andersen <s.andersen@samsung.com>
Albert Cano [Wed, 11 Jul 2018 14:44:14 +0000 (15:44 +0100)]
[9610] wlbt: move closing bracket in .wifiver.info
Move move closing bracket in .wifiver.info based on
customer requirements.
Change-Id: I513d857f6f64316781e75423ccd11934851970ef
SCSC-Bug-Id: SSB-41822
Signed-off-by: Albert Cano <a.canocamps@samsung.com>
Pragya Gupta [Thu, 12 Jul 2018 07:02:06 +0000 (12:32 +0530)]
[9609][7885] [7872] wlbt: Update skb length in roam vendor event
skb length updated for roam vendor event
SCSC-Bug-Id: SSB-41838
Change-Id: Ifa44d7062ccdb723dfa4b14e45713c9baaffe1a4
Signed-off-by: Pragya Gupta <pragya.gupta@samsung.com>
Roman Geller [Fri, 6 Jul 2018 14:32:10 +0000 (15:32 +0100)]
[9610][7885][7872][7570] wlbt: Reduce mifram min alloc block to 64 bytes
Reduced granularity of miframman allocator to 64 bytes,
as this is the Cortex R cache line size.
Change-Id: If9260e837750bd138cd19c3066fe4f0385154f4f
SCSC-Bug-Id: SSB-41587
Signed-off-by: Roman Geller <r.geller@samsung.com>
(cherry picked from commit
9f564e0ee5377eb55d2ce632f8e77d42b0d4b922)
scsc_gerrit [Tue, 17 Jul 2018 17:52:24 +0000 (18:52 +0100)]
[9610] wlbt: increment scsc_release to 6.36.2
Import FW for iteration 6.36.2
Change-Id: Ia96a8caebaf79ef6353980c5cd177e4bb73e3c85
SCSC-Bug-Id: scsc_iteration_6.36.2_p_ww
Signed-off-by: scsc_gerrit <scsc_gerrit@samsung.com>
Wooyeon Kim [Mon, 23 Jul 2018 05:22:46 +0000 (14:22 +0900)]
[COMMON] fimc-is2: fix a build error about tdnr using case
PR JIRA ID: CPR-78
Change-Id: I25b5f615bb0e9f5b2f8504e353858a309680046b
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Wooyeon Kim [Sat, 21 Jul 2018 11:16:57 +0000 (20:16 +0900)]
[COMMON] fimc-is2: add prototype function for mcsc v410 build error
- after code is synced, it need to fix it
PR JIRA ID: CPR-78
Change-Id: I0d51cdb5d16e4f267686b375a63bdd71e7a49240
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Sunmi Lee [Wed, 14 Jun 2017 07:28:08 +0000 (16:28 +0900)]
[COMMON] media: fimc-is2: Fix bugs of TDNR and enable YIC
PR JIRA ID: CPR-24
Change-Id: Ie01b8cf0b594db4d5c4c5d6e92e7fceca74f7309
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Wooyeon Kim [Fri, 1 Jun 2018 07:24:56 +0000 (16:24 +0900)]
[COMMON] fimc-is2: fix a TDNR wrong caculation bug
- when NI is set to same setfile NI value,
it is not applied to right value.
PR JIRA ID: CPR-40
Change-Id: Id1cae98d3731d2e874f71435eea4f49280e6971c
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 08:39:03 +0000 (17:39 +0900)]
[COMMON] fimc-is2: Fix a bug of devide by zero
There is a possiblity to execute of dividing by zero in CALC_LNR_INTRPL.
PR JIRA ID: CPR-39
Change-Id: Idb23bc03b5622b79dadc5ebac184a7bc8e4018c6
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 02:10:12 +0000 (11:10 +0900)]
[COMMON] fimc-is2: Implementation of uvsp
UVSP function is controlled by noise_index (this value from ISP).
So it is needed to calculate the proper value with using linear interpolation by noise_index.
New functions were added to support uvsp.
PR JIRA ID: CPR-39
Change-Id: Id9b27ace9a2e663091f0901258b95b20a304bfbe
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 06:54:13 +0000 (15:54 +0900)]
[COMMON] fimc-is2: Changed the name of variables related to UVSP
To increase the readability, name of variables was shortened.
PR JIRA ID: CPR-39
Change-Id: I46852d5ff8125c81669dd10c7471af6affa009bb
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 02:12:50 +0000 (11:12 +0900)]
[COMMON] fimc-is2: Added debug log message in hw_mcsc_update_cac_register
To make debugging easily, the log message was added.
PR JIRA ID: CPR-39
Change-Id: Ib9500abb556d1b52353d1361fffd7056c98699aa
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 02:03:13 +0000 (11:03 +0900)]
[COMMON] fimc-is2: Added debug log message in get_cal_data function
To make debugging easily, the log message was added.
PR JIRA ID: CPR-39
Change-Id: I99c51a498f445fa6aa53b6e53e8b45199a6a2ce9
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 08:14:51 +0000 (17:14 +0900)]
[COMMON] fimc-is2: Implementation of newly added data in using shot_ext
In hw-3aa shot function, frame information for uvsp was written in shot_ext.
Also cal_data was saved in fimc_is_hardware in apply_setfile funciton.
PR JIRA ID: CPR-39
Change-Id: I19f79af152691aea5f1ddf73d75c7928145843e7
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 6 Jul 2018 01:58:29 +0000 (10:58 +0900)]
[COMMON] fimc-is2: Added new data in shot_ext
UVSP in MCSC needs the value of LSC_CENTER from CGRAS in 3AA and RADIAL_BIQUAD value in 3AA.
Driver calls the get_cal_info function to DDK, DDK fills the values in cal_info.
These values are need to be sync with frame. So the new data was added in shot_ext.
PR JIRA ID: CPR-39
Change-Id: I44e57317a30865733349f037298e49c69dd81fcd
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 06:04:57 +0000 (15:04 +0900)]
[COMMON] fimc-is2: Implementation of setting scaler bchs_clamp by setfile
To support new method of setting scaler bchs_clamp.
PR JIRA ID: CPR-34
Change-Id: I585b9fecd1c450f3d85bc6cfead05f83c8da44c4
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 05:56:55 +0000 (14:56 +0900)]
[COMMON] fimc-is2: Fix a compiling error
There was a compiling error when USE_YUV_RANGE_BY_ISP was turned off.
PR JIRA ID: CPR-34
Change-Id: I74ac4fb50d57a432b98d59493f7cfe565364b662
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 05:47:51 +0000 (14:47 +0900)]
[COMMON] fimc-is2: Added a missing ';'
There was a compiling error when USE_YUV_RANGE_BY_ISP was turned off.
PR JIRA ID: CPR-34
Change-Id: I0cb0aab3662dd3a5d31937e9072c58367e0090c8
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 05:41:06 +0000 (14:41 +0900)]
[COMMON] fimc-is2: Modified the implementation of hw_bchs_range/clamp
To increase the readability, hw_bchs_range/clamp function was changed.
From the MCSC setfile version 0x14027432, scaler_bchs_clamp should be controlled by setfile.
This patch is preparation for applying new method.
PR JIRA ID: CPR-34
Change-Id: If7b0efe91d02eb25cc0cfb1afee0f323e933b14e
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 05:00:02 +0000 (14:00 +0900)]
[COMMON] fimc-is2: Implementation of setting scaler coefficient by setfile
To support new method of setting scaler coefficient.
PR JIRA ID: CPR-33
Change-Id: Iaabe0ac0e336c041c1a895b90904f40d6ed51a26
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 04:59:17 +0000 (13:59 +0900)]
[COMMON] fimc-is2: Added new function to keep compatibility - set_scaler_coef
Added scaler_coef related function for mcsc v4.0 and v4.10.
PR JIRA ID: CPR-33
Change-Id: Id5b2408065fe25bb4fbc2aa03d15ef5d8b76187c
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 04:57:42 +0000 (13:57 +0900)]
[COMMON] fimc-is2: Added new argument in set_poly/post_scaler_coef function
To support new method of setting scaler coefficient, new argumnet was added in function.
PR JIRA ID: CPR-33
Change-Id: I322ffcd9ebd60dfe28ef57af827c81cd54d4ab3a
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Wed, 4 Jul 2018 02:40:06 +0000 (11:40 +0900)]
[COMMON] fimc-is2: Modified the implementation of set_poly/post_scaler_coef
To increase the readability, set_poly/post_scaler_coef function was changed.
From the MCSC setfile version 0x14027432, scaler_coef should be controlled by setfile.
This patch is preparation for applying new method.
PR JIRA ID: CPR-33
Change-Id: I5a9812fd900bd37db8f9d4c26527cd221d996167
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 11:13:51 +0000 (20:13 +0900)]
[COMMON] fimc-is2: Added new function to keep compatibility - djag_wb_thres
Added djag related function for mcsc v4.0 and v4.10.
PR JIRA ID: CPR-31
Change-Id: Ia3f53556a5b70f38a4a1ac00153206eafc50df37
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 11:13:03 +0000 (20:13 +0900)]
[COMMON] fimc-is2: Added new hw-api functions to support djag_wb_thres
Implementation of api function for set_djag_wb_thres.
PR JIRA ID: CPR-31
Change-Id: Ib3878f929b37e8253b6ee18707e84b24cdc66b60
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 11:01:59 +0000 (20:01 +0900)]
[COMMON] fimc-is2: Added new function for djag_wb_thres setting
The djab_wb_thres value is defined according to scale_index.
PR JIRA ID: CPR-31
Change-Id: I239a98959eb900bb99c0018df92a59d5d5fca50d
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 10:42:46 +0000 (19:42 +0900)]
[COMMON] fimc-is2: Added new function to keep compatibility
Added cac related function for mcsc v4.0 and v4.10.
PR JIRA ID: CPR-25
Change-Id: If9d79014635214a5f185bbd822b42453bee532f1
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 00:31:28 +0000 (09:31 +0900)]
[COMMON] fimc-is2: Added new file and functions to support cac
CAC function is controlled by noise_index (this value from ISP).
So it is needed to calculate the proper value with using linear interpolation by noise_index.
To support uvsp and cac function, new source file was added.
Of course, the Makefile and Kconfig is also modified.
PR JIRA ID: CPR-25
Change-Id: Iafe7e6631d2ba2a42942e9d4f0370ea571ae70c8
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 02:30:44 +0000 (11:30 +0900)]
[COMMON] fimc-is2: Moved macro function declaration
To use simplified macro function to calculate of linear interpolation for CAC,
old version macro function was moved into tdnr header file.
PR JIRA ID: CPR-25
Change-Id: Id0463922876df9b9c3695c5a3f9f370820face04
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Tue, 3 Jul 2018 00:35:55 +0000 (09:35 +0900)]
[COMMON] fimc-is2: Changed the name of variables of noise_index
cur_noise_index -> cur_ni
PR JIRA ID: CPR-25
Change-Id: I97996e8612762cd4dc171d50cc4051b4866651ee
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Mon, 2 Jul 2018 06:37:35 +0000 (15:37 +0900)]
[COMMON] fimc-is2: Modified hw_mcsc_frame_done function
Increase the readability, hw_mcsc_frame_done function was changed.
- hw_mcsc_chk_frame_done function was separated from frame_done function.
PR JIRA ID: CPR-25
Change-Id: I9ec9df46015c765d2cd4f6e58ba369f972567095
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 08:38:07 +0000 (17:38 +0900)]
[COMMON] fimc-is2: Changed the scaler_set/get_wdma_addr function to suuport FRO
To support FRO function, followings are changed.
- get_wdma_addr_arr was added.
- fimc_is_scaler_set/get_wdma[0,1,2,3,4,ds]_addr was deleted.
PR JIRA ID: CPR-25
Change-Id: Ifcd1ffeb9d369ef8e58114b02b30de55a6cb3089
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 03:55:58 +0000 (12:55 +0900)]
[COMMON] fimc-is2: Modified the implementation of hw_mcsc_wdma_cfg
To increase the readability, hw_mcsc_wdma_cfg function was changed.
- check_shared_out_running was added as macro function
- hw_mcsc_set_wdma_addr function was separated from wdma_cfg function.
- i was substituted to out_id.
Change-Id: I3e68d5c6f5d836f55757f135d34acf7727961da9
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 03:49:57 +0000 (12:49 +0900)]
[COMMON] fimc-is2: Modified the implementation of hw_mcsc_rdma_cfg
To increase the readability, hw_mcsc_rdma_cfg function was changed.
The param_mcs_input was added as a argument of function.
Deleted a conditional sentence before calling this funciton.
This sentence is moved in hw_mcsc_rdma_cfg function.
Change-Id: Iee5c455daeff1fa07a7d555c751a2847c6e1e45d
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 06:36:46 +0000 (15:36 +0900)]
[COMMON] fimc-is2: Moved the position of assignment of variable
The hw_mcsc is moved to more proper position.
Change-Id: Id86e5181e9cc687913ae1f1078d8dc83aa79401d
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 03:55:37 +0000 (12:55 +0900)]
[COMMON] fimc-is2: Deleted unused variables in hw_mcsc_disable
The config and hw_mcsc were unused within the function.
So these were deleted.
Change-Id: I47339bd51926e34f179297c499cbacb25c2e39db
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 06:31:19 +0000 (15:31 +0900)]
[COMMON] fimc-is2: Moved the position of variable declaration
To keep that same type of variables were placed in same position
Change-Id: Ic04be935656be4a52256f9f5fa32c428c1df21e4
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 06:30:07 +0000 (15:30 +0900)]
[COMMON] fimc-is2: Added blank line in hw_mcsc_open
The blank line was added before the return
Change-Id: I6ce08edbe7bb07bcfc96a38011204a5c2ea21728
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 03:54:36 +0000 (12:54 +0900)]
[COMMON] fimc-is2: Deleted unused variable in deinit
output_id is not used.
Change-Id: Ia14eab9b7e65b90c0cb6e3c8cb21ed0cf0cfe183
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 06:50:37 +0000 (15:50 +0900)]
[COMMON] fimc-is2: Modified and separated the function related to tdnr
To increase the readability, hw_mcsc_tdnr_deinit function was added.
Also a conditonal sentence was added in tdnr_init function to check whether TDNR was supported or not.
Change-Id: Ie2317aae49a39311992e6280b518e999b0f5417d
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 01:43:32 +0000 (10:43 +0900)]
[COMMON] fimc-is2: Modified get_mcsc_hw_ip function related codes
To increase the readability, get_mcsc_hw_ip function was changed.
And check_sc_core_running function is introduced to check the state of hw_mcsc0 and hw_mcsc1 at the same time.
Also variables that have unclear name - hw_ip0 and hw_ip1 - were changed.
Change-Id: I5e471f0fdbaae01997ac27d9c817e0183bdfa599
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 00:42:01 +0000 (09:42 +0900)]
[COMMON] fimc-is2: Deleted needless codes in hw_mcsc_close
There is no need to clear_bit of variable in hw_mcsc.
The vfree function is called right after these codes.
Change-Id: Ib6473ad4d6e1ac7134bd77e3953e633e516aa085
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 00:41:36 +0000 (09:41 +0900)]
[COMMON] fimc-is2: Added deinit function of mcsc
To match with others like fimc_is_hw_3aa, isp, vra.
Change-Id: Id247295469b91f012f604f4ff9ee813b65309594
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Thu, 28 Jun 2018 12:21:48 +0000 (21:21 +0900)]
[COMMON] fimc-is2: Changed the name of variables in setfile structure
To increase the readability, the name of variables were changed.
- hw_api_scaler_setfile -> hw_mcsc_setfile
- applied_setfile -> cur_setfile
- yuv_range -> yuv (local variable)
- contents -> sc_base (sc means the SCaler)
Change-Id: Ia8a250b66c6f8c1655ca4b99321dff8dc82522c0
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Thu, 28 Jun 2018 11:59:32 +0000 (20:59 +0900)]
[COMMON] fimc-is2: Changed info_hw to sinfo_hw
To increase the readability, the log write macro function was changed.
Change-Id: Ib0687b3c2f24c5e7845acd9cad13610c16053341
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 06:05:02 +0000 (15:05 +0900)]
[COMMON] fimc-is2: Deleted redundant conditional sentence
There is no need to check dma input cmd is enabled or not.
A conditional setence to check this was also in rdma_cfg function.
Change-Id: I0bfa1a5332e9245e0407c392c69aa017d6d55753
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Thu, 28 Jun 2018 11:51:14 +0000 (20:51 +0900)]
[COMMON] fimc-is2: Changed name of variables in hw_mcsc_handle_interrupt
To increase the readability, the name of variables were changed.
- Use shorten name: flag_xx -> f_xx
- If variables has same type, that were placed in same position.
Change-Id: Ieb7e09845df2c6e9529d30b13235554ebf3f1e8e
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Thu, 28 Jun 2018 11:39:53 +0000 (20:39 +0900)]
[COMMON] fimc-is2: Changed name of global variables
To increase the readability, the name of global variables were changed.
- shared_output_slock -> mcsc_out_slock
- hw_mcsc_out_configured -> mcsc_out_st (st means the state)
- HW_MCSC_OUT_CLEARED_ALL -> MCSC_RST_CHK (RST means RESET, CHK means CHECK)
Change-Id: I1a8af2dd7f6a918892fea87781c6817a3dc7853e
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Mon, 11 Jun 2018 07:51:35 +0000 (16:51 +0900)]
[COMMON] fimc-is2: Added new features to support updated setfile
From the version of TUNING_PARAM_VER is 0x14027432, scaler setfile structures is going to changed.
- New features were added - UVSP and CAC of mc-scaler
- Scaler coefficients and clamp for bchs can be adjusted by setfile
Change-Id: I4eeabe5ccedfeb66eb2b2148c240f4e18b0c0946
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 05:48:15 +0000 (14:48 +0900)]
[COMMON] fimc-is2: Removed unused variable in hw-mcscaler-v2
- djag_tunecfg in hw_mcsc structure was deleted
Change-Id: Iace87576034c72ea5f69b30a5e8bce64b58a54b4
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>
Sunmi Lee [Fri, 29 Jun 2018 05:44:48 +0000 (14:44 +0900)]
[COMMON] fimc-is2: Code cleanup - hw-mcscaler-v2 header file
- Indents and spacing were adjusted
- Position of variable was moved
Change-Id: I3a200098537f3da01dd7ae0c96defaa18a730b6f
Signed-off-by: Sunmi Lee <carrotsm.lee@samsung.com>