From c3ec246acc6b1b4747a5dbdbf1bf324a1ae64ebf Mon Sep 17 00:00:00 2001 From: hujing3 Date: Mon, 29 Jun 2020 17:45:36 +0800 Subject: [PATCH] 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 Reviewed-on: https://gerrit.mot.com/1651140 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jianguo Liu Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- qcom/Makefile | 2 +- qcom/bengal-cebu-common-overlay.dtsi | 1 - qcom/bengal-cebu-pinctrl-overlay.dtsi | 22 ---------------- qcom/bengal-moto-base-cebu.dts | 38 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 24 deletions(-) delete mode 100644 qcom/bengal-cebu-pinctrl-overlay.dtsi create mode 100644 qcom/bengal-moto-base-cebu.dts diff --git a/qcom/Makefile b/qcom/Makefile index 6ebc8cc39253..106b81c0c1b7 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -43,7 +43,7 @@ bengal-borneo-evt-overlay.dtbo-base := bengal-moto-base-borneo.dtb dtbo-$(CONFIG_CEBU_DTB) += \ 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 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) diff --git a/qcom/bengal-cebu-common-overlay.dtsi b/qcom/bengal-cebu-common-overlay.dtsi index 980c0930af3c..37142c8e1ff8 100644 --- a/qcom/bengal-cebu-common-overlay.dtsi +++ b/qcom/bengal-cebu-common-overlay.dtsi @@ -14,7 +14,6 @@ #include "bengal-moto-common-overlay.dtsi" #include "bengal-cebu-display.dtsi" #include "bengal-cebu-touchscreen-overlay.dtsi" -#include "bengal-cebu-pinctrl-overlay.dtsi" #include "bengal-audio-overlay.dtsi" #include "bengal-cebu-awinic-audio-overlay.dtsi" #include "camera/bengal-camera-sensor-mot-cebu-overlay.dtsi" diff --git a/qcom/bengal-cebu-pinctrl-overlay.dtsi b/qcom/bengal-cebu-pinctrl-overlay.dtsi deleted file mode 100644 index bb0e654e5235..000000000000 --- a/qcom/bengal-cebu-pinctrl-overlay.dtsi +++ /dev/null @@ -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 { - }; -}; diff --git a/qcom/bengal-moto-base-cebu.dts b/qcom/bengal-moto-base-cebu.dts new file mode 100644 index 000000000000..1ead13a8d4c5 --- /dev/null +++ b/qcom/bengal-moto-base-cebu.dts @@ -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; +};