manual merge

diff --git a/bootstrap.sh b/bootstrap.sh
index a3628453d87c746b93343b176e35f057188f350d..8cf87aaa077c90b6eb1b30670c41bdd440a14937 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,6 +31,7 @@ build_linux()
         curl -s https://tg.st/u/DXyl.patch | git am -
         curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am -
         curl -s https://tg.st/u/0001-Hookup-gpio-backlight.patch | git am -
+        curl -s https://tg.st/u/XKVZ.patch | git am -
         curl -s https://tg.st/u/config-2022-02-19 > .config
         make olddefconfig
         make -j $(( 2* `nproc`)) V=0 bindeb-pkg

diff --git a/doc/notes.txt b/doc/notes.txt
index 2da521f69fe217cba289cd1f5f7d616d8e8c07d2..fbfd019052d0c51380f3cf5429cd17111dbff3f3 100644 (file)
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -54,5 +54,8 @@ echo 1 > /sys/module/hid_apple/parameters/swap_opt_cmd
 
 # j`ey on deleting efi and Linux partitions from the gui in macos
 20:46 < j`ey> Glanzmann: I didnt figure it out at the diskutil cli, but I managed to do it from the GUI, I think you have to erase/reformat as APFS before you can delete the volumes
-
+10:53 < j`ey> Glanzmann: for your notes: < tpw_rules> you can delete a non-apfs partition with: diskutil eraseVolume free n disk0sX
 21:07 < tpw_rules> you can delete a non-apfs partition with: diskutil eraseVolume free n disk0sX
+
+08:54 < mixi> Glanzmann: the command you're looking for should be "dtc -I dtb -O dts /sys/firmware/fdt"
+08:57 < jannau> Glanzmann: dtc -I fs -O dts -o - /proc/device-tree

diff --git a/doc/rtc.txt b/doc/rtc.txt
deleted file mode 100644 (file)
index d8c8739..0000000
--- a/doc/rtc.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-curl -s https://tg.st/u/114e7b2c8bcbbdd2aade6711169d65fc1cbaafb5.patch | git am -
-curl -s https://tg.st/u/1e286fea8f626d571aed6e620f4e166a694317c2.patch | git am -
-curl -s https://tg.st/u/888add910ab5dd1b7500fd2583d8ba5aa73538f3.patch | git am -
-curl -s https://tg.st/u/d0801e9a20532025b82c06342da068da9aa12967.patch | git am -
-
-CONFIG_SPMI_APPLE=y
-CONFIG_MFD_APPLE_SPMI_SERA_PMU=y
-CONFIG_RTC_DRV_APPLE_PMU_SERA=y
-
-01:52 < jeffmiw> Glanzmann: rtc support over spmi is here : https://github.com/jfbortolotti/linux/tree/spmi_rtc  , you need the following flags in your kernel config: CONFIG_SPMI_APPLE=y CONFIG_MFD_APPLE_SPMI_SERA_PMU=y CONFIG_RTC_DRV_APPLE_PMU_SERA=y
-01:53 < jeffmiw> tested on mba for now, branch only have the changes for t8103
-01:58 < jeffmiw> this enables to boot with current time set in rtc, and rtc is updated is system date/time is changed
-
-18:08 < jeffmiw> mps: do you have the RTC enables in your kernel config ? CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC_DEVICE="rtc0" CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y
-                 CONFIG_RTC_INTF_DEV=y

diff --git a/doc/smc.txt b/doc/smc.txt
deleted file mode 100644 (file)
index cf865c3..0000000
--- a/doc/smc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-17:46 < mps> Glanzmann: copied t8103.dtsi and t8103-jxxx.dtsi to u-boot and build u-boot, that's all
-https://tg.st/u/m1-config-smc-2022-02-06