Commit Graph

649753 Commits

Author SHA1 Message Date
Luke Go
cd92231325 ODROID-N2: config: enable default thermal governer as 'STEPWISE'
Change-Id: I1577c4fdc1dd6b2a038396f4bb650eb2f76fdd3b
Signed-off-by: Luke Go <sangch.go@gmail.com>
2020-07-14 11:57:52 +09:00
Luke go
dbac43a253 Merge "ODROID-COMMON: pwm-fan device enabled for active cooling." into odroidg12-4.9.y-android 2020-07-14 11:57:43 +09:00
Kevin Kim
d46549b222 ODROID-COMMON: pwm-fan device enabled for active cooling.
Change-Id: I1dcdfa4c22ab72cd24b1be870727420683073f9a
Signed-off-by: Kevin Kim <ckkim@hardkernel.com>
2020-07-13 16:46:57 +09:00
Dongjin Kim
cc9372a7b8 ODROID-C4: arm64/dts: remove 'gpio_power' property for uSD
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ib57acd78207ea6deb5c548693ec102b554a7439f
2020-07-02 16:27:44 +09:00
Luke Go
4d26ad17a5 ODROID-N2PLUS: dtbo: Add model name to overlay.
- To name the odroid n2 plus, add name property overlay to the file.

Change-Id: I2c2e5f93989740644165431dfa63fd2f0724fcd4
2020-06-30 15:21:52 +09:00
Luke Go
5fd0c0e45f ODROID: android: frequency config macro changes.
- Android build each board (N2/C4) at seprated time, So need to common
define to build it.

Change-Id: I558ab468dab3be36717fa248dea41f7718953032
2020-06-29 17:19:14 +09:00
femto
7f5ff07577 ODROID-N2/N2-PLUS: Default freq setting and cpu max_freq limit setting.
board_is_odroidn2 (): Both N2 and N2plus return 'true'

if (is_meson_g12b_cpu() && is_meson_rev_a()) // ODROID-N2
else                                         // ODROID-N2Plus

N2_A53_DEFAULT		1896000	/* N2 Core A53 */
N2_A73_DEFAULT		1800000	/* N2 Core A73 */

N2PLUS_A53_DEFAULT	1908000	/* N2 Plus Core A53 */
N2PLUS_A73_DEFAULT	2208000	/* N2 Plus Core A73 */

Signed-off-by: femto <ckkim@hardkernel.com>
Change-Id: I32fa6b37f54560e9071cf650c74f972b36fc4af2
2020-06-29 17:19:07 +09:00
Luke Go
0108e49943 ODROID-N2: Plus N2 Plus opp.
- N2 Plus can more overclocking. So Add additional clock entries to opp
  table to support it.

Change-Id: Ia81da54a1b1a432a4a6c341a57b139834d10e27d
2020-06-29 17:18:59 +09:00
Chris KIM
c5dd5d0f3c ODROID: media: hdmitx: add new hdmi resolutions
Change-Id: Idf6a74dcb73c3c6a03fb2cdf41219a2acfb31ccb
2020-06-29 11:46:01 +09:00
Zongdong Jiao
7bd41e8460 hdmitx: add a fake hpd for system test [1/1]
PD#SWPL-16891

Problem:
For automatical test, the HDMI cable are always connected between Tx and Rx
without manully action.

Solution:
add a fake hpd for system test
echo 0[1] > /sys/class/amhdmitx/amhdmitx0/fake_plug

Verify:
G12/U212

Change-Id: I826fc0094845a13066a1535a4a87727b4ecad452
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:01 +09:00
Hang Cheng
51b1fb9858 hdmitx: detach vinfo before mode setting done [1/1]
PD#SWPL-18673

Problem:
when hotplug cable very quickly, the pin contact may
be loose and edid read wrong, system will output
default 1080p+rgb signal, after the pin contact
ok and edid read ok, DV module send DV signal, the
output mode and DV signal may not match, cause
TV show green screen.

Solution:
only attach vinfo after hdmi mode setting done.

Verify:
AC214

Change-Id: Ice60d44f55ed377dbab4bef4639d67c263a6bbb6
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2020-06-29 11:46:01 +09:00
Hang Cheng
2f73ddbe66 hdmitx: optimize for signal disable flow [1/1]
PD#SWPL-16472

Problem:
on Hisense-HZ55A65, under Y420+deep color,
it will show blue(for some ms) and then keep
green screen after receive set_avmute

Solution:
after set avmute, decrease the delay time to
disable output, to avoid flash on Hisense-HZ55A65

Verify:
AC214

Change-Id: Id2a25b21c56118f363f7085d22ac590051dec585
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2020-06-29 11:46:01 +09:00
Zongdong Jiao
79cd4bbaa9 hdmitx: correct the threshold value of rxsense [1/1]
PD#SWPL-17841

Problem:
need correct the threshold value of rxsense

Solution:
correct the threshold value of rxsense, regress OTT-1968 to trunk

Verify:
G12/U212

Change-Id: I53f370cf51c0ad39e92fd64a0cc98cc4680eea4d
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:01 +09:00
Zongdong Jiao
c7a85c0b7f hdmitx: revert original hpd_state mark [1/1]
PD#SWPL-17710

Problem:
Suppose hdmitx already output in uboot, and next kernel boots up,
the output will disable and then enable

Solution:
When hdmitx hpd_states initializes, read edid when hpd is high

Verify:
G12/U212

Change-Id: I538b8af2d59a7b2b34739f14d0b0cb6fd89aed2e
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:01 +09:00
Zongdong Jiao
022ced4b3d hdmitx: update edid attach after reading once [1/1]
PD#SWPL-17476

Problem:
After kernel boots up, there will no edid info for vinfo

Solution:
Need update edid attach after reading once
In kernel init, hdmitx / vout / edid with attach once time
Normal replug, plugin / edid / uevent / mode setting / attach
Also, init DRM_DB[0] data.

Verify:
G12/U212

Change-Id: I188f0972c882a17efcbc568ef7d0db861b9b6c0a
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:01 +09:00
Hang Cheng
d9a5cf0a56 hdmitx: optimize for power up flow [1/1]
PD#SWPL-17155

Problem:
box set env to 2160p30hz 422,12bit, connect to
Hisense LED50EC660US 4K TV which only support
maximum 3G mode, then power on box, the hpd is
low when run hdmitx hpd command, so hdmi is not
set. after enter kernel, vout set 2160p30hz
before edid is read, and the color space is
forcely changed to rgb, but the color depth is
still 12bit, so TV can't detect normally.

Solution:
keep hpd state low until edid read finishes,
so that the mode vout set is filtered by edid

Verify:
S905X3

Change-Id: I11d126c4a2165ffaf3892534b1602bad3d78618d
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2020-06-29 11:46:01 +09:00
Zhengrong.Zhu
c26829b12a hdmitx: Playback HLG video color is abnormal during playing [1/1]
PD#SWPL-16374

Problem:
Playback HLG video color display is abnormal during playing

Solution:
Modify code related to color space.

Verify:
verify on the board of U212

Change-Id: Ie01ba1f9931a5e8f12bd1cfd70fd9ea752194f9b
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:46:01 +09:00
Zhengrong.Zhu
48e75a97e1 hdmitx: Coverity(upgraded) defect cleanup: hdmitx [1/1]
PD#SWPL-16574

Problem:
Coverity(upgraded) defect cleanup: hdmitx

Solution:
Modify code according to coverity

Verify:
verify on the board of U212

Change-Id: Iac69fb896dd22b38ae56b58701d6fd26aefe958c
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:46:01 +09:00
Hang Cheng
29810f8c18 hdmirx: keep phy para of sm1 consistent with uboot [1/2]
PD#SWPL-15262

Problem:
flash snow or black screen when switch to
1080p50/60hz rgb,12bit on Sharp LCD-42GX50A

Solution:
change the phy para according to uboot

Verify:
U212 board(V2.0) + S905X3 chip

Change-Id: If4fadc30aeab51106a11ea861e0ef43b2a5a1318
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2020-06-29 11:46:01 +09:00
Zongdong Jiao
937b7b6d97 hdmitx: rewrite allm / contenttype [1/1]
PD#SWPL-14891

Problem:
need rewrite allm / contenttype

Solution:
rewrite allm / contenttype

Verify:
G12/U212

Change-Id: I3a41c963b1ba359546ed1286cc5c587f579aa441
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:00 +09:00
Zongdong Jiao
4ae16a851e hdmitx: rewrite edidinfo to vinfo [1/1]
PD#SWPL-14910

Problem:
When HDMI plugin, it will read edid, parse edid, (and here dv mode maybe changed),
notify, etc...

Solution:
rewrite edidinfo to vinfo and update when tx mode is ready

Verify:
G12/U212

Change-Id: I81eb1943f6444fd2c87e0353f6e2782bd9c6c9c1
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:00 +09:00
Zhengrong.Zhu
18100c2b93 hdmitx: Coverity defect cleanup: VOUT [1/1]
PD#SWPL-13989

Problem:
Coverity defect cleanup: VOUT

Solution:
Modify code according to coverity

Verify:
verify on the board of U212

Change-Id: I787429350be37da84ccd85332e97d472f45d3826
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:46:00 +09:00
Zongdong Jiao
945467e74b hdmitx: add hdr_priority [1/1]
PD#SWPL-14089

Problem:
Need add 'hdr_priority' to mask sysfs 'dv_cap'

Solution:
Parse the variable 'hdr_priority' from uboot environment

Verify:
G12/U212

Change-Id: I6fca18669c068ac793ca9230c6497b0ef2cbe07c
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:00 +09:00
Luke Go
42d74837e7 partial cherry-pick: dv: support PIP [1/1]
Change-Id: Ife09c72454311a93a05eb218f2d9e5ab449076eb
2020-06-29 11:46:00 +09:00
Zongdong Jiao
1c3c785216 hdmitx: sync HDR/VSIF from A [1/1]
PD#SWPL-13206

Problem:
Need to sync HDR/HLG/DV callback

Solution:
Sync HDR/HLG/DV callback

Verify:
G12/U212

Change-Id: Ibe93c3e538ad2f3cbb254c4ce731473b6ac1562b
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-06-29 11:46:00 +09:00
Lei Qian
c7c20b9e1d vout: merge from mainline
PD#SWPL-15312

Change-Id: Idaae480374996db64547fb2d1290f256f38a19ea
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2020-06-29 11:46:00 +09:00
Kaifu Hu
61edb424bf hdmi: support 1440x2560p60hz modes [1/1]
PD#IPTV-1032

Problem:
Need support 1440x2560p60hz

Solution:
Porting VESA code and 1440x2560p60hz

Verify:
g12b/w400

Change-Id: I3cf38bebc29b76aed50fe2ced7b47e27f2d1af06
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2020-06-29 11:46:00 +09:00
Luke Go
1f0a2f84b5 Revert "media: hdmitx: add new hdmi resolutions"
This reverts commit 1bf959a7df.

Change-Id: If4005cad9ad2045a8e453fd5c5d871cd4a69cb99
2020-06-29 11:46:00 +09:00
zhiwei.yuan
28b7065232 vdin: Get video hdr status from vdin [1/1]
PD#SWPL-9636

Problem:
upper layer get signal type is too late,cause screen flash

Solution:
report signal type to upper layer directly in vdin module

Verify:
verified by t962x2_x301

Change-Id: I08f7754f20ba8b6b00a34387dcaf4aee7fdc2185
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
2020-06-29 11:46:00 +09:00
Yong Qin
f2efc4b406 vdin: add hdr10 pluse data in vframe [1/1]
PD#SWPL-9849

Problem:
add hdr10 pkt data into vframe structure

Solution:
according to hdmi rx hdr10p_on flag, copy hdr10p data
from hdmirx to vframe

Verify:
tl1

Change-Id: I4d3bcbcce4d1303a5e5d4cf57a7777e4fd1fd54c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2020-06-29 11:46:00 +09:00
Lei Yang
387fabdf23 hdmirx: add hpd recovery logic when input clk is unstable [1/1]
PD#SWPL-16961

Problem:
the old xbox of customer does not send tmds clk with
low probability after hdmi2.0 swithing.

Solution:
add hpd recovery logic when input clk unstable for a long time

Verify:
TL1

Change-Id: Id36a7a81596ffa08ef7fedd1bd2a21c206d921ce
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:59 +09:00
Lei Yang
fd95890881 hdmirx: add repeater22 [1/1]
PD#SWPL-12503

Problem:
TM2 cannot support repeater22

Solution:
add repreater2.2

Verify:
TM2

Change-Id: Idda626632641939dccab79bf3d958e8f2c462c82
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:59 +09:00
Lei Yang
20a569ef0b hdmirx: add repeater14 for TM2 [1/2]
PD#SWPL-12502

Problem:
new function

Solution:
add new function of TM2

Verify:
T962E2

Change-Id: Idd5843d39bb9235fe0abdf9aaaca3be6dd2795e7
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:59 +09:00
Zhengrong.Zhu
9cd8faa36f hdmirx: Coverity(upgraded) defect cleanup:hdmi rx [1/1]
PD#SWPL-16523

Problem:
Coverity(upgraded) defect cleanup:hdmi rx

Solution:
Modify code according to coverity

Verify:
verify on the board of x3011

Change-Id: I9dcdcede98dcf386874674442a9eea2c64d619ab
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:45:59 +09:00
yicheng shen
462ca5f34d hdmirx: add rx phy tdr enable control [1/1]
PD#SWPL-13433

Problem:
Need to add a option in dts to select tdr on or off;

Solution:
add a option in dts to select tdr on or off;

Verify:
tl1

Change-Id: Ibf5688fcf50672677369452f7dd6e702094eac5e
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2020-06-29 11:45:59 +09:00
yicheng shen
4663947b42 hdmirx: add phy TDR function [1/1]
PD#SWPL-16740

Problem:
Add phy TDR function to get the best setting.

Solution:
Add phy TDR function to get the best setting.

Verify:
TL1

Change-Id: Id2652cbf8cc9f3bf2a7cf79edc110333a13fd67d
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2020-06-29 11:45:59 +09:00
Lei Yang
58788b839b hdmirx: modify input clk of aud pll [1/1]
PD#SWPL-15343

Problem:
HBR audio cannot work well

Solution:
input clk of aud pll set to maximum.
and increase division coefficient at backend to ensure aud pll is right.

Verify:
on TL1 TM2

Change-Id: I243dde2d00327b924e265f26e7e31687c3e23ad1
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:59 +09:00
yicheng shen
185e20ea60 hdmirx: fix hdcp2.2 error after resume [1/1]
PD#SWPL-15872

Problem:
ESM init failed after boot-up twice

Solution:
Use the correct HPI address when request_mem_region called.

Verify:
TL1 4g ddr

Change-Id: I5fd30166b3a36e5f4a12b8b6b893df9c9f20ddaf
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2020-06-29 11:45:59 +09:00
Zhengrong.Zhu
75848e4daf hdmirx: Coverity defect cleanup:hdmi rx [1/1]
PD#SWPL-15167

Problem:
Coverity defect cleanup:hdmi rx

Solution:
Modify code according to coverity

Verify:
verify on the board of x3011

Change-Id: I1f8bac51101a5ae1a8a27ffd14e899b75ab99c04
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:45:59 +09:00
Zhengrong.Zhu
cdd8ccd594 hdmirx: Coverity defect cleanup:hdmi rx [1/1]
PD#SWPL-15167

Problem:
Coverity defect cleanup:hdmi rx

Solution:
Modify code according to coverity

Verify:
verify on the board of x3011

Change-Id: If325bcd7ca3a7f85cd17ac8b57e4a15284231ccc
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-06-29 11:45:59 +09:00
yicheng shen
0d09990db9 hdmirx: Optimize hdmirx power consumption [1/1]
PD#SWPL-10073

Problem:
The power consumption of hdmirx need to be optimized when
there're no deviced connected.

Solution:
Power off hdmirx phy/pll when no rx input

Verify:
TL1/TM2

Change-Id: Iba34e3a4cd72c2fd72ff05f608114179ae59055c
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2020-06-29 11:45:59 +09:00
yicheng shen
1fb1400913 hdmirx: add phy eq debug function [1/1]
PD#SWPL-12881

Problem:
Need to add eq debug function

Solution:
Add phy eq debug function,use auto-eq as default.

Verify:
TL1

Change-Id: I723d74d1bad226267b60ffb66d3670d01e6a4e1b
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2020-06-29 11:45:59 +09:00
Evoke Zhang
3850cdc48d vdac: optimize the vdac controlling [1/1]
PD#SWPL-8385

Problem:
no cvbsout on ab311

Solution:
1.optimize the vdac controlling
2.enable cvbsout in ab311 dts

Verify:
ab311

Change-Id: Ib046e760eca1c9ad3ae30749c546aff538504b33
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2020-06-29 11:45:58 +09:00
Lei Yang
9fc86a6eb4 hdmirx: add repeater22 [1/1]
PD#SWPL-12503

Problem:
TM2 cannot support repeater22

Solution:
add repreater2.2

Verify:
TM2

Change-Id: Idda626632641939dccab79bf3d958e8f2c462c82
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:58 +09:00
Lei Yang
c6474fb3ed hdmirx: add repeater14 for TM2 [1/2]
PD#SWPL-12502

Problem:
new function

Solution:
add new function of TM2

Verify:
T962E2

Change-Id: Idd5843d39bb9235fe0abdf9aaaca3be6dd2795e7
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2020-06-29 11:45:58 +09:00
Lei Yang
890a5a632a hdmirx: update config for TM2 [1/1]
PD#SWPL-5616

Problem:
bring up hdmirx for TM2

Solution:
hdmirx: add hdmirx TM2 support

Verify:
Verfied on TM2 skt board

Change-Id: I82fd66afc7f26f1bdfd7a4f1fc4cc0d9d7ed3974
Signed-off-by: Lei Yang <lei.yang@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tm2_pxp.dts
	arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
	arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
	arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
	arch/arm64/boot/dts/amlogic/tm2_pxp.dts
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
	drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
2020-06-29 11:45:58 +09:00
Evoke Zhang
3b6058f04a tvafe: fix identify as PAL-DK when the input signal is SCAM DK [1/1]
PD#TV-7779

Problem:
identify as PAL-DK when the input signal is SECAM DK

Solution:
increase atv try_fmt max cnt to recognize SECAM

Verify:
x301

Change-Id: I306f2337b6b2c3d0b4ec2fc85e45f9f5993b754b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2020-06-29 11:45:58 +09:00
Evoke Zhang
101c8e9cbb tvafe: add more parameters for fine tune non-std signal [1/1]
PD#TV-7783

Problem:
some non-std signal is not stable

Solution:
add more parameters for fine tune non-std signal

Verify:
x301

Change-Id: I926833778569c4aa3a6eae45224a46eae97f3dcf
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2020-06-29 11:45:58 +09:00
Evoke Zhang
cc5f68676d vdac: optimize the vdac controlling [1/1]
PD#SWPL-8385

Problem:
no cvbsout on ab311

Solution:
1.optimize the vdac controlling
2.enable cvbsout in ab311 dts

Verify:
ab311

Change-Id: Ib046e760eca1c9ad3ae30749c546aff538504b33
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2020-06-29 11:45:58 +09:00
Lei Qian
2a7ea49a40 vdin: merge from mainline
PD#SWPL-15312

Change-Id: I39e4ed6014292a32f04f3e08724093ff0751757a
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2020-06-29 11:45:58 +09:00