#asahi-dev · 2022-09-22 14:17
marcanI guess I should keep a for-next branch I merge trees with patches into then#asahi-dev · 2022-09-22 14:16
marcanyeah, that makes sense#asahi-dev · 2022-09-22 14:15
marcanI see!#asahi-dev · 2022-09-22 14:15
marcanI don't actually know how we get into linux-next :)#asahi-dev · 2022-09-22 14:13
marcanI don't think linux-next pulls us?#asahi-dev · 2022-09-22 14:12
marcanthanks for the help :)#asahi-dev · 2022-09-22 14:12
marcanack, expect it this weekend then#asahi-dev · 2022-09-22 14:11
marcanarnd: how much in a rush are you? I can send the pull now, or push a kernel out to -dev and let folks test it a couple days first to make sure the series as merged is good#asahi-dev · 2022-09-22 14:10
marcansmoke test looks good; pushed everything to asahi-wip.#asahi-dev · 2022-09-22 14:00
marcanok, added that and fixed the resulting conflict, merging again#asahi-dev · 2022-09-22 13:58
marcanpovik: I assume your reset series supersedes dmaengine: apple-admac: Pull shared reset control?#asahi-dev · 2022-09-22 13:57
marcanah, ok#asahi-dev · 2022-09-22 13:54
marcan[ 12.107021] Secondary: ASoC: error at dpcm_fe_dai_hw_params on Secondary: -22#asahi-dev · 2022-09-22 13:54
marcan[ 12.106198] Secondary: ASoC: error at __soc_pcm_hw_params on Secondary: -22#asahi-dev · 2022-09-22 13:54
marcan[ 12.105159] apple-mca 39b600000.mca: ASoC: error at snd_soc_dai_hw_params on mca-pcm-1: -22#asahi-dev · 2022-09-22 13:54
marcanI do see a bunch of this though:#asahi-dev · 2022-09-22 13:53
marcanI didn't see that, but I think I don't have the reset patches in bits/? (only the binding/dt changes)#asahi-dev · 2022-09-22 13:42
marcanlooks like a bad merge, weird. I'll fix it.#asahi-dev · 2022-09-22 13:36
marcandoing an asahi-wip rebase on top of v6.0-rc6 + that + asahi-soc/dt#asahi-dev · 2022-09-22 13:35
marcanI rebased your audio stuff onto broonie's tree (or some point on it); it was mostly trivial conflicts, so no issue there#asahi-dev · 2022-09-22 13:29
marcanpovik: I'll take the reset DT/binding patches via our tree if that works for you?#asahi-dev · 2022-09-22 13:09
marcangot it, I'll just send you the DT series then. There is also that FIQ fix that is in -rc6, but that was a longstanding problem anyway, not a regression.#asahi-dev · 2022-09-22 13:00
marcanarnd: let me know what works best for you#asahi-dev · 2022-09-22 12:52
marcanotherwise, we can punt the MCA part of the DTs to next cycle#asahi-dev · 2022-09-22 12:52
marcan6ed462d1c11675064 in the above tree fwiw#asahi-dev · 2022-09-22 12:51
marcanbut it does mean pulling in the 2 code patches since they came first#asahi-dev · 2022-09-22 12:51
marcanso what I said still stands: I can rebase on that point and that history is in what's going into for-6.1, so it'll merge cleanly#asahi-dev · 2022-09-22 12:50
marcanah, they are#asahi-dev · 2022-09-22 12:50
marcanlet me check if they're proper parents of for-6.1#asahi-dev · 2022-09-22 12:49
marcanah but hold on, looks like for-6.1 was rebased? I got those commits from the hashes as they were applied to for-next, but that might not work now...#asahi-dev · 2022-09-22 12:46
marcanit's just the binding patch went in last, so the 2 code patches are in that tree#asahi-dev · 2022-09-22 12:46
marcanthe 3 patches are in fact right on top of rc1#asahi-dev · 2022-09-22 12:44
marcanah, good, couldn't find the patch#asahi-dev · 2022-09-22 12:43
marcanand ha, the binding for apple,aic.yaml is wrong and says fiq-index instead of apple,fiq-index is wrong. that needs to be fixed, but it looks like that has been there forever? I guess the dt checker started catching that recently?#asahi-dev · 2022-09-22 12:39
marcanarnd: There are 3 patches in that tree starting from v6.0-rc1, two of them are code, one is the binding (all for the same thing). I can base the DT series on that point and send you a pull for that and you can merge it in, or I can just do the DT series and then the checker will complain until both branches are merged...#asahi-dev · 2022-09-22 12:34
marcanah, hm, we have dependencies on MCA bindings that were merged via another tree :/#asahi-dev · 2022-09-22 12:12
marcansven: wouldn't be surprising if I got some EPIC functions wrong#asahi-dev · 2022-09-22 12:11
marcanok, applied the binding and t6k series to asahi-soc/dt. Let me do some smoke tests on it and I'll send it to arnd.#asahi-dev · 2022-09-21 04:44
marcanmaybe log all of PMGR and see if anything there gets poked?#asahi-dev · 2022-09-21 04:44
marcanit's possible there is PMGR nonsense involved, that just doesn't apply to internal because iBoot sets it up?#asahi-dev · 2022-09-21 04:44
marcansven: so Apple's PMGR kext has a configVideoClock() method#asahi-dev · 2022-09-21 04:42
marcankk#asahi-dev · 2022-09-21 04:40
marcansven: set_digital_out_mode() takes the mode IDs, that was hardcoded for mine. I assume you changed that?#asahi-dev · 2022-09-19 18:16
marcan:)#asahi-dev · 2022-09-19 18:13
marcanI do want us to specify the keyboard layout a different way, but that's a much bigger conversation to be had regarding what the list of valid keyboard types should be#asahi-dev · 2022-09-19 18:11
marcanthat's what I did for dockchannel too#asahi-dev · 2022-09-19 18:11
marcando we really need that? afaik Apple's USB stuff does not report anything other than us/iso/jis either#asahi-dev · 2022-09-19 18:09
marcanthe keyboard layout is going to be a big yak to shave if we intend to specify all the details#asahi-dev · 2022-09-19 17:07
marcanno, I mean the PCIe power GPIO binding/support#asahi-dev · 2022-09-19 17:02
marcanI should submit dockchannel, since it looks like that works and it's worth getting in, but it has some deps on the spi-hid series... that whole input stuff needs cleanup and debugging still