Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
- index c47e808cefd2..5ef28093bcdc 100644
- --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
- +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
- @@ -20,7 +20,7 @@ aliases {
- wifi0 = &wifi0;
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
- - usb4_1_acio = &usb4_1_acio;
- + usb4_1_rc = &usb4_1_acio;
- usb4_1_nhi = &usb4_1_nhi;
- };
- diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
- index bc14d7820e24..e812bfde274b 100644
- --- a/arch/arm64/boot/dts/apple/t8103.dtsi
- +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
- @@ -1132,9 +1132,6 @@ pcie_pins: pcie-pins {
- <APPLE_PINMUX(32, 1)>;
- };
- - acio1_pins: acio1-pins {
- - pinmux = <APPLE_PINMUX(41, 1)>;
- - };
- };
- nub_spmi: spmi@23d0d9300 {
- @@ -1346,6 +1343,10 @@ pinctrl_aop: pinctrl@24a820000 {
- <AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
- + acio1_pins: acio1-pins {
- + pinmux = <APPLE_PINMUX(41, 1)>;
- + };
- +
- };
- aop_mbox: mbox@24a408000 {
- diff --git a/drivers/thunderbolt/apple.c b/drivers/thunderbolt/apple.c
- index 5a8ebaefa3db..b52888a67e69 100644
- --- a/drivers/thunderbolt/apple.c
- +++ b/drivers/thunderbolt/apple.c
- @@ -645,7 +645,7 @@ static int apple_cio_tbt_switch_set(struct typec_thunderbolt_switch_dev *sw,
- break;
- case TYPEC_TBT_SWITCH_MODE_USB4:
- acio->target_cable_info = TB_VSE_CAP_APPLE_CABLE_INFO_PRESENT;
- - acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ACTIVE;
- + //acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ACTIVE;
- if (data->orientation == TYPEC_ORIENTATION_REVERSE)
- acio->target_cable_info |= TB_VSE_CAP_APPLE_CABLE_INFO_ORIENTATION_REVERSE;
- break;
- diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
- index c5b7dd2a6f2e..435d2d93e6d7 100644
- --- a/drivers/thunderbolt/nhi.c
- +++ b/drivers/thunderbolt/nhi.c
- @@ -619,12 +619,13 @@ static struct tb_ring *tb_ring_alloc(struct tb_nhi *nhi, u32 hop, int size,
- if (!ring->descriptors)
- goto err_free_ring;
- + if (nhi_alloc_hop(nhi, ring))
- + goto err_release_irq;
- +
- if (nhi->ops->ring_request_irq &&
- nhi->ops->ring_request_irq(ring, flags & RING_FLAG_NO_SUSPEND))
- goto err_free_descs;
- - if (nhi_alloc_hop(nhi, ring))
- - goto err_release_irq;
- return ring;
Advertisement
Add Comment
Please, Sign In to add comment