Commit Graph

649776 Commits

Author SHA1 Message Date
Chris
778a68015b ODROID-COMMON: Fix watchdog reset disabled.
Change-Id: I214eb2ada20c7a885f82a3a198ffc65a4a1a9d19
2020-10-06 17:39:26 +09:00
Joy Cho
579650fd7c ODROID-COMMON: hdmitx: Fix unstable HDMI modes
Change-Id: Ibac9840a0a97d195918592059b62f6024b4047be
g12_9.0.0_64_20200924
2020-09-21 14:13:44 +09:00
Joy Cho
62f248084b ODROID-COMMON: hdmitx: Add new hdmi resolutions of 2560x* and 3440x1440
In case of 2560x1600@60hz, unstable display operation may occur
with some specific monitors those pixel clock is under 300MHz.
So, default timing for 2560x1600p60hz is set as following.

Detailed mode: Clock 268.500 MHz, 641 mm x 401 mm
               2560 2608 2640 2720 ( 48  32  80)
               1600 1602 1608 1646 (  2   6  38)
               +hsync -vsync
               VertFreq: 59.972 Hz, HorFreq: 98.713 kHz

Change-Id: Iec9df8713211cf5e0dc7ba09f3dba2948e479b4f
2020-09-21 14:13:39 +09:00
Luke go
fda5d9b946 ODROID-C4: arm64/dts: Bugfix.
Change-Id: I5be14718672c3a3a3a71f019a7cfd7c40d6ef000
g12_9.0.0_64_20200903
2020-09-03 16:47:12 +09:00
Luke go
5db707165b ODROID-COMMON: arm64/dts: overlay: Seperated gpio shortcut.
Change-Id: I3296aa20f364c1f1b3ff8148fc93c99db798bb8d
2020-09-03 16:20:16 +09:00
Luke go
760bf40bf6 ODROID-COMMON: arm64/dts: overlay: Add sdio.
Change-Id: I53d595a0f0a31ef603c9758be83984b13073199c
2020-09-03 16:20:07 +09:00
Luke go
55b00ac401 ODROID-COMMON: arm64/dts: Disabled sdio.
Change-Id: I0ed353e5275bc71a667313e036d0a77c7d1e4875
2020-09-03 16:19:23 +09:00
Chris
eb11395e89 ODROID-G12: Add CONFIG_KEYBOARD_GPIO_POLLED as builtin
Change-Id: Ia3e4ae0df655cfb593b722702434642ac4ca7113
2020-09-03 14:30:22 +09:00
Luke go
ea3b5e6a3c ODROID-COMMON: arm64/dts: Changed the default gpio-key mapping.
- To avoid conflicts with the default gpio-power key pin and the SPI
  pin, default shortcut pin maps are changed.

Change-Id: If857eafc1e9df101357203ad61ea6ea81b11b571
2020-09-03 12:07:33 +09:00
Luke go
bc2627dfa9 ODROID-C4: arm64/dts: overlay: Add wifi/bt combo.
- To support ap6255, we made wifi/bt combo support board. To use it with
  a ODROID-C4, You need chagne R45 to 10k register. Or please change a
  'gpio_reset' to other pins.

Signed-off-by: Luke go <sangch.go@gmail.com>
Change-Id: I208c11251e3b36bdf27d1505e5bb25a1f4a059c4
2020-09-03 08:50:03 +09:00
Chris
16350c181b ODROID-G12: fix not working for gpiopower.
Change-Id: I4870c80ffabc5fb7c018bc192f4ce32fc25c28d6
2020-09-02 09:36:05 +09:00
Luke Go
8c43fbdc1e ODROID-N2: arm64/dts: overlay: Add a gpio-spdifout.
- Add gpio's spdifout overlays. It support GPIOA 13 -PIN7 spdifout.

Change-Id: I95b99af5e531cba53748c0d82ff112d39ca8bbee
g12_9.0.0_64_20200827
2020-08-27 08:35:04 +09:00
Luke go
b9d4636f92 ODROID-COMMON: arm64/dts: overlay: Add pwm examples.
- N2
  - pwm_c(33) - pwm fan.
  - pwm_d(35) - pwm backlight.

- C4
  - pwm_a(33) - pwm fan.
  - pwm_b(35) - pwm backlight.

Change-Id: If5382b0f5fa515d74d547b1cb20107be5ad813bd
2020-08-27 08:33:22 +09:00
Luke go
b352de9657 ODROID-COMMON: arm64/dts: pwm: Adjust pwm pins and apply overlay.
- The PWM pins are not fit to a ODROID_C4 manual list of extension pins. To fit
  the list, a pwm_ab is added. And pwm_cd's pwm_d pin is moved.

- The Device tree Overlay feature is applied to the PWM.

Change-Id: I77b5b5691ab9f71740edfd5fe3d3bdc430fdaca3
2020-08-27 08:33:14 +09:00
Chris
d7bca5d189 Merge "Merge Amlogic mainline partially." into odroidg12-4.9.y-android 2020-08-26 15:41:49 +09:00
Luke go
429754910b Merge changes I15e2eacd,Ib75ae740 into odroidg12-4.9.y-android
* changes:
  ODROID: arm64/dts: overlay: Change CAN chipselect.
  ODROID-COMMON: config: Support CAN BUS.
2020-08-20 17:39:50 +09:00
Luke go
a546a0beb4 ODROID: arm64/dts: overlay: Change CAN chipselect.
Change-Id: I15e2eacd2b6c018b7950dd97ef353d83fb874743
2020-08-20 14:14:10 +09:00
Chris
1a56253355 Merge Amlogic mainline partially.
We want to mege without 'SDR to HDR' problem from Amlogic mainline.

Change-Id: I776364b18cbae3943d3c55097588883d1107460d
2020-08-20 13:30:41 +09:00
Luke go
a313ec5a92 ODROID-COMMON: config: Support CAN BUS.
Change-Id: Ib75ae740bc37c992eed8c479b8da50347b21a900
2020-08-20 12:01:14 +09:00
Joy Cho
b8262b15d8 media: hdmitx: Update hdmi hpll generation for low pixel clock
Change-Id: I83bd8688379f7e70354013c5f1a02c6995beed31
2020-08-11 11:17:27 +09:00
Dongjin Kim
e2a3ea38a1 ODROID-N2: arm64/dts: overlay: add new overlay to run fully loaded fan speed
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I4971f5acccd67a9db30213368870072ba59ee679
g12_9.0.0_64_20200813 g12_9.0.0_64_20200807
2020-07-30 16:32:46 +09:00
Chris KIM
dd983f1858 Revert "sd: add sd power cycle for sd3.0 [1/1]"
This reverts commit 1a249d948b.

Change-Id: Ie761d44b73b338fdbceff36c48dee4a809316620
2020-07-14 12:00:09 +09:00
Luke Go
b4e114c615 ODROID-N2/N2-PLUS: pwm-fan: Changed the trip point.
Change-Id: I2dcee110ff1939216dfdb20e0069f5298b43e9ad
Signed-off-by: Luke Go <sangch.go@gmail.com>
2020-07-14 11:58:13 +09:00
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