11-20-2023, 05:19 PM
(11-20-2023, 04:36 PM)Kevin Kofler Wrote: So then the idea would be to look at the .rej file, try to figure out why that hunk failed, and do the modifications manually.
Or you could try increasing the fuzz (passing -F3 to patch in addition to the other parameters), but it is probably a bad idea since context is important for .dtsi files. Better check the .rej file by hand.
Hunk 4 is a 1-line patch. It should not be too hard to make the change by hand.
Thanks for the Info. Here is the content of the
.rej file
Code:--- arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
+++ arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
@@ -935,7 +949,7 @@ &sdmmc1 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
+ mmc-pwrseq = <&sdio_pwrseq &sdio_pwrkey>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4
--
This is the patch:
https://gitlab.com/arjanvlek/bes2600/-/b...type=heads
And this is the file, that should be patched:
https://github.com/dreemurrs-embedded/li...etab2.dtsi
As i understand, the line, which should be patched, doesn't exist in the rk3566-pinetab2.dtsi file.
I am not very familiar with patch, so if you can point me to the right direction - that would be great!
Thanks