diff options
| author | Tim Wawrzynczak <twawrzynczak@chromium.org> | 2020-07-03 09:36:11 -0600 |
|---|---|---|
| committer | Tim Wawrzynczak <twawrzynczak@chromium.org> | 2020-07-04 21:59:00 +0000 |
| commit | e414ce45325d05dbdcc6b9b89b3703371a7d3411 (patch) | |
| tree | fd883b75a01cf0f254ef361aad077f791fdb409e /src/ec/google | |
| parent | 54be395a9bfab6871ed997b331affdc2a3d5c646 (diff) | |
drivers/intel/pmc_mux: Rename con driver to conn
For historical reasons, Windows has issues with certain names being
used for files and directories, 'con' or 'CON' being one of
them. Therefore, rename the pmc_mux/con driver to pmc_mux/conn in
order to work around this issue.
TEST=built volteer (only user of this driver as of now)
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Change-Id: Ia78dc4efe647c96a7169a3b95fc3b8944d052c83
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43090
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Diffstat (limited to 'src/ec/google')
| -rw-r--r-- | src/ec/google/chromeec/ec_acpi.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ec/google/chromeec/ec_acpi.c b/src/ec/google/chromeec/ec_acpi.c index 8c80382b18..dca52854c5 100644 --- a/src/ec/google/chromeec/ec_acpi.c +++ b/src/ec/google/chromeec/ec_acpi.c @@ -124,17 +124,17 @@ static void add_port_location(struct acpi_dp *dsd, int port_number) port_location_to_str(port_caps.port_location)); } -static int con_id_to_match; +static int conn_id_to_match; /* A callback to match a port's connector for dev_find_matching_device_on_bus */ static bool match_connector(DEVTREE_CONST struct device *dev) { if (CONFIG(DRIVERS_INTEL_PMC)) { - extern struct chip_operations drivers_intel_pmc_mux_con_ops; + extern struct chip_operations drivers_intel_pmc_mux_conn_ops; - return (dev->chip_ops == &drivers_intel_pmc_mux_con_ops && + return (dev->chip_ops == &drivers_intel_pmc_mux_conn_ops && dev->path.type == DEVICE_PATH_GENERIC && - dev->path.generic.id == con_id_to_match); + dev->path.generic.id == conn_id_to_match); } return false; @@ -148,7 +148,7 @@ static void fill_ssdt_typec_device(const struct device *dev) struct device *usb3_port; struct device *usb4_port; const struct device *mux; - const struct device *con; + const struct device *conn; if (google_chromeec_get_num_pd_ports(&num_ports)) return; @@ -165,11 +165,11 @@ static void fill_ssdt_typec_device(const struct device *dev) continue; /* Get the MUX device, and find the matching connector on its bus */ - con = NULL; + conn = NULL; mux = soc_get_pmc_mux_device(i); if (mux) { - con_id_to_match = i; - con = dev_find_matching_device_on_bus(mux->link_list, match_connector); + conn_id_to_match = i; + conn = dev_find_matching_device_on_bus(mux->link_list, match_connector); } usb2_port = NULL; @@ -184,9 +184,9 @@ static void fill_ssdt_typec_device(const struct device *dev) .usb2_port = usb2_port, .usb3_port = usb3_port, .usb4_port = usb4_port, - .orientation_switch = con, - .usb_role_switch = con, - .mode_switch = con, + .orientation_switch = conn, + .usb_role_switch = conn, + .mode_switch = conn, }; acpigen_write_typec_connector(&config, i, add_port_location); |