From 4c5b0c7c1aeb84f03206a937924bd32df5e31dda Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 24 Aug 2022 01:19:59 +0300
Subject: [PATCH] pixel: Unify raviole & bluejay kernel

Change-Id: I520429575e989a5f7374dff27ec0903dbb290ced
---
 snippets/pixel.xml | 58 ++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/snippets/pixel.xml b/snippets/pixel.xml
index 306d1d5a..6ddb5f5b 100644
--- a/snippets/pixel.xml
+++ b/snippets/pixel.xml
@@ -1,43 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <!-- Pixel 6/6 Pro kernel modules -->
-  <project path="kernel/google/raviole/private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/aoc" name="kernel/google-modules/aoc" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/bms" name="kernel/google-modules/bms" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/display" name="kernel/google-modules/display" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/edgetpu" name="kernel/google-modules/edgetpu" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/gpu" name="kernel/google-modules/gpu" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/lwis" name="kernel/google-modules/lwis" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/nfc" name="kernel/google-modules/nfc" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/power/reset" name="kernel/google-modules/power/reset" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/touch/common" name="kernel/google-modules/touch/common" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/uwb" name="kernel/google-modules/uwb" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-  <project path="kernel/google/raviole/private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" remote="aosp" revision="refs/tags/android-12.1.0_r0.35" />
-
-  <!-- Pixel 6a kernel modules -->
-  <project path="kernel/google/bluejay/private/devices/google/bluejay" name="kernel/devices/google/bluejay" remote="aosp" revision="android-gs-bluejay-5.10-android12L-d2" />
-  <project path="kernel/google/bluejay/private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/aoc" name="kernel/google-modules/aoc" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/bms" name="kernel/google-modules/bms" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/display" name="kernel/google-modules/display" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/edgetpu" name="kernel/google-modules/edgetpu" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/fingerprint/fpc" name="kernel/google-modules/fingerprint/fpc" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/gpu" name="kernel/google-modules/gpu" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/lwis" name="kernel/google-modules/lwis" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/nfc" name="kernel/google-modules/nfc" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/power/reset" name="kernel/google-modules/power/reset" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/sensors/hall_sensor" name="kernel/google-modules/sensors/hall_sensor" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/touch/common" name="kernel/google-modules/touch/common" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/uwb" name="kernel/google-modules/uwb" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
-  <project path="kernel/google/bluejay/private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" remote="aosp" revision="refs/tags/android-12.1.0_r0.40" />
+  <!-- Pixel 6/6 Pro/6a kernel modules -->
+  <project path="kernel/google/gs101/private/devices/google/bluejay" name="kernel/devices/google/bluejay" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/aoc" name="kernel/google-modules/aoc" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/bms" name="kernel/google-modules/bms" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/display" name="kernel/google-modules/display" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/edgetpu/abrolhos" name="kernel/google-modules/edgetpu/abrolhos" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/fingerprint/fpc" name="kernel/google-modules/fingerprint/fpc" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/gpu" name="kernel/google-modules/gpu" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/lwis" name="kernel/google-modules/lwis" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/nfc" name="kernel/google-modules/nfc" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/power/reset" name="kernel/google-modules/power/reset" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/sensors/hall_sensor" name="kernel/google-modules/sensors/hall_sensor" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/touch/common" name="kernel/google-modules/touch/common" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/uwb" name="kernel/google-modules/uwb" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
+  <project path="kernel/google/gs101/private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" remote="aosp" revision="refs/tags/android-13.0.0_r0.15" />
 
 </manifest>