diff mbox series

[6/6] arm64: dts: exynos: gs101-oriole: add pd-disable and typec-power-opmode

Message ID 20241127-gs101-phy-lanes-orientation-dts-v1-6-5222d8508b71@linaro.org
State Superseded
Headers show
Series Google Pixel 6 (oriole): TCPCI enablement & USB updates | expand

Commit Message

André Draszik Nov. 27, 2024, 11:01 a.m. UTC
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@linaro.org>
---
 arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Krzysztof Kozlowski Nov. 28, 2024, 8:21 a.m. UTC | #1
On 27/11/2024 12:01, André Draszik wrote:
> 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@linaro.org>

This should be squashed to the previous patch, including also combining
commit messages.

Best regards,
Krzysztof
André Draszik Nov. 28, 2024, 8:34 a.m. UTC | #2
On Thu, 2024-11-28 at 09:21 +0100, Krzysztof Kozlowski wrote:
> On 27/11/2024 12:01, André Draszik wrote:
> > 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@linaro.org>
> 
> This should be squashed to the previous patch, including also combining
> commit messages.

I contemplated that, but I didn't in the end so that it's easy to just
revert this specific patch once the boot loader is updated.

I would prefer to keep them as separate patches for that reason, but will
squash if you still think that's better.

Cheers,
Andre'
Krzysztof Kozlowski Nov. 28, 2024, 8:34 a.m. UTC | #3
On 28/11/2024 09:34, André Draszik wrote:
> On Thu, 2024-11-28 at 09:21 +0100, Krzysztof Kozlowski wrote:
>> On 27/11/2024 12:01, André Draszik wrote:
>>> 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@linaro.org>
>>
>> This should be squashed to the previous patch, including also combining
>> commit messages.
> 
> I contemplated that, but I didn't in the end so that it's easy to just
> revert this specific patch once the boot loader is updated.
> 
> I would prefer to keep them as separate patches for that reason, but will
> squash if you still think that's better.
> 

OK, can be separate.

Best regards,
Krzysztof
diff mbox series

Patch

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>;