radxa-zero: 6.0/edge: update USB-C patch with "fix interrupt st…

…orm from fusb302"
armbian · Nov 11, 2022 · 4396ffc · 4396ffc
1 parent bd6fef9
commit 4396ffc
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/...ernel/archive/meson64-6.0/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch b/...ernel/archive/meson64-6.0/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
@@ -1,23 +1,29 @@
-From 795fad491189f7fd6034d6d639602119a4e60755 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 17 Aug 2021 16:16:43 +0000
-Subject: [PATCH 68/90] WIP: arm64: dts: meson: radxa-zero: add support for the
- usb type-c controller
+Subject: [PATCH] arm64: dts: meson: radxa-zero: add support for the usb type-c
+ controller
 
 Radxa Zero uses an FUSB302 type-c controller, so lets enable it.
 
 NB: Polarity swapping via GPIO is not implemented in the current driver
 (see drivers/usb/typec/tcpm/fusb302.c) so it is not possible to handle
 GPIOAO_6 for USB3 polarity control.
 
+Includes:
+- arm64: dts: amlogic: fix interrupt storm from fusb302 on Radxa Zero
+  it makes load average >1. use correct pin for interrupt from fusb302.
+
+Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
 Suggested-by: Neil Armstrong <narmstrong@baylibre.com>
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Yuntian Zhang <yt@radxa.com>
 ---
- .../dts/amlogic/meson-g12a-radxa-zero.dts     | 44 +++++++++++++++++++
+ .../dts/amlogic/meson-g12a-radxa-zero.dts     | 48 +++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-index e3bb6df42ff3..5e3dc013409f 100644
+index e3bb6df42..5e3dc0134 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 @@ -60,6 +60,14 @@ sdio_pwrseq: sdio-pwrseq {
@@ -54,19 +60,23 @@ index e3bb6df42ff3..5e3dc013409f 100644
  &arb {
  	status = "okay";
  };
-@@ -278,6 +298,22 @@ &ir {
+@@ -278,6 +298,26 @@ &ir {
  	pinctrl-names = "default";
  };
 
-+&i2c_AO {
++&i2c3 {
++	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
 +	fusb302@22 {
 +		compatible = "fcs,fusb302";
 +		reg = <0x22>;
 +
 +		pinctrl-0 = <&fusb302_irq_pins>;
 +		pinctrl-names = "default";
 +		interrupt-parent = <&gpio_intc>;
-+		interrupts = <59 IRQ_TYPE_LEVEL_LOW>;
++		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
 +
 +		vbus-supply = <&typec2_vbus>;
 +
@@ -90,5 +100,4 @@ index e3bb6df42ff3..5e3dc013409f 100644
 +	phy-supply = <&typec2_vbus>;
 +};
 -- 
-2.35.1
-
+2.36.1