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

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

Merge changes Ic0c3dc0d,Ie5769983 into msm-next 

* changes:
  defconfig: sdm: Enable PINCTRL_SDM855 flag for SDM855 SoC
  ARM: dts: msm: Add pinctrl node for TLMM on SDM855 SoC
parents 9978d697 e81b0cb6

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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.

 */



&soc {

	tlmm: pinctrl@03000000 {

		compatible = "qcom,sdm855-pinctrl";

		reg = <0x03000000 0xdc2000>;

		interrupts = <0 208 0>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

arch/arm64/boot/dts/qcom/sdm855.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -283,3 +283,4 @@ 
		};

	};

};

#include "sdm855-pinctrl.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ CONFIG_SPI=y 
CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_SPMI=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ CONFIG_SPI=y 
CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_SPMI=y

CONFIG_PINCTRL_SDM855=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y