Guest User

Untitled

a guest
Aug 7th, 2026
208
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.40 KB | None | 0 0
  1. diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
  2. index c47e808cefd2..5ef28093bcdc 100644
  3. --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
  4. +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
  5. @@ -20,7 +20,7 @@ aliases {
  6.         wifi0 = &wifi0;
  7.         atcphy0 = &atcphy0;
  8.         atcphy1 = &atcphy1;
  9. -       usb4_1_acio = &usb4_1_acio;
  10. +       usb4_1_rc = &usb4_1_acio;
  11.         usb4_1_nhi = &usb4_1_nhi;
  12.     };
  13.  
  14. diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
  15. index bc14d7820e24..e812bfde274b 100644
  16. --- a/arch/arm64/boot/dts/apple/t8103.dtsi
  17. +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
  18. @@ -1132,9 +1132,6 @@ pcie_pins: pcie-pins {
  19.                      <APPLE_PINMUX(32, 1)>;
  20.             };
  21.  
  22. -           acio1_pins: acio1-pins {
  23. -               pinmux = <APPLE_PINMUX(41, 1)>;
  24. -           };
  25.         };
  26.  
  27.         nub_spmi: spmi@23d0d9300 {
  28. @@ -1346,6 +1343,10 @@ pinctrl_aop: pinctrl@24a820000 {
  29.                      <AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
  30.                      <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
  31.                      <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
  32. +           acio1_pins: acio1-pins {
  33. +               pinmux = <APPLE_PINMUX(41, 1)>;
  34. +           };
  35. +
  36.         };
  37.  
  38.         aop_mbox: mbox@24a408000 {
  39. diff --git a/drivers/thunderbolt/apple.c b/drivers/thunderbolt/apple.c
  40. index 5a8ebaefa3db..b52888a67e69 100644
  41. --- a/drivers/thunderbolt/apple.c
  42. +++ b/drivers/thunderbolt/apple.c
  43. @@ -645,7 +645,7 @@ static int apple_cio_tbt_switch_set(struct typec_thunderbolt_switch_dev *sw,
  44.         break;
  45.     case TYPEC_TBT_SWITCH_MODE_USB4:
  46.         acio->target_cable_info = TB_VSE_CAP_APPLE_CABLE_INFO_PRESENT;
  47. -       acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ACTIVE;
  48. +       //acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ACTIVE;
  49.         if (data->orientation == TYPEC_ORIENTATION_REVERSE)
  50.             acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ORIENTATION_REVERSE;
  51.         break;
  52. diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
  53. index c5b7dd2a6f2e..435d2d93e6d7 100644
  54. --- a/drivers/thunderbolt/nhi.c
  55. +++ b/drivers/thunderbolt/nhi.c
  56. @@ -619,12 +619,13 @@ static struct tb_ring *tb_ring_alloc(struct tb_nhi *nhi, u32 hop, int size,
  57.     if (!ring->descriptors)
  58.         goto err_free_ring;
  59.  
  60. +   if (nhi_alloc_hop(nhi, ring))
  61. +       goto err_release_irq;
  62. +
  63.     if (nhi->ops->ring_request_irq &&
  64.         nhi->ops->ring_request_irq(ring, flags & RING_FLAG_NO_SUSPEND))
  65.         goto err_free_descs;
  66.  
  67. -   if (nhi_alloc_hop(nhi, ring))
  68. -       goto err_release_irq;
  69.  
  70.     return ring;
  71.  
Advertisement
Add Comment
Please, Sign In to add comment