Merge "ARM: dts: msm: Add DT support for APQ8053 SOM based devices" into msm-4.9 (ad7ebab3) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,10 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
		apq8053-iot-mtp.dtb \
		apq8053-lite-dragon-v1.0.dtb \
		apq8053-lite-dragon-v2.0.dtb \
		apq8053-lite-lenovo-v1.0.dtb \
		apq8053-lite-lenovo-v1.1.dtb \
		apq8053-lite-harman-v1.0.dtb \
		apq8053-lite-lge-v1.0.dtb \
		msm8953-pmi8940-cdp.dtb \
		msm8953-pmi8940-mtp.dtb \
		msm8953-pmi8937-cdp.dtb \

arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.0.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@

		/dts-v1/;

		#include "apq8053-lite.dtsi"
		#include "apq8053-lite-dragon-v2.0.dtsi"

		/ {

arch/arm64/boot/dts/qcom/apq8053-lite-dragon-v2.0.dtsi

+9 −52

Original line number	Diff line number	Diff line
		@@ -12,68 +12,25 @@
		*/

		#include "apq8053-lite-dragon.dtsi"
		#include "msm8953-mdss-panels.dtsi"

		&i2c_3 {
		status = "okay";
		himax_ts@48 {
		compatible = "himax,hxcommon";
		reg = <0x48>;
		interrupt-parent = <&tlmm>;
		interrupts = <65 0x2>;
		vdd-supply = <&pm8953_l10>;
		avdd-supply = <&pm8953_l5>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";
		pinctrl-0 = <&ts_int_active &ts_reset_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&ts_release>;
		himax,panel-coords = <0 800 0 1280>;
		himax,display-coords = <0 800 0 1280>;
		himax,irq-gpio = <&tlmm 65 0x2008>;
		report_type = <1>;
		};
		};

		&mdss_mdp {
		qcom,mdss-pref-prim-intf = "dsi";
		};

		&mdss_dsi {
		hw-config = "single_dsi";
		};

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_boyi_hx83100a_800p_video>;
		pinctrl-names = "mdss_default", "mdss_sleep";
		pinctrl-0 = <&mdss_dsi_active &mdss_te_active &mdss_dsi_gpio>;
		pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend &mdss_dsi_gpio>;

		vdd-supply = <&pm8953_l10>;
		vddio-supply = <&pm8953_l6>;
		lab-supply = <&lab_regulator>;
		ibb-supply = <&ibb_regulator>;

		qcom,platform-te-gpio = <&tlmm 24 0>;
		qcom,platform-reset-gpio = <&tlmm 61 0>;
		qcom,platform-bklight-en-gpio = <&tlmm 100 0>;
		};

		&mdss_dsi1 {
		status = "disabled";
		&pm8953_l4 {
		status = "okay";
		regulator-always-on;
		};

		&labibb {
		status = "okay";
		qpnp,qpnp-labibb-mode = "lcd";
		&camera0 {
		qcom,mount-angle = <90>;
		};

		&wled {
		qcom,cons-sync-write-delay-us = <1000>;
		qcom,led-strings-list = [00 01 02 03];
		&camera1 {
		qcom,mount-angle = <90>;
		};

		&pm8953_l4 {
		status = "okay";
		regulator-always-on;
		&camera2{
		qcom,mount-angle = <90>;
		};

arch/arm64/boot/dts/qcom/apq8053-lite-dragon.dtsi

+76 −27

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

		#include "apq8053-lite.dtsi"
		#include "msm8953-pinctrl.dtsi"
		#include "apq8053-camera-sensor-dragon.dtsi"
		#include "pmi8950.dtsi"
		@@ -185,39 +186,22 @@

		&i2c_3 {
		status = "okay";
		focaltech@38 {
		compatible = "focaltech,5x06";
		reg = <0x38>;
		himax_ts@48 {
		compatible = "himax,hxcommon";
		reg = <0x48>;
		interrupt-parent = <&tlmm>;
		interrupts = <65 0x2>;
		vdd-supply = <&pm8953_l10>;
		vcc_i2c-supply = <&pm8953_l5>;
		/* pins used by touchscreen */
		avdd-supply = <&pm8953_l5>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";
		pinctrl-0 = <&ts_int_active &ts_reset_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&ts_release>;
		focaltech,name = "ft5606";
		focaltech,family-id = <0x08>;
		focaltech,reset-gpio = <&tlmm 64 0x0>;
		focaltech,irq-gpio = <&tlmm 65 0x2008>;
		focaltech,display-coords = <0 0 1919 1199>;
		focaltech,panel-coords = <0 0 1919 1199>;
		focaltech,no-force-update;
		focaltech,i2c-pull-up;
		focaltech,group-id = <1>;
		focaltech,hard-reset-delay-ms = <20>;
		focaltech,soft-reset-delay-ms = <200>;
		focaltech,num-max-touches = <5>;
		focaltech,fw-delay-aa-ms = <30>;
		focaltech,fw-delay-55-ms = <30>;
		focaltech,fw-upgrade-id1 = <0x79>;
		focaltech,fw-upgrade-id2 = <0x08>;
		focaltech,fw-delay-readid-ms = <10>;
		focaltech,fw-delay-era-flsh-ms = <2000>;
		focaltech,fw-auto-cal;
		focaltech,resume-in-workqueue;
		himax,panel-coords = <0 800 0 1280>;
		himax,display-coords = <0 800 0 1280>;
		himax,irq-gpio = <&tlmm 65 0x2008>;
		report_type = <1>;
		};
		};

		@@ -229,6 +213,71 @@
		status = "disabled";
		};

		#include "msm8953-mdss-panels.dtsi"
		&mdss_mdp {
		qcom,mdss-pref-prim-intf = "dsi";
		};

		&mdss_dsi {
		hw-config = "single_dsi";
		};

		&mdss_dsi_active {
		mux {
		pins = "gpio61", "gpio100";
		function = "gpio";
		};

		config {
		pins = "gpio61", "gpio100";
		drive-strength = <8>;
		bias-disable = <0>;
		output-high;
		};
		};

		&mdss_dsi_suspend {
		mux {
		pins = "gpio61", "gpio100";
		function = "gpio";
		};

		config {
		pins = "gpio61", "gpio100";
		drive-strength = <2>;
		bias-pull-down;
		};
		};

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_boyi_hx83100a_800p_video>;
		pinctrl-names = "mdss_default", "mdss_sleep";
		pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
		pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

		vdd-supply = <&pm8953_l10>;
		vddio-supply = <&pm8953_l6>;
		lab-supply = <&lab_regulator>;
		ibb-supply = <&ibb_regulator>;

		qcom,platform-te-gpio = <&tlmm 24 0>;
		qcom,platform-reset-gpio = <&tlmm 61 0>;
		qcom,platform-bklight-en-gpio = <&tlmm 100 0>;
		};

		&mdss_dsi1 {
		status = "disabled";
		};

		&labibb {
		status = "okay";
		qpnp,qpnp-labibb-mode = "lcd";
		};

		&wled {
		qcom,cons-sync-write-delay-us = <1000>;
		qcom,led-strings-list = [00 01 02 03];
		};
		&blsp1_uart0 {
		status = "ok";
		pinctrl-names = "default";
		@@ -301,7 +350,7 @@
		pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
		&sdc2_wlan_gpio_off>;

		qcom,clk-rates = <400000 20000000 25000000 50000000>;
		qcom,clk-rates = <400000 20000000 25000000 50000000 100000000>;
		qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";

		status = "ok";

arch/arm64/boot/dts/qcom/apq8053-lite-harman-v1.0.dts

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* 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
		* 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 "apq8053-lite-harman-v1.0.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8053 Lite Harman v1.0 Board";
		compatible = "qcom,apq8053-lite-dragonboard", "qcom,apq8053",
		"qcom,dragonboard";
		qcom,board-id= <0x01020020 0>;
		};

		&blsp2_uart0 {
		status = "okay";
		};