Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
Signed-off-by: Alex J Lennon <[email protected]>
  • Loading branch information
ajlennon committed Dec 9, 2024
1 parent aff7c4a commit a2aabd0
Showing 1 changed file with 32 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 7b107fa7414b..de0e49a94fb7 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -32,3 +32,7 @@ subdir-y += tesla
subdir-y += ti
subdir-y += toshiba
subdir-y += xilinx
+dtb-y += imx8mm-jaguar-sentai.dtb
+dtb-y += imx8mm-jaguar-sentai.dtb
+dtb-y += imx8mm-jaguar-sentai.dtb
+dtb-y += imx8mm-jaguar-sentai.dtb
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index 7ba1c59d14a2..dacd9708cd8b 100644
index 7ba1c59d14a2..9523a45f4fdf 100644
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -475,6 +475,8 @@ static int tcpci_vbus_force_discharge(struct tcpc_dev *tcpc, bool enable)
Expand Down Expand Up @@ -61,25 +73,26 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
if (source) {
ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
TCPC_CMD_SRC_VBUS_DEFAULT);
@@ -533,6 +547,8 @@ static int tcpci_set_vbus(struct tcpc_dev *tcpc, bool source, bool sink)
@@ -533,12 +547,18 @@ static int tcpci_set_vbus(struct tcpc_dev *tcpc, bool source, bool sink)
return ret;
}

+pr_warn("d6");
+
+#if 0
if (sink) {
ret = regmap_write(tcpci->regmap, TCPC_COMMAND,
TCPC_CMD_SINK_VBUS);
@@ -540,6 +556,8 @@ static int tcpci_set_vbus(struct tcpc_dev *tcpc, bool source, bool sink)
if (ret < 0)
return ret;
}

+pr_warn("d7");
+#endif
+
+pr_warn("d7");

return 0;
}

@@ -609,6 +627,8 @@ static int tcpci_init(struct tcpc_dev *tcpc)
@@ -609,6 +629,8 @@ static int tcpci_init(struct tcpc_dev *tcpc)
unsigned int reg;
int ret;

Expand All @@ -88,7 +101,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
while (time_before_eq(jiffies, timeout)) {
ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
if (ret < 0)
@@ -620,10 +640,14 @@ static int tcpci_init(struct tcpc_dev *tcpc)
@@ -620,10 +642,14 @@ static int tcpci_init(struct tcpc_dev *tcpc)
if (time_after(jiffies, timeout))
return -ETIMEDOUT;

Expand All @@ -103,7 +116,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
/* Handle vendor init */
if (tcpci->data->init) {
ret = tcpci->data->init(tcpci, tcpci->data);
@@ -631,14 +655,20 @@ static int tcpci_init(struct tcpc_dev *tcpc)
@@ -631,14 +657,20 @@ static int tcpci_init(struct tcpc_dev *tcpc)
return ret;
}

Expand All @@ -124,7 +137,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
if (tcpci->controls_vbus)
reg = TCPC_POWER_STATUS_VBUS_PRES;
else
@@ -647,12 +677,16 @@ static int tcpci_init(struct tcpc_dev *tcpc)
@@ -647,12 +679,16 @@ static int tcpci_init(struct tcpc_dev *tcpc)
if (ret < 0)
return ret;

Expand All @@ -141,7 +154,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
reg = TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_FAILED |
TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_RX_STATUS |
TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_CC_STATUS |
@@ -667,6 +701,9 @@ static int tcpci_init(struct tcpc_dev *tcpc)
@@ -667,6 +703,9 @@ static int tcpci_init(struct tcpc_dev *tcpc)
if (ret < 0)
return ret;
}
Expand All @@ -151,7 +164,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
return tcpci_write16(tcpci, TCPC_ALERT_MASK, reg);
}

@@ -785,6 +822,8 @@ static int tcpci_parse_config(struct tcpci *tcpci)
@@ -785,6 +824,8 @@ static int tcpci_parse_config(struct tcpci *tcpci)
{
tcpci->controls_vbus = true; /* XXX */

Expand All @@ -160,7 +173,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
tcpci->tcpc.fwnode = device_get_named_child_node(tcpci->dev,
"connector");
if (!tcpci->tcpc.fwnode) {
@@ -792,6 +831,8 @@ static int tcpci_parse_config(struct tcpci *tcpci)
@@ -792,6 +833,8 @@ static int tcpci_parse_config(struct tcpci *tcpci)
return -EINVAL;
}

Expand All @@ -169,7 +182,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
return 0;
}

@@ -800,6 +841,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
@@ -800,6 +843,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
struct tcpci *tcpci;
int err;

Expand All @@ -178,7 +191,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
tcpci = devm_kzalloc(dev, sizeof(*tcpci), GFP_KERNEL);
if (!tcpci)
return ERR_PTR(-ENOMEM);
@@ -826,6 +869,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
@@ -826,6 +871,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
tcpci->tcpc.frs_sourcing_vbus = tcpci_frs_sourcing_vbus;
tcpci->tcpc.set_partner_usb_comm_capable = tcpci_set_partner_usb_comm_capable;

Expand All @@ -187,7 +200,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
if (tcpci->data->auto_discharge_disconnect) {
tcpci->tcpc.enable_auto_vbus_discharge = tcpci_enable_auto_vbus_discharge;
tcpci->tcpc.set_auto_vbus_discharge_threshold =
@@ -834,19 +879,27 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
@@ -834,19 +881,27 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
TCPC_POWER_CTRL_BLEED_DISCHARGE);
}

Expand Down Expand Up @@ -215,7 +228,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
return tcpci;
}
EXPORT_SYMBOL_GPL(tcpci_register_port);
@@ -865,6 +918,8 @@ static int tcpci_probe(struct i2c_client *client,
@@ -865,6 +920,8 @@ static int tcpci_probe(struct i2c_client *client,
int err;
u16 val = 0;

Expand All @@ -224,7 +237,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
@@ -881,6 +936,8 @@ static int tcpci_probe(struct i2c_client *client,
@@ -881,6 +938,8 @@ static int tcpci_probe(struct i2c_client *client,
if (err < 0)
return err;

Expand All @@ -233,7 +246,7 @@ index 7ba1c59d14a2..dacd9708cd8b 100644
chip->tcpci = tcpci_register_port(&client->dev, &chip->data);
if (IS_ERR(chip->tcpci))
return PTR_ERR(chip->tcpci);
@@ -895,6 +952,8 @@ static int tcpci_probe(struct i2c_client *client,
@@ -895,6 +954,8 @@ static int tcpci_probe(struct i2c_client *client,
return err;
}

Expand Down

0 comments on commit a2aabd0

Please sign in to comment.