When the serial console is enabled, we need to disable power delivery since serial uses the SBU1/2 pins and appears to confuse the TCPCI, resulting in endless interrupts. For now, change the DT such that the serial console continues working. Note1: We can not have both typec-power-opmode and new-source-frs-typec-current active at the same time, as otherwise DT binding checks complain. Note2: When using a downstream DT, the Pixel boot-loader will modify the DT accordingly before boot, but for this upstream DT it doesn't know where to find the TCPCI node. The intention is for this commit to be reverted once an updated Pixel boot-loader becomes available. Signed-off-by: André Draszik <andre.draszik@xxxxxxxxxx> --- arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/exynos/google/gs101-oriole.dts b/arch/arm64/boot/dts/exynos/google/gs101-oriole.dts index 5f7be0cb7418..ef9ccd149b6f 100644 --- a/arch/arm64/boot/dts/exynos/google/gs101-oriole.dts +++ b/arch/arm64/boot/dts/exynos/google/gs101-oriole.dts @@ -107,7 +107,6 @@ connector { self-powered; try-power-role = "sink"; op-sink-microwatt = <2600000>; - new-source-frs-typec-current = <FRS_5V_1P5A>; slow-charger-loop; /* * max77759 operating in reverse boost mode (0xA) can @@ -146,6 +145,12 @@ VDO_DFP(DFP_VDO_VER1_1, 0, 0, 0x18d1) VDO_CERT(0x0) VDO_PRODUCT(0x4ee1, 0x0)>; + /* + * Until bootloader is updated to set those two when + * console is enabled, we disable PD here. + */ + pd-disable; + typec-power-opmode = "default"; ports { #address-cells = <1>; -- 2.47.0.338.g60cca15819-goog