Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index 2ae1c1b5cda7a17ee25f9a7b6f07320616b60251..776f1da301e1862be4577107bb8a01e9936012ef 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -158,7 +158,7 @@ publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        sudo cp m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho /u/
+        sudo cp m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /u/
 }
 
 mkdir -p build

diff --git a/doc/notes.txt b/doc/notes.txt
index fbfd019052d0c51380f3cf5429cd17111dbff3f3..20d944dd5a2c796eca5c6c746d25936b6398f628 100644 (file)
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -59,3 +59,21 @@ echo 1 > /sys/module/hid_apple/parameters/swap_opt_cmd
 
 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
+
+# j`ey on hack to hookup lid close/open
+23:19 < j`ey> apple_smc_event_received in drivers/platform/apple/smc_core.c is a good place to start looking
+
+# kettenis on the same issue using existing infrastructure
+23:20 < kettenis> so the lid is hooked up to gP01
+23:24 < kettenis> looks like you could try hooking that up using gpio-keys-polled
+23:27 < Glanzmann> kettenis: So gpio-keys-polled would poll gP01 and send a key event and than I could use my window manager to do something when that key event is received?
+23:29 < kettenis> look at arch/arm/boot/dts/imx6q-novena.dts
+
+# How to subscribe to smc events
+23:45 < j`ey> Glanzmann: if youre still interested in looking: drivers/power/supply/macsmc_power.c apple_smc_register_notifier(power->smc, &power->nb);
+23:46 < j`ey> so this driver gets called, when an SMC notification happens. looks like all registered handlers would be called and its up to the callback to figure out if it needs to do something
+
+# More background
+23:54 < kettenis> if the interrupts are hooked up correctly for thise SMC gpios, gpio-keys instead of gpio-keys-polled should work
+23:54 < j`ey> no irq_chip in the current driver
+

diff --git a/files/quickstart.txt b/files/quickstart.txt
index a3f0c18d6ca9c76347e6d71adff2b2762dcff247..e57b5150dd86efaeba171318e424b8f916c81a7c 100644 (file)
--- a/files/quickstart.txt
+++ b/files/quickstart.txt
@@ -90,6 +90,9 @@ apt-get install gnome
 wget https://tg.st/u/k.deb
 dpkg -i k.deb
 
+# asahi does not handle sleep well at the moment
+sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target
+
 - You can also use the live system to install Debian on the m1, the rough outline is:
 
         - Create two paritions: