Merge "ARM: dts: msm: Add pinctrl conifg to support led and pcie on sdm845 rb3" (11894729) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,8 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \
		sdm845-4k-panel-cdp.dtb \
		sdm845-4k-panel-qrd.dtb \
		sdm845-interposer-sdm670-mtp.dtb \
		sdm845-interposer-sdm670-cdp.dtb
		sdm845-interposer-sdm670-cdp.dtb \
		sdm845-v2.1-rb3.dtb
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+45 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2019, 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
		@@ -341,6 +341,32 @@
		bias-pull-up;
		};
		};

		pcie0_3v3_on: pcie0_3v3_on {
		mux {
		pins = "gpio90";
		function = "gpio";
		};
		config {
		pins = "gpio90";
		drive_strength = <2>;
		bias-disable;
		output-high;
		};
		};

		pcie0_1v5_on: pcie0_1v5_on {
		mux {
		pins = "gpio90";
		function = "gpio";
		};
		config {
		pins = "gpio90";
		drive_strength = <2>;
		bias-disable;
		output-high;
		};
		};
		};

		pcie1 {
		@@ -3538,6 +3564,15 @@
		};
		};

		led_bt {
		led_bt_default: led_bt_default {
		pins = "gpio5";
		function = "normal";
		power-source = <0>;
		output-low;
		};
		};

		key_vol_up {
		key_vol_up_default: key_vol_up_default {
		pins = "gpio6";
		@@ -3568,6 +3603,15 @@
		};
		};

		led_wifi {
		led_wifi_default: led_wifi_default {
		pins = "gpio9";
		function = "normal";
		power-source = <0>;
		output-low;
		};
		};

		camera_dvdd_en {
		camera_dvdd_en_default: camera_dvdd_en_default {
		pins = "gpio9";

arch/arm64/boot/dts/qcom/sdm845-v2.1-rb3.dts

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, 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 "sdm845-v2.1-rb3.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. sda845 v2.1 TurboX-SOM_V01";
		compatible = "qcom,sda845-mtp", "qcom,sda845", "qcom,mtp";
		qcom,msm-id = <341 0x20001>;
		qcom,board-id = <8 0>;
		aliases {
		spi0 = &qupv3_se5_spi;
		};
		};

arch/arm64/boot/dts/qcom/sdm845-v2.1-rb3.dtsi

0 → 100644

+103 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, 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 <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 "sda845-v2.1.dtsi"
		#include "sdm845-sde-display.dtsi"
		#include "sdm845-mtp.dtsi"
		#include "sdm845-audio-overlay.dtsi"

		&labibb {
		status = "disabled";
		};

		&pmi8998_wled {
		status = "disabled";
		};

		&qupv3_se3_i2c {
		status = "disabled";
		};

		&pmi8998_pdphy {
		vbus-supply = <&smb2_vbus>;
		};

		&pmi8998_pwm_2 {
		status = "ok";
		};

		&ext_5v_boost {
		status = "disabled";
		};

		&wil6210 {
		status = "disabled";
		};

		&smb1355_0 {
		status = "disabled";
		};

		&smb1355_1 {
		status = "disabled";
		};

		&key_home_default {
		pins = "gpio4";
		};

		&max_rst_active {
		mux {
		pins = "gpio31","gpio77","gpio32";
		};
		config {
		pins = "gpio31","gpio77","gpio32";
		};
		};

		&max_rst_suspend {
		mux {
		pins = "gpio31","gpio77","gpio32";
		};
		config {
		pins = "gpio31","gpio77","gpio32";
		};
		};

		&camera_dvdd_en_default {
		pins = "gpio11";
		};

		&sde_dp {
		status = "disabled";
		};

		&mdss_mdp {
		status = "disabled";
		};

		&soc {
		qcom,qbt1000 {
		compatible = "qcom,qbt1000";
		clock-names = "core", "iface";
		clock-frequency = <25000000>;
		qcom,ipc-gpio = <&tlmm 121 0>;
		qcom,finger-detect-gpio = <&pm8998_gpios 4 0>;
		};
		};