Merge 3ba27e2e63 on remote branch

Change-Id: Ibfd4c1f1c740757b723cb6f6dce74a8f2e7be195
This commit is contained in:
Linux Build Service Account
2023-03-23 02:05:36 -07:00
9 changed files with 1311 additions and 4 deletions

View File

@@ -55,9 +55,11 @@
label = "gpio-keys";
pinctrl-names = "default";
/*IMU CLKIN GPIO */
pinctrl-0 = <&key_vol_up_default
&key_confirm_default
&key_back_default>;
&key_back_default
&imu_clkin_default>;
confirm_key {
label = "confirm_key";
@@ -93,6 +95,7 @@
&pm8550b_haptics {
status = "okay";
};
&pmxr2230_flash {

View File

@@ -593,3 +593,16 @@
status = "ok";
};
};
&pmk8550_gpios {
imu_clk {
imu_clkin_default: imu_clkin_default {
pins = "gpio3";
function = "func1";
input-disable;
output-enable;
power-source = <0>;
qcom,drive-strength = <3>;
};
};
};

View File

@@ -337,7 +337,8 @@
lane-channel-swap;
pinctrl-names = "default";
pinctrl-0 = <&usb3phy_portselect_gpio>;
/*IMU CLKIN GPIO */
pinctrl-0 = <&usb3phy_portselect_gpio &imu_clkin_default>;
gpios = <&tlmm 160 0>;
eq = /bits/ 8 <

View File

@@ -3160,7 +3160,6 @@
#include "cape-usb.dtsi"
#include "cape-pcie.dtsi"
#include "msm-rdbg.dtsi"
#include "waipio-eva.dtsi"
#include "ipcc-test.dtsi"
&qupv3_se7_2uart {

View File

@@ -26,3 +26,7 @@
&bluetooth_qca6490 {
status = "ok";
};
&wpss_pas {
status = "disabled";
};

View File

@@ -11,6 +11,10 @@
/delete-property/ memory-region;
};
&wpss_etm {
status = "disabled";
};
&reserved_memory {
cnss_wlan_mem: cnss_wlan_region {
compatible = "shared-dma-pool";

View File

@@ -731,6 +731,7 @@
clocks = <&aoss_qmp>;
clock-names = "apb_pclk";
qcom,cmb-msr-skip;
status = "disabled";
out-ports {
port {
@@ -754,6 +755,7 @@
clocks = <&aoss_qmp>;
clock-names = "apb_pclk";
qcom,cmb-msr-skip;
status = "disabled";
out-ports {
port {

File diff suppressed because it is too large Load Diff

View File

@@ -3455,7 +3455,6 @@
#include "waipio-coresight.dtsi"
#include "waipio-dma-heaps.dtsi"
#include "waipio-debug.dtsi"
#include "waipio-eva.dtsi"
#include "waipio-pcie.dtsi"
#include "msm-rdbg.dtsi"
#include "waipio-gpu.dtsi"