arm/dts: Cebu: tp gpio conflict case update
Cebu: cebu tp rst gpio66, tp int gpio67. delete default gpio66/67 node cam_sensor_csi_mux_oe & cam_sensor_csi_mux_sel, which are useless in cebu and conflict with tp gpio. Change-Id: Iaf573328c6595a6db9b658fe9d3f8f8b7a5f128d Signed-off-by: hujing3 <hujing3@lenovo.com> Reviewed-on: https://gerrit.mot.com/1651140 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jianguo Liu <liujg6@motorola.com> Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
1 parent
361170a031
commit
c3ec246acc
4 files changed
+39
-24
No files matched your search
+1
-1
@@ -43,7 +43,7 @@ bengal-borneo-evt-overlay.dtbo-base := bengal-moto-base-borneo.dtb
|
|||||||
dtbo-$(CONFIG_CEBU_DTB) += \
|
dtbo-$(CONFIG_CEBU_DTB) += \
|
||||||
bengal-cebu-evt-overlay.dtbo
|
bengal-cebu-evt-overlay.dtbo
|
||||||
|
|
||||||
bengal-cebu-evt-overlay.dtbo-base := bengal-moto-base.dtb
|
bengal-cebu-evt-overlay.dtbo-base := bengal-moto-base-cebu.dtb
|
||||||
|
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
|
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#include "bengal-moto-common-overlay.dtsi"
|
#include "bengal-moto-common-overlay.dtsi"
|
||||||
#include "bengal-cebu-display.dtsi"
|
#include "bengal-cebu-display.dtsi"
|
||||||
#include "bengal-cebu-touchscreen-overlay.dtsi"
|
#include "bengal-cebu-touchscreen-overlay.dtsi"
|
||||||
#include "bengal-cebu-pinctrl-overlay.dtsi"
|
|
||||||
#include "bengal-audio-overlay.dtsi"
|
#include "bengal-audio-overlay.dtsi"
|
||||||
#include "bengal-cebu-awinic-audio-overlay.dtsi"
|
#include "bengal-cebu-awinic-audio-overlay.dtsi"
|
||||||
#include "camera/bengal-camera-sensor-mot-cebu-overlay.dtsi"
|
#include "camera/bengal-camera-sensor-mot-cebu-overlay.dtsi"
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 and
|
|
||||||
* only version 2 as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
&tlmm {
|
|
||||||
/* cam_sensor_csi_mux_oe_active default gpio66 is conflict with TP rst gpio, disable it. */
|
|
||||||
/* cam_sensor_csi_mux_oe_active is uselsess in Cebu. */
|
|
||||||
cam_sensor_csi_mux_oe_active: cam_sensor_csi_mux_oe_active {
|
|
||||||
};
|
|
||||||
|
|
||||||
cam_sensor_csi_mux_oe_suspend: cam_sensor_csi_mux_oe_suspend {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/* Copyright (c) 2020, The Linux Foundation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 and
|
||||||
|
* only version 2 as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "bengal-moto-base.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
qcom,board-id = <0 0>;
|
||||||
|
channel-id-map = "";
|
||||||
|
/*
|
||||||
|
* Some nodes need labels assigned to appear in __symbols__
|
||||||
|
*/
|
||||||
|
chosen: chosen { };
|
||||||
|
aliases: aliases { };
|
||||||
|
reserved_memory: reserved-memory { };
|
||||||
|
mot_batterydata: qcom,battery-data { };
|
||||||
|
utags: utags { };
|
||||||
|
hw: hw { };
|
||||||
|
};
|
||||||
|
|
||||||
|
&tlmm {
|
||||||
|
/* delete cam_sensor_csi_mux_oe & cam_sensor_csi_mux_sel which are uselsess in Cebu. */
|
||||||
|
/* cam_sensor_csi_mux_oe & cam_sensor_csi_mux_sel default gpio66/67 are conflict with TP rst/int gpio. */
|
||||||
|
/delete-node/ cam_sensor_csi_mux_oe_active;
|
||||||
|
/delete-node/ cam_sensor_csi_mux_oe_suspend;
|
||||||
|
/delete-node/ cam_sensor_csi_mux_sel_active;
|
||||||
|
/delete-node/ cam_sensor_csi_mux_sel_suspend;
|
||||||
|
};
|
||||||
Reference in new issue
Block a user