kernel: VC4 PixelValve and HDMI Drivers Locking Improvements for 5.10

See: raspberrypi/linux#4675 firmware: platform: Declare CM4's SIO_1V8_SEL and SD_PWR_ON See: raspberrypi/Raspberry-Pi-OS-64bit#188
raspberrypi · Nov 5, 2021 · c8c985a · c8c985a
1 parent 7aba611
commit c8c985a
Show file tree

Hide file tree

Showing 30 changed files with 165 additions and 10 deletions.
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup4.dat b/boot/fixup4.dat
diff --git a/boot/fixup4cd.dat b/boot/fixup4cd.dat
diff --git a/boot/fixup4db.dat b/boot/fixup4db.dat
diff --git a/boot/fixup4x.dat b/boot/fixup4x.dat
diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat
diff --git a/boot/fixup_db.dat b/boot/fixup_db.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/kernel7.img b/boot/kernel7.img
diff --git a/boot/kernel7l.img b/boot/kernel7l.img
diff --git a/boot/kernel8.img b/boot/kernel8.img
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start4.elf b/boot/start4.elf
diff --git a/boot/start4cd.elf b/boot/start4cd.elf
diff --git a/boot/start4db.elf b/boot/start4db.elf
diff --git a/boot/start4x.elf b/boot/start4x.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_db.elf b/boot/start_db.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/dt-blob.dts b/extra/dt-blob.dts
@@ -1775,12 +1775,10 @@
 
          pin_defines {
             pin_define@HDMI_CONTROL_ATTACHED {
-               type = "external";
-               number = <0>;
+               type = "absent";
             };
             pin_define@EMMC_ENABLE {
-               type = "external";
-               number = <1>;
+               type = "absent";
             };
             pin_define@NUM_CAMERAS {
                type = "internal";
@@ -1821,7 +1819,12 @@
                type = "absent";
             };
             pin_define@SIO_1V8_SEL {
-               type = "absent";
+               type = "external";
+               number = <4>;
+            };
+            pin_define@SD_PWR_ON {
+               type = "external";
+               number = <6>;
             };
             pin_define@PWML {
                type = "absent";
@@ -2119,6 +2122,158 @@
          }; // pin_defines
       }; // pins
 
+      pins_pi02w { // Pi Zero 2 W
+         pin_config {
+            pin@default {
+               polarity = "active_high";
+               termination = "pull_down";
+               startup_state = "inactive";
+               function = "input";
+            }; // pin
+            pin@p14 { function = "uart0";  termination = "no_pulling"; drive_strength_mA = < 8 >; }; // TX uart0
+            pin@p15 { function = "uart0";  termination = "pull_up";    drive_strength_mA = < 8 >; }; // RX uart0
+            pin@p28 { function = "input";  termination = "no_pulling"; polarity = "active_low"; }; // Hotplug
+            pin@p29 { function = "output"; termination = "pull_up"; }; // ACT_LED (GREEN)
+            pin@p34 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p35 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p36 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p37 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p38 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p39 { function = "input";  termination = "pull_up";    drive_strength_mA = < 8 >; };
+            pin@p40 { function = "output"; termination = "no_pulling"; }; // Camera shutdown
+            pin@p41 { function = "output"; termination = "no_pulling"; }; // WL_ON
+            pin@p42 { function = "output"; termination = "no_pulling"; }; // BT_ON
+            pin@p43 { function = "gp_clk"; termination = "pull_down"; }; // WIFI_CLK - Wifi 32kHz output
+            pin@p44 { function = "input";   termination = "pull_up";    }; // I2C 0 SDA
+            pin@p45 { function = "input";   termination = "pull_up";    }; // I2C 0 SCL
+            pin@p46 { function = "input";   termination = "pull_up";    }; // SMPS_SCL
+            pin@p47 { function = "input";   termination = "pull_up";    }; // SMPS_SDA
+            pin@p48 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD CLK
+            pin@p49 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD CMD
+            pin@p50 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD D0
+            pin@p51 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD D1
+            pin@p52 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD D2
+            pin@p53 { function = "sdcard"; termination = "pull_up";    drive_strength_mA = < 8 >; }; // SD D3
+         }; // pin_config
+
+         pin_defines {
+            pin_define@HDMI_CONTROL_ATTACHED {
+               type = "internal";
+               number = <28>;
+            };
+            pin_define@NUM_CAMERAS {
+               type = "internal";
+               number = <1>;
+            };
+            pin_define@CAMERA_0_I2C_PORT {
+               type = "internal";
+               number = <0>;
+            };
+            pin_define@CAMERA_0_SDA_PIN {
+               type = "internal";
+               number = <44>;
+            };
+            pin_define@CAMERA_0_SCL_PIN {
+               type = "internal";
+               number = <45>;
+            };
+            pin_define@CAMERA_0_SHUTDOWN {
+               type = "internal";
+               number = <40>;
+            };
+            pin_define@CAMERA_0_UNICAM_PORT {
+               type = "internal";
+               number = <1>;
+            };
+            pin_define@CAMERA_0_LED {
+               type = "absent";
+            };
+            pin_define@FLASH_0_ENABLE {
+               type = "absent";
+            };
+            pin_define@FLASH_0_INDICATOR {
+               type = "absent";
+            };
+            pin_define@FLASH_1_ENABLE {
+               type = "absent";
+            };
+            pin_define@FLASH_1_INDICATOR {
+               type = "absent";
+            };
+            pin_define@POWER_LOW {
+               type = "absent";
+            };
+            pin_define@LEDS_DISK_ACTIVITY {
+               type = "internal";
+               number = <29>;
+            };
+            pin_define@LAN_RUN {
+               type = "absent";
+            };
+            pin_define@LAN_RUN_BOOT {
+               type = "absent";
+            };
+            pin_define@BT_ON {
+               type = "internal";
+               number = <42>;
+            };
+            pin_define@WL_ON {
+               type = "internal";
+               number = <41>;
+            };
+            pin_define@WL_LPO_CLK {
+               type = "internal";
+               number = <43>;
+            };
+            pin_define@SMPS_SDA {
+               type = "internal";
+               number = <46>;
+            };
+            pin_define@SMPS_SCL {
+               type = "internal";
+               number = <47>;
+            };
+            pin_define@ETH_CLK {
+               type = "absent";
+            };
+            pin_define@USB_LIMIT_1A2 {
+               type = "absent";
+            };
+            pin_define@SIO_1V8_SEL {
+               type = "absent";
+            };
+            pin_define@PWML {
+               type = "absent";
+            };
+            pin_define@PWMR {
+               type = "absent";
+            };
+            pin_define@SAFE_MODE {
+               type = "absent";
+            };
+            pin_define@SD_CARD_DETECT {
+               type = "absent";
+            };
+            pin_define@ID_SDA {
+               type = "internal";
+               number = <0>;
+            };
+            pin_define@ID_SCL {
+               type = "internal";
+               number = <1>;
+            };
+            pin_define@DISPLAY_I2C_PORT {
+               type = "absent";
+            };
+            pin_define@DISPLAY_SDA {
+               type = "absent";
+            };
+            pin_define@DISPLAY_SCL {
+               type = "absent";
+            };
+         }; // pin_defines
+      }; // pins
+
       pins_cm {
          pin_config {
             pin@default {

diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-2a297702b85d53863458d698b60af4d8c3fc853f
+ef073f6a5205cd98aea2474bc4a59e7fb0f3476c
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 5.10.77+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 Fri Nov 5 13:47:33 GMT 2021
+Linux version 5.10.77+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 Fri Nov 5 18:12:37 GMT 2021
diff --git a/extra/uname_string7 b/extra/uname_string7
@@ -1 +1 @@
-Linux version 5.10.77-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP Fri Nov 5 13:50:01 GMT 2021
+Linux version 5.10.77-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP Fri Nov 5 18:13:18 GMT 2021
diff --git a/extra/uname_string7l b/extra/uname_string7l
@@ -1 +1 @@
-Linux version 5.10.77-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP Fri Nov 5 13:52:35 GMT 2021
+Linux version 5.10.77-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP Fri Nov 5 18:14:02 GMT 2021
diff --git a/extra/uname_string8 b/extra/uname_string8
@@ -1 +1 @@
-Linux version 5.10.77-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP PREEMPT Fri Nov 5 13:54:54 GMT 2021
+Linux version 5.10.77-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP PREEMPT Fri Nov 5 18:14:50 GMT 2021
diff --git a/modules/5.10.77+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.77+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.77-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.77-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.77-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.77-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.77-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.77-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2a297702b85d53863458d698b60af4d8c3fc853f
		ef073f6a5205cd98aea2474bc4a59e7fb0f3476c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 5.10.77+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 Fri Nov 5 13:47:33 GMT 2021
		Linux version 5.10.77+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 Fri Nov 5 18:12:37 GMT 2021
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 5.10.77-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP Fri Nov 5 13:50:01 GMT 2021
		Linux version 5.10.77-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP Fri Nov 5 18:13:18 GMT 2021
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 5.10.77-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP Fri Nov 5 13:52:35 GMT 2021
		Linux version 5.10.77-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP Fri Nov 5 18:14:02 GMT 2021
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 5.10.77-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1478 SMP PREEMPT Fri Nov 5 13:54:54 GMT 2021
		Linux version 5.10.77-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1479 SMP PREEMPT Fri Nov 5 18:14:50 GMT 2021