diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 07f485fc..ca4847e3 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -129,6 +129,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_set_tso_max_size
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_get_named_gpio_flags
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_gpio_named_count
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += gpio_chip_struct_has_of_node_present
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pwm_ops_struct_has_owner
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epc_event_ops_struct_has_core_deinit
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 6a067f8c..865217eb 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -5496,6 +5496,24 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_OF_GPIO_NAMED_COUNT_PRESENT" "" "functions"
         ;;
 
+        gpio_chip_struct_has_of_node_present)
+            #
+            # Determine if struct gpio_chip has the of_node member or not.
+            #
+            # The of_node from struct gpio_chip is removed from commit 70d0fc4288dab
+            # ("gpiolib: Get rid of not used of_node member") in Linux 6.2
+            #
+            CODE="
+            #include <linux/gpio/driver.h>
+            int conftest_gpio_chip_struct_has_of_node_present(void)
+            {
+                return offsetof(struct gpio_chip, of_node);
+            }
+            "
+
+            compile_check_conftest "$CODE" "NV_GPIO_CHIP_STRUCT_HAS_OF_NODE_PRESENT" "" "types"
+        ;;
+
         devm_gpio_request_one)
             #
             # Determine if devm_gpio_request_one() function is present