Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89a72967 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: disable HBTP touch DT for 8953 IOT devices"

parents 17aa8b8e 89b16106

arch/arm/boot/dts/qcom/apq8053-ext-codec-rcm.dts

+5 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -83,6 +83,10 @@ 
	gpio_keys {

	gpio_keys {

		/delete-node/ home;

		/delete-node/ home;

	};

	};



	hbtp {

		status = "disabled";

	};

};

};





&gpio_key_active {

&gpio_key_active {

arch/arm/boot/dts/qcom/apq8053-iot-mtp.dts

+5 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -81,6 +81,10 @@ 
		qcom,notify-host-mode;

		qcom,notify-host-mode;

		qcom,gpio-mode-sel = <&tlmm 12 0>;

		qcom,gpio-mode-sel = <&tlmm 12 0>;

	};

	};



	hbtp {

		status = "disabled";

	};

};

};





&int_codec {

&int_codec {

arch/arm/boot/dts/qcom/apq8053-rcm.dts

+5 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -27,6 +27,10 @@ 
	gpio_keys {

	gpio_keys {

		/delete-node/ home;

		/delete-node/ home;

	};

	};



	hbtp {

		status = "disabled";

	};

};

};





&gpio_key_active {

&gpio_key_active {

arch/arm/boot/dts/qcom/msm8953-iot-mtp.dts

+7 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -52,3 +52,9 @@ 
&wcnss_fw_mem {

&wcnss_fw_mem {

	reg = <0x0 0x89b00000 0x0 0x700000>;

	reg = <0x0 0x89b00000 0x0 0x700000>;

};

};



&soc {

	hbtp {

		status = "disabled";

	};

};