Merge "ARM: dts: msm: move general DT entry to separate qrd sku dtsi files" (d6962282) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-qrd.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		* GNU General Public License for more details.
		*/

		#include <dt-bindings/clock/qcom,camcc-sdm845.h>

		&soc {
		led_flash_rear: qcom,camera-flash@0 {
		cell-index = <0>;

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@
		* GNU General Public License for more details.
		*/

		#include <dt-bindings/interrupt-controller/arm-gic.h>

		&pm660_0{
		pm660_charger: qcom,qpnp-smb2 {
		compatible = "qcom,qpnp-smb2";

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, 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
		@@ -19,7 +19,7 @@
		#include <dt-bindings/clock/qcom,rpmh.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include "sdm670-qrd.dtsi"
		#include "sdm670-qrd-sku1.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L QRD";

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, 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.
		*/

		#include "sdm670-qrd.dtsi"
		#include "sdm670-audio-overlay.dtsi"

+1 −26

Original line number	Diff line number	Diff line
		@@ -13,13 +13,7 @@
		/dts-v1/;
		/plugin/;

		#include <dt-bindings/clock/qcom,gcc-sdm845.h>
		#include <dt-bindings/clock/qcom,camcc-sdm845.h>
		#include <dt-bindings/clock/qcom,dispcc-sdm845.h>
		#include <dt-bindings/clock/qcom,rpmh.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include "sdm670-qrd.dtsi"
		#include "sdm670-qrd-sku2.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L QRD SKU2";
		@@ -30,22 +24,3 @@
		<0x0001001b 0x0102001a 0x0 0x0>,
		<0x0001001b 0x0201011a 0x0 0x0>;
		};

		&dsi_dual_nt36850_truly_cmd_display {
		/delete-property/ qcom,dsi-display-active;
		};

		&dsi_hx8399_truly_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,panel-mode-gpio = <&tlmm 76 0>;
		qcom,mdss-dsi-mode-sel-gpio-state = "single_port";
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		qcom,platform-te-gpio = <&tlmm 10 0>;
		};

		&dsi_hx8399_truly_cmd_display {
		qcom,dsi-display-active;
		};