Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attach Meson64 CURRENT to 5.6.y and make DEV = CURRENT at this point. #1956

Merged
merged 12 commits into from May 21, 2020

Conversation

igorpecovnik
Copy link
Member

@igorpecovnik igorpecovnik commented May 10, 2020

There is a lot of changes on patchset for 5.7.y ... sorting out DEV branch ATM is not critical and can be done after release or by someone that feels a need to do this right now.

Tested on FriendlyARM K2 and C4

Closes AR-236

There is a lot of changes to 5.7.y and can be done after release or by someone that feels a need for this right now.
@igorpecovnik igorpecovnik requested a review from a team May 10, 2020 11:19
@lanefu
Copy link
Member

lanefu commented May 12, 2020

I built this merge and failed to boot on lepotato with 2 different SD Cards

lane@server:~/GIT/build$ git branch -v
* (HEAD detached at upstream/pull/1956/merge) 1bcead35 Merge b07d516cea849df29834efab16eae05a3c3f4cb0 into 03e71791cda8d00d90becbcb45ec42e4e4176d3c

Boot logs for attempts 1 and 2

http://ix.io/2lHB

http://ix.io/2lHC

@lanefu
Copy link
Member

lanefu commented May 12, 2020

odroidn2 boots from this branch... (still can't change screen resolution in boot.ini)

this fix has been upstream for some time, I had issues with it on 5.4, which is why it had been removed there.
@igorpecovnik
Copy link
Member Author

still can't change screen resolution in boot.ini

While with 5.4.y. this is possible?

@Tonymac32
Copy link
Member

Tonymac32 commented May 12, 2020 via email

@lanefu
Copy link
Member

lanefu commented May 12, 2020

@Tonymac32 yep that worked!

@lanefu
Copy link
Member

lanefu commented May 12, 2020

....but no audio on desktop... i see modukles loaded.. but pulseaudio doesnt

@Tonymac32
Copy link
Member

Tonymac32 commented May 12, 2020 via email

@lanefu
Copy link
Member

lanefu commented May 12, 2020

... reboot also doesn't seem to be working but works in 5.4..... not sure we're ready to make the switch to 5.6 yet

[ 4807.160004] watchdog: watchdog0: watchdog did not stop!

@igorpecovnik
Copy link
Member Author

... reboot also doesn't seem to be working but works in 5.4

This is showstopper. If we can't fix this, merge goes in after release.

@Tonymac32
Copy link
Member

Tonymac32 commented May 12, 2020 via email

@paolosabatino
Copy link
Contributor

The audio I will need to look at, we have a lot of patches, some probably overlap.

I'm quite sure the device tree nodes also changed the arrangement in kernel 5.6

@lanefu
Copy link
Member

lanefu commented May 13, 2020

@Tonymac32 your recent push fixed reboot for potato

@lanefu
Copy link
Member

lanefu commented May 14, 2020

Reboot works on Le Potato, Does NOT work on Odroid C2

@Tonymac32
Copy link
Member

Tonymac32 commented May 14, 2020 via email

@lanefu
Copy link
Member

lanefu commented May 14, 2020

Update. C2 reboots when using EMMC, not SSD...

this may be a fix... chewitt/linux@65801c3

@igorpecovnik
Copy link
Member Author

igorpecovnik commented May 17, 2020

I just checked 5.4.y kernel again on a known-to-make-troubles-on-5-6 SD card and it also does not reboot. Which means we don't have a regression and can merge. Audio can perhaps be solved later if we have no time to deal with this right now?

@lanefu
Copy link
Member

lanefu commented May 18, 2020

I'm torn... if audio used to work on our "stable" images 5.4 and then we publish ones that don't, we're reducing functionality....and if people apt upgrade then they could potentially lose functionality, correct? (lose audio going from 5.4 to 5.6)

We should either fix, or hold off.. and if we push a intermediate update after then so be it.

@Tonymac32
Copy link
Member

Tonymac32 commented May 18, 2020 via email

@igorpecovnik
Copy link
Member Author

I am at a loss here, it looks like everything is where it belongs, but
there are no audio devices.

Kernel config too?

@lanefu
Copy link
Member

lanefu commented May 19, 2020

I'm fixing the merge conflicts on branch

@paolosabatino
Copy link
Contributor

@Tonymac32
I managed to get audio node on GXBB targets with this patch:
https://github.com/paolosabatino/armbian-build/blob/mxq-s905-v20/patch/kernel/meson64-dev/1000-arm64-dts-gxbb-audio.patch

There is some weirdness to handle using alsamixer to get HDMI audio. Alsamixer provides two playback devices, the left one is HDMI and the right one is SPDIF. HDMI was disabled by default, had to switch (using up&down cursors) to I2S to get audio from pulseaudio default device.
At last, audio is high pitched as like as playback sampling rate is higher than normal (clock issues I guess)

immagine

Be sure you get these strings in dmesg:

gx-sound-card sound: snd-soc-dummy-dai <-> I2S FIFO mapping ok
gx-sound-card sound: CODEC CTRL HDMI I2S IN <-> I2S Encoder mapping ok
gx-sound-card sound: dit-hifi <-> SPDIF Encoder mapping ok
gx-sound-card sound: i2s-hifi <-> CODEC CTRL HDMI OUT mapping ok

@Tonymac32
Copy link
Member

Tonymac32 commented May 19, 2020 via email

This brings the dts even with the khilman 5.8/integ branch which includes all of the audio changes.  The kernel is registering audio devices, however nothing comes out.  committed in case someone wants to spend time debugging/testing theories.
@Tonymac32
Copy link
Member

I added my patch for the Potato, no output, however the device tree matches the upstream one precisely (board dts, SoC dtsi, SoC family dtsi). If anyone wants to try anything out, go for it.

was editing from another machine, accidental change of permissions in the patch
@Tonymac32
Copy link
Member

@igorpecovnik these need added to the builds somehow to get the mixer setup properly:

amixer -c 0 sset 'AIU SPDIF SRC SEL' 'SPDIF'
amixer -c 0 sset 'AIU HDMI CTRL SRC' 'I2S'

The analog codec is still inert, but that is no change from before.

I need to patch La Frite, K2, and C2, then it should be good

@igorpecovnik
Copy link
Member Author

I need to patch La Frite, K2, and C2, then it should be good

Great!

these need added to the builds somehow to get the mixer setup properly

Probably creating and applying asound.state ?

@igorpecovnik
Copy link
Member Author

these need added to the builds somehow to get the mixer setup properly:

Working on it.

igorpecovnik and others added 5 commits May 20, 2020 11:23
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
This moves to the mainline patches and covers le potato and la frite.  Adjusted asound config to handle a commonized sound card name.
Playback is too fast, a clock setting is off somewhere.
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
@igorpecovnik igorpecovnik merged commit 99f6bef into master May 21, 2020
@igorpecovnik igorpecovnik deleted the AR-236 branch May 30, 2020 08:32
useful64 pushed a commit to useful64/build that referenced this pull request Feb 4, 2022
…armbian#1956)

* Attach Meson64 CURRENT to 5.6.y and make DEV = CURRENT at this point.

There is a lot of changes to 5.7.y and can be done after release or by someone that feels a need for this right now.

* Delete meson64_fclk_div3.patch

this fix has been upstream for some time, I had issues with it on 5.4, which is why it had been removed there.

* [ meson64 current ] kconfig tweak

disable Rockchip SoC drivers

* [ meson64 current ] remove rockchip patches

* [ meson64 current ] disable CMA patch GX

* [ meson64 current] add libretech cc audio patch

This brings the dts even with the khilman 5.8/integ branch which includes all of the audio changes.  The kernel is registering audio devices, however nothing comes out.  committed in case someone wants to spend time debugging/testing theories.

* fix permissions

was editing from another machine, accidental change of permissions in the patch

* Set default mixer settings

Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>

* [ meson64 current ] GXL audio commit

This moves to the mainline patches and covers le potato and la frite.  Adjusted asound config to handle a commonized sound card name.

* [ meson64 current ] add gxbb audio WIP

Playback is too fast, a clock setting is off somewhere.

* Update kernel configs

Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>

Co-authored-by: Tony <tonymckahan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants