diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index c08501a5620d..9c3bbe2c3e6f 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -471,8 +471,6 @@ void drm_connector_cleanup(struct drm_connector *connector)
 	drm_mode_object_unregister(dev, &connector->base);
 	kfree(connector->name);
 	connector->name = NULL;
-	fwnode_handle_put(connector->fwnode);
-	connector->fwnode = NULL;
 	spin_lock_irq(&dev->mode_config.connector_list_lock);
 	list_del(&connector->head);
 	dev->mode_config.num_connector--;
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 71a0d9596efe..a3b71478c590 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -10,7 +10,6 @@
  * Copyright (c) 2003-2004 IBM Corp.
  */
 
-#include <linux/acpi.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/export.h>
@@ -57,39 +56,6 @@ static struct device_type drm_sysfs_device_connector = {
 
 struct class *drm_class;
 
-#ifdef CONFIG_ACPI
-static bool drm_connector_acpi_bus_match(struct device *dev)
-{
-	return dev->type == &drm_sysfs_device_connector;
-}
-
-static struct acpi_device *drm_connector_acpi_find_companion(struct device *dev)
-{
-	struct drm_connector *connector = to_drm_connector(dev);
-
-	return to_acpi_device_node(connector->fwnode);
-}
-
-static struct acpi_bus_type drm_connector_acpi_bus = {
-	.name = "drm_connector",
-	.match = drm_connector_acpi_bus_match,
-	.find_companion = drm_connector_acpi_find_companion,
-};
-
-static void drm_sysfs_acpi_register(void)
-{
-	register_acpi_bus_type(&drm_connector_acpi_bus);
-}
-
-static void drm_sysfs_acpi_unregister(void)
-{
-	unregister_acpi_bus_type(&drm_connector_acpi_bus);
-}
-#else
-static void drm_sysfs_acpi_register(void) { }
-static void drm_sysfs_acpi_unregister(void) { }
-#endif
-
 static char *drm_devnode(struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
@@ -123,8 +89,6 @@ int drm_sysfs_init(void)
 	}
 
 	drm_class->devnode = drm_devnode;
-
-	drm_sysfs_acpi_register();
 	return 0;
 }
 
@@ -137,7 +101,6 @@ void drm_sysfs_destroy(void)
 {
 	if (IS_ERR_OR_NULL(drm_class))
 		return;
-	drm_sysfs_acpi_unregister();
 	class_remove_file(drm_class, &class_attr_version.attr);
 	class_destroy(drm_class);
 	drm_class = NULL;
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index ffad68f775cc..928136556174 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1174,14 +1174,6 @@ struct drm_connector {
 	struct device *kdev;
 	/** @attr: sysfs attributes */
 	struct device_attribute *attr;
-	/**
-	 * @fwnode: associated fwnode supplied by platform firmware
-	 *
-	 * Drivers can set this to associate a fwnode with a connector, drivers
-	 * are expected to get a reference on the fwnode when setting this.
-	 * drm_connector_cleanup() will call fwnode_handle_put() on this.
-	 */
-	struct fwnode_handle *fwnode;
 
 	/**
 	 * @head: