Merge changes I74ca8c0e,I466748df,Ice0a8e82 into kernel.lnx.6.6.r1-rel
* changes: ARM: dts: msm: Add usb-role-switch and eud on kera ARM: dts: msm: Define maximum number of USB XHCI interrupters ARM: dts: msm: update touch io base address to spi qup node for kera
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
4ac647db7e
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
qts,touch-environment = "pvm";
|
qts,touch-environment = "pvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
#include <dt-bindings/input/input.h>
|
#include <dt-bindings/input/input.h>
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
qts,touch-environment = "pvm";
|
qts,touch-environment = "pvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
qts,touch-environment = "pvm";
|
qts,touch-environment = "pvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
qts,touch-environment = "pvm";
|
qts,touch-environment = "pvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -45,6 +45,9 @@
|
|||||||
qcom,use-pdc-interrupts;
|
qcom,use-pdc-interrupts;
|
||||||
qcom,use-eusb2-phy;
|
qcom,use-eusb2-phy;
|
||||||
|
|
||||||
|
extcon = <&eud>;
|
||||||
|
usb-role-switch;
|
||||||
|
|
||||||
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
||||||
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
||||||
<&aggre1_noc MASTER_USB3_0 &config_noc SLAVE_IPA_CFG>,
|
<&aggre1_noc MASTER_USB3_0 &config_noc SLAVE_IPA_CFG>,
|
||||||
@@ -83,7 +86,8 @@
|
|||||||
snps,dis_u2_susphy_quirk;
|
snps,dis_u2_susphy_quirk;
|
||||||
snps,ssp-u3-u0-quirk;
|
snps,ssp-u3-u0-quirk;
|
||||||
tx-fifo-resize;
|
tx-fifo-resize;
|
||||||
dr_mode = "peripheral";
|
num-hc-interrupters = /bits/ 16 <3>;
|
||||||
|
dr_mode = "otg";
|
||||||
maximum-speed = "super-speed-plus";
|
maximum-speed = "super-speed-plus";
|
||||||
usb-role-switch;
|
usb-role-switch;
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
&soc {
|
&soc {
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
qts,touch-environment = "tvm";
|
qts,touch-environment = "tvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
&soc {
|
&soc {
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
qts,touch-environment = "tvm";
|
qts,touch-environment = "tvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
&soc {
|
&soc {
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
qts,touch-environment = "tvm";
|
qts,touch-environment = "tvm";
|
||||||
qts,trusted-touch-type = "primary";
|
qts,trusted-touch-type = "primary";
|
||||||
qts,trusted-touch-spi-irq = <653>;
|
qts,trusted-touch-spi-irq = <653>;
|
||||||
qts,trusted-touch-io-bases = <0xa90000>;
|
qts,trusted-touch-io-bases = <0x880000>;
|
||||||
qts,trusted-touch-io-sizes = <0x1000>;
|
qts,trusted-touch-io-sizes = <0x1000>;
|
||||||
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
qts,trusted-touch-vm-gpio-list = <&tlmm 0 0 &tlmm 1 0 &tlmm 2 0
|
||||||
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
|
||||||
|
Reference in New Issue
Block a user