5 files changed, 17 insertions, 17 deletions
diff --git a/src/drivers/intel/pmc_mux/Makefile.inc b/src/drivers/intel/pmc_mux/Makefile.inc
index f27f01444b..61c957e514 100644
--- a/src/drivers/intel/pmc_mux/Makefile.inc
+++ b/src/drivers/intel/pmc_mux/Makefile.inc
@@ -1,2 +1,2 @@
-subdirs-y += con
+subdirs-y += conn
 ramstage-$(CONFIG_DRIVERS_INTEL_PMC) += mux.c
diff --git a/src/drivers/intel/pmc_mux/con/Makefile.inc b/src/drivers/intel/pmc_mux/con/Makefile.inc
deleted file mode 100644
index 213e8fc7ec..0000000000
--- a/src/drivers/intel/pmc_mux/con/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-ramstage-$(CONFIG_DRIVERS_INTEL_PMC) += con.c
diff --git a/src/drivers/intel/pmc_mux/conn/Makefile.inc b/src/drivers/intel/pmc_mux/conn/Makefile.inc
new file mode 100644
index 0000000000..babca2f9bb
--- /dev/null
+++ b/src/drivers/intel/pmc_mux/conn/Makefile.inc
@@ -0,0 +1 @@
+ramstage-$(CONFIG_DRIVERS_INTEL_PMC) += conn.c
diff --git a/src/drivers/intel/pmc_mux/con/chip.h b/src/drivers/intel/pmc_mux/conn/chip.h
index 02d018a2e9..8497350337 100644
--- a/src/drivers/intel/pmc_mux/con/chip.h
+++ b/src/drivers/intel/pmc_mux/conn/chip.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef __DRIVERS_INTEL_PMC_MUX_CON_H__
-#define __DRIVERS_INTEL_PMC_MUX_CON_H__
+#ifndef __DRIVERS_INTEL_PMC_MUX_CONN_H__
+#define __DRIVERS_INTEL_PMC_MUX_CONN_H__
 
 enum typec_orientation {
 	/* The orientation of the signal follows the orientation of the CC lines. */
@@ -12,7 +12,7 @@ enum typec_orientation {
 	TYPEC_ORIENTATION_REVERSE,
 };
 
-struct drivers_intel_pmc_mux_con_config {
+struct drivers_intel_pmc_mux_conn_config {
 	/* 1-based port numbers (from SoC point of view) */
 	int usb2_port_number;
 	/* 1-based port numbers (from SoC point of view) */
@@ -23,4 +23,4 @@ struct drivers_intel_pmc_mux_con_config {
 	enum typec_orientation hsl_orientation;
 };
 
-#endif /* __DRIVERS_INTEL_PMC_MUX_CON_H__ */
+#endif /* __DRIVERS_INTEL_PMC_MUX_CONN_H__ */
diff --git a/src/drivers/intel/pmc_mux/con/con.c b/src/drivers/intel/pmc_mux/conn/conn.c
index ad95905a9f..16d113bcb1 100644
--- a/src/drivers/intel/pmc_mux/con/con.c
+++ b/src/drivers/intel/pmc_mux/conn/conn.c
@@ -5,7 +5,7 @@
 #include <intelblocks/acpi.h>
 #include "chip.h"
 
-static const char *con_acpi_name(const struct device *dev)
+static const char *conn_acpi_name(const struct device *dev)
 {
 	static char name[5];
 	snprintf(name, sizeof(name), "CON%1X", dev->path.generic.id);
@@ -25,9 +25,9 @@ static const char *orientation_to_str(enum typec_orientation ori)
 	}
 }
 
-static void con_fill_ssdt(const struct device *dev)
+static void conn_fill_ssdt(const struct device *dev)
 {
-	struct drivers_intel_pmc_mux_con_config *config = dev->chip_info;
+	struct drivers_intel_pmc_mux_conn_config *config = dev->chip_info;
 	struct acpi_dp *dsd;
 	const char *scope;
 	const char *name;
@@ -72,19 +72,19 @@ static void con_fill_ssdt(const struct device *dev)
 	       dev_path(dev));
 }
 
-static struct device_operations con_dev_ops = {
+static struct device_operations conn_dev_ops = {
 	.read_resources	= noop_read_resources,
 	.set_resources	= noop_set_resources,
-	.acpi_name	= con_acpi_name,
-	.acpi_fill_ssdt	= con_fill_ssdt,
+	.acpi_name	= conn_acpi_name,
+	.acpi_fill_ssdt	= conn_fill_ssdt,
 };
 
-static void con_enable(struct device *dev)
+static void conn_enable(struct device *dev)
 {
-	dev->ops = &con_dev_ops;
+	dev->ops = &conn_dev_ops;
 }
 
-struct chip_operations drivers_intel_pmc_mux_con_ops = {
-	CHIP_NAME("Intel PMC MUX CON Driver")
-	.enable_dev	= con_enable,
+struct chip_operations drivers_intel_pmc_mux_conn_ops = {
+	CHIP_NAME("Intel PMC MUX CONN Driver")
+	.enable_dev	= conn_enable,
 };