platform/kernel/linux-amlogic.git
6 years agobacklight: ldim: add custome bl region num support for iw7027
Evoke Zhang [Tue, 24 Jul 2018 03:17:55 +0000 (11:17 +0800)]
backlight: ldim: add custome bl region num support for iw7027

PD#170488: ldim: add custome bl region num support for iw7027

Change-Id: If57cc7dd77f6143ce6c904716750c3edbfcbd546
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoatv_demod: improve the nicam and a2 [1/6]
nengwen.chen [Thu, 26 Jul 2018 08:10:38 +0000 (16:10 +0800)]
atv_demod: improve the nicam and a2 [1/6]

PD#169518: improve the nicam and a2

Change-Id: I91b48aea877ada0b733f4fe735fb8a2ab0f53163
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agohdmirx: mute audio when unsupport format received
yicheng shen [Mon, 23 Jul 2018 11:05:22 +0000 (19:05 +0800)]
hdmirx: mute audio when unsupport format received

PD#170497: hdmirx: mute audio when unsupport format received

Change-Id: Id849c725b88d1d80328f3ef6b76ba09248d5b9b8
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agohdmirx: edid mix add hdr block
hongmin hua [Wed, 11 Jul 2018 02:42:14 +0000 (10:42 +0800)]
hdmirx: edid mix add hdr block

PD#169888: hdmirx: edid mix add hdr block

Change-Id: I0a280abbd37295abc8ba8dc61ee91ee888b6e2e5
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agohdmitx: forward hdr block data to rprx [1/1]
Zongdong Jiao [Tue, 3 Jul 2018 06:09:10 +0000 (14:09 +0800)]
hdmitx: forward hdr block data to rprx [1/1]

PD#168875: hdmitx: forward hdr block data to rprx
Under repeater mode, need forward hdr block data to rprx.

Change-Id: Ib57dc4071f621e620a88cdf24340194cca1f8b24
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoarm64: dts: txl: audio: re-map spk and dac mask
Xing Wang [Thu, 26 Jul 2018 07:51:37 +0000 (15:51 +0800)]
arm64: dts: txl: audio: re-map spk and dac mask

PD#170319: arm64: dts: txl: audio: re-map spk and dac mask

Change-Id: I47da64823dfa90460abf2327cd2e628320ef8ab1
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoatv_demod: modify tuner config in dts [1/3]
nengwen.chen [Tue, 24 Jul 2018 13:02:12 +0000 (21:02 +0800)]
atv_demod: modify tuner config in dts [1/3]

PD#170567: modify tuner config in dts

Change-Id: Ibd14a6d334f097b1df243bfdfb9e22cad5b80e93
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agolcd: mute: wait vsync for display shadow [2/2]
Evoke Zhang [Wed, 18 Jul 2018 11:58:35 +0000 (19:58 +0800)]
lcd: mute: wait vsync for display shadow [2/2]

PD#170101: lcd: mute: wait vsync for display shadow

Change-Id: If17838c40d46fd6f4b943d313456738fec50185a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: lcd_extern: increase init_on table size support to 3000 [2/2]
Evoke Zhang [Mon, 23 Jul 2018 09:59:55 +0000 (17:59 +0800)]
lcd: lcd_extern: increase init_on table size support to 3000 [2/2]

PD#170356: lcd_extern: increase init_on table size support to 3000

Change-Id: Ic37f918553436fe40c0afc5b307c54d9b07febba
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agodts:txl:optimize ion memory usage [2/2]
Lei Qian [Thu, 26 Jul 2018 03:41:15 +0000 (11:41 +0800)]
dts:txl:optimize ion memory usage [2/2]

PD#170336:dts:txl: optimize ion memory usage

Change-Id: I8eb3cbf60ceeba959dbb74b51912947c9880ceb4
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
6 years agoemmc: g12a: optimize sd_uart for revA.
Nan Li [Tue, 24 Jul 2018 05:30:13 +0000 (13:30 +0800)]
emmc: g12a: optimize sd_uart for revA.

PD#170542: optimize sd_uart dts /sd1 for g12a revA.

Change-Id: I35bbb52790a1a11cc1d95d02c6cda717f43c9f75
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoaudio: auge: fix S/PDIF reset
Xing Wang [Fri, 20 Jul 2018 02:37:50 +0000 (10:37 +0800)]
audio: auge: fix S/PDIF reset

PD#170264: audio: auge: fix S/PDIF reset

Change-Id: I515319feb04b6c97850d218a5786990980054c51
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agodemod: prevent the agc pin conflict when used in atv or dtv demod [1/3]
nengwen.chen [Tue, 24 Jul 2018 06:20:03 +0000 (14:20 +0800)]
demod: prevent the agc pin conflict when used in atv or dtv demod [1/3]

PD#170409: prevent the agc pin conflict when used in atv or dtv demod

Change-Id: I78359502a97d79a703e990669bd1acddae6679ce
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agomedia: ptsserv: set pts_us64 in pts_lookup_offset
rongrong zhou [Fri, 20 Jul 2018 06:11:16 +0000 (14:11 +0800)]
media: ptsserv: set pts_us64 in pts_lookup_offset

PD#170127: media: ptsserv: set pts_us64 in pts_lookup_offset

Setiting pts_us64 prevents the decoder from using uninitialized values,
Sometimes the function return pts valid only if pts is set.

Change-Id: If4b0a329bbc013902fd2045207420f0f85bfff4e
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
6 years agocec: modify the line check for g12a
hongmin hua [Mon, 16 Jul 2018 06:15:50 +0000 (14:15 +0800)]
cec: modify the line check for g12a

PD#168682: cec: modify the line check for g12a

Change-Id: Id7f318caae3230df9bd6689f566524e05fd512bd
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agonet: xfrm: enable compat xfrm syscall
Yixun Lan [Fri, 13 Jul 2018 08:20:13 +0000 (16:20 +0800)]
net: xfrm: enable compat xfrm syscall

PD#170491: net: xfrm: enable compat xfrm syscall

When using 32bit user space and 64bit kernel in ARM64 platform,
we do not need to disable compat syscall, since there is struct size
difference between user space and kernel space.

This will fix error in xfrm test cases of VtsKernelNetTest.

Change-Id: Ifd6c1f5e678138286678d5c119c0efa42d5b3a59
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agodts: Add low memory config for u200 [1/2]
can.cao [Tue, 17 Jul 2018 07:48:12 +0000 (15:48 +0800)]
dts: Add low memory config for u200 [1/2]

PD#170190: Add new dts file for u200

Change-Id: Ia5332c20906666fa7828d671f16f872e05954cac
Signed-off-by: can.cao <can.cao@amlogic.com>
6 years agocec: add cec support for txl p346 p341
Yong Qin [Mon, 23 Jul 2018 07:42:31 +0000 (15:42 +0800)]
cec: add cec support for txl p346 p341

PD#170469: cec: add cec support for txl p346 p341
1.support p346
2.support p341

Change-Id: I4b680d407ce0c79eb952a3b74c2cf06df15d32ae
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agodts: gpu: g12b: enable ACE-lite
Jiyu Yang [Tue, 19 Jun 2018 08:37:34 +0000 (16:37 +0800)]
dts: gpu: g12b: enable ACE-lite

PD#168676: dts: gpu: g12b: enable ACE-lite

Change-Id: I19eaa04dd0ce35499b162fb1caafa7fa8a438404
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agoarm64: dts: txl: add 4g emmc support
jiaming.huang [Sat, 21 Jul 2018 12:20:24 +0000 (20:20 +0800)]
arm64: dts: txl: add 4g emmc support

PD#170439: arm64: dts: txl: add 4g emmc support

arm64: dts: txl: add 4g emmc config for txl board

Change-Id: I452efa07da038d8d8316c8afadf121522122afeb
Signed-off-by: jiaming.huang <jiaming.huang@amlogic.com>
6 years agoRTC: enable rtc dev for systemclock save[1/1]
Ting Li [Fri, 20 Jul 2018 03:15:45 +0000 (11:15 +0800)]
RTC: enable rtc dev for systemclock save[1/1]

PD#170346: RTC: enable rtc dev for systemclock save[1/1]

enable rtc dev for systemclock save

Change-Id: I1a055b0c2448160fa1554ac3b82da0760b26a4fd
Signed-off-by: Li Ting <ting.li@amlogic.com>
6 years agocodec_mm: set enable_slot_from_sys to try one page
rongrong zhou [Fri, 20 Jul 2018 09:24:20 +0000 (17:24 +0800)]
codec_mm: set enable_slot_from_sys to try one page

PD#170091: codec_mm: set enable_slot_from_sys to try one page

set enable_slot_from_sys to try one page

Change-Id: I53a50b666e7986abe1627a70b5112c234a6ce1ec
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
6 years agodts: spicc: change txl dts to use upstream driver
Sunny Luo [Mon, 23 Jul 2018 08:12:22 +0000 (16:12 +0800)]
dts: spicc: change txl dts to use upstream driver

PD#164751: dts: spicc: change txl dts to use upstream driver

Change-Id: Ibf51059122d31316bb644d6431466e36afe44cb6
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agodi: add more debug info into dumpstate_board
wenfeng.guo [Fri, 20 Jul 2018 10:52:00 +0000 (18:52 +0800)]
di: add more debug info into dumpstate_board

PD#170100: di: add more debug info into dumpstate_board

1. add new debugfs:
cat /sys/kernel/debug/di/state
cat /sys/kernel/debug/vdin0/state
2. Retain the original usage
echo state > /sys/class/vdin/vdin0/attr;
echo state > /sys/class/deinterlace/di0/debug;

Change-Id: I98054baa260ae5e9bf945d23b5becd2064c81a69
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agoemmc: Modify txlx latest data for data6
Long Yu [Tue, 26 Jun 2018 11:19:54 +0000 (19:19 +0800)]
emmc: Modify txlx latest data for data6

PD#169386: emmc: modify txlx latest data for data6

Change-Id: I5bbfa5fa7fa7641a3a532ef74f5e5450b518135c
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agoaudio: support the number of datain+loopback beyond 8 channel feature
Renjun Xu [Tue, 12 Jun 2018 08:34:14 +0000 (16:34 +0800)]
audio: support the number of datain+loopback beyond 8 channel feature

PD#168268: add support datain+loopback beyond 8 channel feature

   You need add  datain_datalb_total = <10>; at the end
   of aml_loopback node on dts or amixer command to enable.

   e.g. pdm 8ch + loopback 2ch case
        pdm 8ch + loopback 8ch case
        pdm 6ch + loopback 4ch case

   if total number of channel beyond 8 , must utilize 16ch to capture.
   so that  we change relevant parameter like this:
   if (lb_cfg->datain_datalb_total > 8) {
     lb_cfg->datain_chnum = 8;
     lb_cfg->datain_chmask = 0xff;
     lb_cfg->datalb_chnum = 8;
     lb_cfg->datalb_chmask = 0xff;
     lb_cfg->datalb_chswap = 0x76543210;
   }
   capture command:
   arecord -Dhw:0,3 -c 16 -r 48000 -f S32_LE /test.wav

   You can use asound.conf to choose your channel.

Change-Id: I0a59c4c12da603efd8709bf36d6dac640fdf788a
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
6 years agovdin: g12a/g12b: fix screencap error from ENCL
xuhua zhang [Thu, 19 Jul 2018 08:15:52 +0000 (16:15 +0800)]
vdin: g12a/g12b: fix screencap error from ENCL

PD#170320: vdin: g12a/g12b: fix screencap error from ENCL

Change-Id: I16bd33f31d126b714aa15e09bd782525b25da54b
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agodefect: fix code defects in public parts
Jianxiong Pan [Thu, 5 Jul 2018 09:17:02 +0000 (17:17 +0800)]
defect: fix code defects in public parts

PD#166793: code defects in public parts

crypto: exclude the of_match_device function return value is NULL
ddr_tool: solve problems of bad_shift and use_after_free
debug: prevent the number of cpus from exceeding the total
efuse: solve the problem of buffer_size_warning
memory_ext: solve the problems of divide_by_zero and overrun
unifykey: solve the problem of buffer_size_warning,and add a variable
          for useless_call
wifi: exclude the of_match_node function return value is NULL,and avoid
   the problem of string_overflow

Change-Id: I099ce7c60ddd0266d067215108f0e2baeb31c234
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
6 years agovlock: add dynamic switch from pll to enc mdoe
Dezhi Kong [Tue, 3 Jul 2018 07:57:01 +0000 (15:57 +0800)]
vlock: add dynamic switch from pll to enc mdoe

PD#169634: vlock: add dynamic switch from pll to enc mode

1.seperate vlock process from amvecm_on_vs,
avoid the influence of repeate call.
2.add dynamic switch from pll to enc mode,
pll adj firstly,then switch to enc mode do fine tuning.
3.seperate vlock reg init from amcm interface,
avoid the influence of rdma mode.
4.decrease enc line adjust limit.
5.add enc adjust range check.

Change-Id: I6352b45e9ec8869be43660c03352d1a406ca8a0a
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agoatv_demod: improve atv demod timer handler [1/1]
nengwen.chen [Wed, 18 Jul 2018 03:23:51 +0000 (11:23 +0800)]
atv_demod: improve atv demod timer handler [1/1]

PD#169330: improve atv demod timer handler

1.Add work queue to do the time consuming operations.
2.Optimize code.
3.V2.02

Change-Id: I809179ab84fc236cc4dba234e21448d6528f9c5e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agocec: add otp in str mode
Yong Qin [Tue, 17 Jul 2018 10:00:34 +0000 (18:00 +0800)]
cec: add otp in str mode

PD#170099: cec: add otp in str mode

1.add otp function in str mode

Change-Id: I49cee530f63246bc080ec4a6eb9538a0bb6c6bae
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agoarm64: dts: vdin: use discontinus way to alloc cma
xuhua zhang [Wed, 18 Jul 2018 09:37:39 +0000 (17:37 +0800)]
arm64: dts: vdin: use discontinus way to alloc cma

PD#170275: arm64: dts: vdin: use discontinus way to alloc cma

Change-Id: I9a0ed8e612a98f5558f90df2b91b3384e954b9e4
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agodts: g12b: add efusekey support [1/1]
Gongwei [Thu, 19 Jul 2018 11:07:58 +0000 (19:07 +0800)]
dts: g12b: add efusekey support [1/1]

PD#169961: dts: g12b: add efusekey support

Change-Id: Ideed83ddc3ad59370165079e2c8e236510507573
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
6 years agodts: audio: g12b audio config spdif_a;
shihong.zheng [Thu, 19 Jul 2018 02:31:05 +0000 (10:31 +0800)]
dts: audio: g12b audio config spdif_a;

PD#169619: dts: g12b audiobus tdmb samesource_sel config to 3.

Change-Id: I853d60297fa3b24989c160ec95c68e4ccd76623b
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
6 years agotouchscreen: optimize module init flow
Qianggui Song [Wed, 4 Jul 2018 05:42:37 +0000 (13:42 +0800)]
touchscreen: optimize module init flow

PD#169285: touchscreen: optimize module init flow

1.Initializing/Uninitializing resource in probe/remove function is more
appropriate in this case.
2.Use module_i2c_driver to replace module_init/exit to make code more
compact.
verify on a311d_w400

Change-Id: If02f12a6c290a6346d439785060e60a6cd815c12
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
6 years agoarm64: dts: txlx: modify the txlx adaptation to txl bringup
nengwen.chen [Wed, 18 Jul 2018 11:30:41 +0000 (19:30 +0800)]
arm64: dts: txlx: modify the txlx adaptation to txl bringup

PD#168480: arm64: dts: txlx: modify the txlx adaptation to txl bringup

Change-Id: I85190803871ea9982a0ec41d87680c975c84d171
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoaudio: auge: fix hdmi pop noise when bootup
Xing Wang [Thu, 24 May 2018 15:30:01 +0000 (23:30 +0800)]
audio: auge: fix hdmi pop noise when bootup

PD#165171: audio: auge: fix hdmi pop noise when bootup

Change-Id: Ic8186b230c5c27966467e35d23b8c041309e6922
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoarm64: dts: txl: initial add dt files for txl boards
Bo Yang [Tue, 17 Jul 2018 12:19:51 +0000 (20:19 +0800)]
arm64: dts: txl: initial add dt files for txl boards

PD#168480: arm64: dts: txl: initial add dt files for txl boards

Change-Id: Ie72d114ee83d97a71e485afea465d3db0f102347
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoaudio: meson: sdd sound card support for txl
Xing Wang [Thu, 12 Jul 2018 14:17:24 +0000 (22:17 +0800)]
audio: meson: sdd sound card support for txl

PD#168480: audio: meson: add sound card support for txl

Change-Id: I89117e1cfee2bc99289b00f8ead4acb2f1b13a98
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agowifi: meson: fix kernel panic when dts not config wifi pwms
libo [Mon, 16 Jul 2018 08:12:47 +0000 (16:12 +0800)]
wifi: meson: fix kernel panic when dts not config wifi pwms

PD#168480: wifi: fix kernel panic when dts not config wifi pwms

Change-Id: I8907ec9f131034fbbe113e74ff3a760b6b8169e1
Signed-off-by: libo <bo.li@amlogic.com>
6 years agodtv_demod: txl: add dtv demod support for txl
Jihong Sui [Tue, 17 Jul 2018 12:30:02 +0000 (20:30 +0800)]
dtv_demod: txl: add dtv demod support for txl

PD#168480 :dtv_demod: txl: add dtv demod support for txl

Change-Id: Ib2503aa5f626a5fff115104d0b246cc080fb1123
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoatv_demod: txl: add atv demod support for txl
nengwen.chen [Tue, 17 Jul 2018 09:50:52 +0000 (17:50 +0800)]
atv_demod: txl: add atv demod support for txl

PD#168480: atv_demod: txl: add atv demod support for txl

Change-Id: I793946253ec9860473bdd57cf979168d9903f5df
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agodeinterlace: txl: add di support for txl
Jihong Sui [Mon, 2 Jul 2018 05:02:58 +0000 (13:02 +0800)]
deinterlace: txl: add di support for txl

PD#168480: deinterlace: txl: add di support for txl

Change-Id: I09e6982258291fd36a9b551bc4a6f24d68107cd2
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoreboot: meson: standardize the compatible property
Jian Hu [Mon, 2 Jul 2018 09:52:37 +0000 (17:52 +0800)]
reboot: meson: standardize the compatible property

PD#168480: reboot: meson: standardize the compatible property

Use 'amlogic,reboot' instead of 'aml,reboot'.
'aml,reboot' will be removed later.

Change-Id: I7d16795c98aa293fe204121ccd7da41c7d078f77
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agotvafe: meson: add support for txl
Nian Jing [Wed, 27 Jun 2018 08:18:02 +0000 (16:18 +0800)]
tvafe: meson: add support for txl

PD#168480:tvafe: meson: add support for txl

Add atv/avin function for txl.

Change-Id: I1e9727b2578a19a31436ae5cbe924b4311deae9d
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agowatchdog: meson: add watchdog support for txl
Bo Yang [Thu, 28 Jun 2018 06:39:55 +0000 (14:39 +0800)]
watchdog: meson: add watchdog support for txl

PD#168480: add watchdog support for txl

Change-Id: I53ac23d1fedec155871ecec3229dedeb13ca7076
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agounifykey: txl: add unifykey support for txl
jiamin ma [Thu, 28 Jun 2018 05:50:51 +0000 (13:50 +0800)]
unifykey: txl: add unifykey support for txl

PD#168480: unifykey: txl: add unifykey for txl

Change-Id: If9d36e91f8fef0694bacc69e746163e2e96befc6
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agocec: txl: add cec support for txl
hongmin hua [Tue, 26 Jun 2018 12:40:42 +0000 (20:40 +0800)]
cec: txl: add cec support for txl

PD#168480: cec: txl: add cec support for txl

Change-Id: I76c4c241aa882f9a454fed8813fd0d733995bf5d
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agolcd: meson: add support for txl
Evoke Zhang [Tue, 26 Jun 2018 05:56:12 +0000 (13:56 +0800)]
lcd: meson: add support for txl

PD#168480: lcd: meson: add support for txl

Change-Id: I8bf458282886f162e4777def4a74f661a0f9f4c0
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoiio: adc: meson: add sar adc support for txl
Xingyu Chen [Mon, 18 Jun 2018 08:33:34 +0000 (16:33 +0800)]
iio: adc: meson: add sar adc support for txl

PD#168480: iio: adc: meson: add sar adc support for txl

Change-Id: I9febffdb4fef582f5a91138491ae87d11ca240ee
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agohdmirx: txl: add support for txl
Hang Cheng [Tue, 26 Jun 2018 07:03:55 +0000 (15:03 +0800)]
hdmirx: txl: add support for txl

PD#168480: hdmirx: txl: add support for txl

Change-Id: Ia1216721f2732052c5c3a5384a3dc01ffacb9392
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agoiomap: txl: add iomap support for txl
Xingyu Chen [Tue, 26 Jun 2018 07:13:33 +0000 (15:13 +0800)]
iomap: txl: add iomap support for txl

PD#168480: iomap: txl: add iomap support for txl

Change-Id: Icbd5a8811950cd806cf2b6a4b08dca37402e52e7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agovpu: txl: add vpu support for txl
Evoke Zhang [Mon, 25 Jun 2018 10:52:45 +0000 (18:52 +0800)]
vpu: txl: add vpu support for txl

PD#168480: vpu: txl: add vpu support for txl

Change-Id: I7562e0831e1f77c65c169c7292ee2a6d2bfc4472
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agopwm: meson: add support for txl
bichao.zheng [Sat, 23 Jun 2018 08:41:49 +0000 (16:41 +0800)]
pwm: meson: add support for txl

PD#168480: pwm: meson: add support for txl

1、 add support for txl
2、 fix txl、txlx clock mux selection error issue

Change-Id: Iff7eeb16086604030414d4e350fd533a3d2328b1
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoirqchip: meson: add gpio IRQ support for txl
Xingyu Chen [Mon, 18 Jun 2018 06:45:20 +0000 (14:45 +0800)]
irqchip: meson: add gpio IRQ support for txl

PD#168480: irqchip: meson: add gpio IRQ support for txl

Change-Id: I03b32a3ffe4a7e9b63631ac5e593bcbf346b8765
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoi2c: meson: add support for txl
Jian Hu [Mon, 18 Jun 2018 03:42:16 +0000 (11:42 +0800)]
i2c: meson: add support for txl

PD#168480: i2c: meson: add support for txl

Change-Id: I0c4fe9d2e6caec0cfa812af28476774db69a4e89
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agopinctrl: txl: add pinctrl & gpio support for txl
Xingyu Chen [Sat, 16 Jun 2018 12:14:16 +0000 (20:14 +0800)]
pinctrl: txl: add pinctrl & gpio support for txl

PD#168480: pinctrl: txl: add pinctrl & gpio support for txl

Change-Id: I2496cdebfc283e90825f5dd7d20b0e16f57158d2
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoclk: txl: initial add clock driver
Jian Hu [Thu, 14 Jun 2018 09:44:24 +0000 (17:44 +0800)]
clk: txl: initial add clock driver

PD#168480: clk: txl: initial add clock driver

remove CLK_SET_RATE_PARENT flag for spicc.
If add CLK_SET_RATE_PARENT, it will change clk81 rate when set
spicc clock rate.

Change-Id: I80fec2c6d10611994ff40b06307e39b51ddb5a1a
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoblock: loop: enable loop partiton scanning
Ao Xu [Tue, 3 Jul 2018 11:29:16 +0000 (19:29 +0800)]
block: loop: enable loop partiton scanning

PD#168231: block: loop: enable loop partiton scanning

If max_part is given, partition scanning is globally
enabled for loop devices.

Change-Id: I7a8ca59eff85cf9ee97264c3d8ae8dceb198cf32
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agoatv_demod: fix nicam. [1/1]
nengwen.chen [Thu, 12 Jul 2018 08:00:37 +0000 (16:00 +0800)]
atv_demod: fix nicam. [1/1]

PD#169523: fix nicam.

Change-Id: Ied4b6867b7993164cd156f120099767b12ab131a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agomtd: add new ATO slc nand support
Yi Zeng [Fri, 13 Jul 2018 07:33:31 +0000 (15:33 +0800)]
mtd: add new ATO slc nand support

PD#170048: mtd: add new ATO slc nand support

add a ATO slc nand: AFND2G08U3A

Change-Id: I0263682231008c862c9f3f77d02ef7512de3a46f
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agotvafe: fix wss issues
Nian Jing [Wed, 11 Jul 2018 08:34:59 +0000 (16:34 +0800)]
tvafe: fix wss issues

PD#169836: fix wss issues
wss detect slowly
aspect ratio unstable when set off on machine
aspect ratio 4:3 different with screen mode 4:3

Change-Id: I66d0aa393808513975885b86ee18e4c62bf10c88
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agodi: fix coverity error
wenfeng.guo [Tue, 26 Jun 2018 07:10:22 +0000 (15:10 +0800)]
di: fix coverity error

PD#169049: di: fix coverity error

Change-Id: I267ae15a1a72ad4255a182f4e7617ac641774c49
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agodts: enable ramoops for all boards
jiamin ma [Wed, 11 Jul 2018 08:17:25 +0000 (16:17 +0800)]
dts: enable ramoops for all boards

PD#169897: dts: add ramoops node

Change-Id: I1e4bce21a5740d3cc73ffefe803cded4b8a7e24c
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agoaudio: fix I2S noise at start-up
Shuai Li [Mon, 16 Jul 2018 07:08:42 +0000 (15:08 +0800)]
audio: fix I2S noise at start-up

PD#168452: audio: fix I2S noise at start-up

Change-Id: I0c255509419773f57c09fcd814e72db2e5ad7beb
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
6 years agocec: disable cec module clear logic addr
Yong Qin [Wed, 11 Jul 2018 08:44:27 +0000 (16:44 +0800)]
cec: disable cec module clear logic addr

PD#169892: cec: disable cec module clear logic addr

1.for replace "keep reset" when cec disable

Change-Id: I2af29cd4d89ffd13bf35a41fd41d2eb0dbf68e55
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agowifi: softirq: reduce ksoftirqd scheduled rate to improve TCP throughtput
libo [Fri, 13 Jul 2018 02:20:59 +0000 (10:20 +0800)]
wifi: softirq: reduce ksoftirqd scheduled rate to improve TCP throughtput

PD#162113: improve ap62x8 rx tput

The reason why wifi TCP rx throughtput lower than kernel3.14 are as flollows:
On K3.14, RX has more time to work in ISR, but on K4.9, RX has more time to
work in kernel ksoftirqd thread, however, ksoftirqd has a very low priority.

On K4.9, a commit from upstream caused this difference, then revert it.

Revert "softirq: Let ksoftirqd do its job"

This reverts commit 4cd13c21b207e80ddb1144c576500098f2d5f882.

Change-Id: I094232dad5dfddbcd94c35ec42a5e3302ed52459
Signed-off-by: libo <bo.li@amlogic.com>
6 years agoosd: meson-axg: fix uboot logo flicker issue
pengcheng chen [Mon, 16 Jul 2018 08:32:15 +0000 (16:32 +0800)]
osd: meson-axg: fix uboot logo flicker issue

PD#170129: osd: meson-axg: fix uboot logo flicker issue

Change-Id: I1604d716b1cb0bcf3804b0c7c89df38276c0cc2f
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agolcd: fix driver version null pointer mistake
Evoke Zhang [Mon, 16 Jul 2018 07:00:04 +0000 (15:00 +0800)]
lcd: fix driver version null pointer mistake

PD#170130: lcd: fix driver version null pointer mistake

Change-Id: Ic3589a8261f57c3eb7a231b5fb778f2421601abe
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agocodec_mm: config: fixed config error crash bug.
Zhi Zhou [Fri, 22 Jun 2018 04:43:20 +0000 (12:43 +0800)]
codec_mm: config: fixed config error crash bug.

PD#166937:
not return errors when not find config.
will crashed on:
[    9.478046@0] task: ffffffc05aea8d80 task.stack: ffffffc05a498000
[    9.484090@0] PC is at configs_config2str+0x2c/0x240
[    9.489001@0] LR is at configs_get_node_path_str+0x78/0xd4
[    9.494433@0] pc : [<ffffff800982f8cc>] lr : [<ffffff80098311c8>]
pstate: 20000145
[    9.501935@0] sp : ffffffc05a49baf0
[    9.505386@0] x29: ffffffc05a49baf0 x28: ffffffc05a498000

Change-Id: Ia5985d3e5aa7aefecb6867e3d2ab29efc7592b9b
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
6 years agoamvecm: hdr: optimaze set_hdr_matrix
Bencheng Jing [Thu, 5 Jul 2018 13:25:37 +0000 (21:25 +0800)]
amvecm: hdr: optimaze set_hdr_matrix

PD#169610: amvecm: hdr: optimaze set_hdr_matrix

Change-Id: Ie3e79433234a76d20ec431814fe27a94b55924bb
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agodts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.
Sunny Luo [Thu, 31 May 2018 06:12:04 +0000 (14:12 +0800)]
dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.

PD#164751: dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.

1. change to use the unified name "spicc0/1".
2. change axg compatible from "amlogic, spicc" to "amlogic,meson-axg-spicc"
   to use upstream driver.
3. change txlx compatible from "amlogic, spicc" to "amlogic,meson-txlx-spicc"
   to use upstream driver.
3. change g12a compatible from "amlogic, spicc" to "amlogic,meson-g12a-spicc"
   to use upstream driver.
4. add node of "amlogic,meson-g12b-spicc" for g12b to use upstream driver.

Change-Id: I587127361fa2ada48332cc01857f2200709d597e
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agosd: g12a: optimize sd & wifi TDMA
Nan Li [Tue, 22 May 2018 08:16:31 +0000 (16:16 +0800)]
sd: g12a: optimize sd & wifi TDMA

PD#166884: optimize sd inval irq error,
when sd insert wifi running. wifi is data1.

Change-Id: I6de4f519d3bacec7d9ab4eec4fc9b0cfc6b5d07d
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agopwm: meson: don't disable pwm when setting duty repeatedly
bichao.zheng [Fri, 6 Jul 2018 08:56:33 +0000 (16:56 +0800)]
pwm: meson: don't disable pwm when setting duty repeatedly

PD#169687: pwm: meson: don't disable pwm when setting duty repeatedly

There is an abnormally low about 20ms,when setting duty repeatedly.
Because setting the duty will disable pwm and then enable.Delete
this operation now.

Change-Id: I4bca5e61b4782da3160c14d8c73cd913d7e21db3
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
6 years agoRevert "cec: modify the line check for g12a"
Hongmin Hua [Mon, 16 Jul 2018 03:36:31 +0000 (20:36 -0700)]
Revert "cec: modify the line check for g12a"

This reverts commit b059eff24a7c5b434bcf521c164be0836ac47eb2.

Change-Id: I5fe67e218279d469e83231d2fd42cfaf0df23702
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agohdmitx: hdmitx: fix a map size error when g12b return to trunk
Yi Zhou [Fri, 13 Jul 2018 11:06:30 +0000 (19:06 +0800)]
hdmitx: hdmitx: fix a map size error when g12b return to trunk

PD#169639: hdmitx: fix a map size error when g12b return to trunk

Change-Id: If26755418cbed435533f8547f30859165b7518b2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agocec: modify the line check for g12a
hongmin hua [Thu, 5 Jul 2018 07:45:34 +0000 (15:45 +0800)]
cec: modify the line check for g12a

PD#168682: cec: modify the line check for g12a

Change-Id: Iad4b47e236f16313356dc9d719052c382311a913
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agounifykey: fix bug for read/write efuse key
Zhongfu Luo [Fri, 13 Jul 2018 10:21:59 +0000 (18:21 +0800)]
unifykey: fix bug for read/write efuse key

PD#168551: need to use unifykey to read/write efuse key

1.fix efuse config name to CONFIG_AMLOGIC_EFUSE
2.add correct efuse key read funciton

Change-Id: I415f1b68d5de090220b1bd96db299452af176626
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
6 years agospicc: add dma and enhance features of axg/txhd/g12a/g12b.
Sunny Luo [Sat, 28 Apr 2018 02:15:15 +0000 (10:15 +0800)]
spicc: add dma and enhance features of axg/txhd/g12a/g12b.

PD#164751: spicc: add dma and enhance features of axg/txhd/g12a/g12b.

1. fix TESTREG bits defination error;
2. fix cs-gpio error in slave setup;
3. reset fifo to avoid successive fifo error before tansfer;
4. add enhance feature of cs-preload delay control;
5. add auto io delay control;
6. add enhance feature of tt/ti delay control;
7. fix clk error which occurred certainly when sencond spicc added;
8. surpport both auto core clk and  fixed core clk rate setting:
   set dts "fixed_core_rate = <200000000(example)>" to use fixed
   core rate. otherwise, to use auto core clk.
9. support loop-back mode;
10. support DMA transfer;
11. must delete 1000M from parent clk.
12. It will be wrong when enhance divider=2. we have to add a flag
   CLK_DIVIDER_PROHIBIT_ZERO to shield against it.

Change-Id: I820a52e6d31d3fe2e3615a0f4c5a07c17d11914d
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agodts:add region_code key[1/2]
Ting Wang [Tue, 10 Jul 2018 09:19:47 +0000 (17:19 +0800)]
dts:add region_code key[1/2]

PD# 169693

add region_code key to change wifi local

Change-Id: I60b52e82b69128a90fbd9f72f0de8b46ccd04e7e
Signed-off-by: Ting Wang <ting.wang@amlogic.com>
6 years agohdmirx: hdcp1.4 force OESS mode
yicheng shen [Thu, 12 Jul 2018 02:17:25 +0000 (10:17 +0800)]
hdmirx: hdcp1.4 force OESS mode

PD#169940: hdmirx: hdcp1.4 force OESS mode

Force OESS mode to fix Google Chromecast box
flashing black screen issue.

Change-Id: I1768f7b69ac1379166d88f605a4dcfab7a7044ea
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agodts: media: add cpu ver info to dts
Conglin Guo [Thu, 12 Jul 2018 09:36:19 +0000 (17:36 +0800)]
dts: media: add cpu ver info to dts

PD#168480: dts: media: add cpu type dts info

Change-Id: Ie1f4d023fd2c20e37677b710364b54c5f0937579
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
6 years agohdmitx: update register address when g12b return to trunk [3/3]
Yi Zhou [Fri, 29 Jun 2018 11:05:07 +0000 (19:05 +0800)]
hdmitx: update register address when g12b return to trunk [3/3]

PD#169639: hdmitx: update register address [3/3]

Change-Id: Ibb37bd0c3e3611ad6e624fafbcb879e5a7d78a74
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agoethernet: add exphy led function
Zhuo Wang [Thu, 12 Jul 2018 09:09:02 +0000 (17:09 +0800)]
ethernet: add exphy led function

PD#169970: exphy led for 4.9

Change-Id: I4e51298b98a2511fd7ab2d90d3a853d9d6d9e13c
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agothermal: fix thermal ipa mode data for g12b
Huan Biao [Tue, 3 Jul 2018 06:46:11 +0000 (14:46 +0800)]
thermal: fix thermal ipa mode data for g12b

PD#169024: update g12b thermal ipa mode data for match power

Change-Id: Iedcb16cc9da2a47777456e041831ff60f0229c5a
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
6 years agoefuse: support EFUSE pattern burning
Zhongfu Luo [Thu, 12 Jul 2018 06:50:48 +0000 (14:50 +0800)]
efuse: support EFUSE pattern burning

PD#168568: G12A need to support EFUSE burning

1.add child node amlogic_set in efuse
2.node amlogic_set support EFUSE pattern burning

Change-Id: Ie20a8b61678e351cf32418879d4b40228e1d365f
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
6 years agosmartcard: modify smartcard driver for 8.1
Yinming Ding [Fri, 22 Jun 2018 09:36:05 +0000 (17:36 +0800)]
smartcard: modify smartcard driver for 8.1

PD#168901: smartcard modify smartcard driver for 8.1

Change-Id: Ib0b81009e434d5f6c513bfc52bbfeef48414ef39
Signed-off-by: Yinming Ding <yinming.ding@amlogic.com>
6 years agoddr: fix overflow when ddr freq is high
tao zeng [Thu, 12 Jul 2018 01:30:30 +0000 (09:30 +0800)]
ddr: fix overflow when ddr freq is high

PD#161475: ddr: fix overflow when ddr freq is high

Caculate of ddr freq will overflow if ddr freq is
over 1.5GHz, This commit fixed it.

Change-Id: Idc07b1022b52e3ec5c227c15afff1aaf21575ed7
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agoarm: enable AMLOGIC_MODIRY config
tao zeng [Fri, 25 May 2018 10:23:37 +0000 (18:23 +0800)]
arm: enable AMLOGIC_MODIRY config

PD#165213:

This change can use some amlogic optimize on arm32

Change-Id: Ic364baab21431e83d9b224d0d6c58913404aed3c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agoaudio: make raw data from spdifin source to parser[1/1]
Zhe Wang [Wed, 11 Jul 2018 02:48:27 +0000 (10:48 +0800)]
audio: make raw data from spdifin source to parser[1/1]

PD#166028: support dd/dd+ decoder from spdifin

Change-Id: Id2ef5a585427db2508e89f4bc595a8dc058e941b
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
6 years agodts: G12A: add efuse support
Zhongfu Luo [Thu, 5 Jul 2018 10:33:38 +0000 (18:33 +0800)]
dts: G12A: add efuse support

PD#168568: G12A need to support EFUSE burning

Change-Id: If85af608a03450ca5fc8557ea7d2c2c5f71fff09
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
6 years agotvafe: wss: add aspect ratio function[5/5]
xuhua zhang [Fri, 22 Jun 2018 09:01:39 +0000 (17:01 +0800)]
tvafe: wss: add aspect ratio function[5/5]

PD#165626: add wss function at LitvTV

Change-Id: Ic95bb761b9de45dc35094ed8d1b4e1cee0c25ac8
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agoarm64: dts: g12a/g12b: correct i2c timeout interrupt number
Jian Hu [Tue, 10 Jul 2018 11:43:49 +0000 (19:43 +0800)]
arm64: dts: g12a/g12b: correct i2c timeout interrupt number

PD#169865: arm64: dts: g12a/g12b: correct i2c timeout interrupt number

I2c timeout interrupt number has changed since g12a SoC, the timeout
interrupt have not used in i2c controller driver, the function will
probably be added later.

Change-Id: I2aca009bacfda0bc2636e48032de71c9aa42cacb
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agotouchscreen: add goodix gt9xx touch for a311d_w400
Sunny Luo [Sat, 7 Jul 2018 07:04:12 +0000 (15:04 +0800)]
touchscreen: add goodix gt9xx touch for a311d_w400

PD#169723: touchscreen: add goodix gt9xx touch for a311d_w400

Change-Id: I2a3560b91bcf449e2c0f9e0a36e6ce9586adf8cf
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agodts: build: add S905X2 1g DDR3 support
Gongwei [Tue, 10 Jul 2018 11:44:23 +0000 (19:44 +0800)]
dts: build: add S905X2 1g DDR3 support

PD#169633: dts: build: add S905X2 1g DDR3 dts support

Change-Id: Ief4b2d5d0cfa4693e6ebdf851eb506f8bdb9402f
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
6 years agoclk: clock: add efuse clock for g12a
Shunzhou Jiang [Fri, 6 Jul 2018 02:13:26 +0000 (10:13 +0800)]
clk: clock: add efuse clock for g12a

PD#168568: clock: add efuse clock

Change-Id: I4ef07515db93fd8bf7108bfbe622d0ce261ed2d6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agohdmitx: update extcon_hdmi_audio after resume
Zongdong Jiao [Thu, 5 Jul 2018 12:08:51 +0000 (20:08 +0800)]
hdmitx: update extcon_hdmi_audio after resume

PD#169594: hdmitx: update extcon_hdmi_audio after resume
Under some corner case, extcon_hdmi_audio maybe as 0.

Change-Id: I497b5f8538ffd329e1fee4fcc44c09944e77cf64
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agohdmitx: add hdcp function in drm
Yi Zhou [Thu, 28 Jun 2018 10:59:26 +0000 (18:59 +0800)]
hdmitx: add hdcp function in drm

PD#158474: hdmitx: add hdcp function in drm

1.update drm library files about hdcp
upstream (24557865c8b1a6d0eaccaac47aabd9b23badf8fd)
2.add hdcp state machine
3.add hdcp 1.4
4.add hdcp 2.2
  a) fix hdcp_tx22
  b) add uevent for hdcp_tx22

Change-Id: If1254d2d42775ea45459b8e3072395f480bd6438
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agodv: fixed dolbyvision video cannot play [2/2]
shihong.zheng [Thu, 5 Jul 2018 03:07:04 +0000 (11:07 +0800)]
dv: fixed dolbyvision video cannot play [2/2]

PD#169274: dv: merge some dv code from 3.14, add a dolbyvision
bypass el define and metadata parser return val check.

Change-Id: I2a687d0e3187d1f56880508b4d4a3263edcdc071
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
6 years agoCPUFREQ: delete dvfs volate adjustment in cpufreq init.
Hong Guo [Tue, 10 Jul 2018 03:27:34 +0000 (11:27 +0800)]
CPUFREQ: delete dvfs volate adjustment in cpufreq init.

PD#165143: cpufreq: delete dvfs volate adjustment in cpufreq init.

Change-Id: Ic9e2ad87c130a6f6c964c711148f9277b09ffcbc
Signed-off-by: Hong Guo <hong.guo@amlogic.com>