Merge "ARM: dts: msm: Add sdm632 rcm and ext codec device trees support" (9ee05189) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/Makefile

+25 −5

Original line number	Diff line number	Diff line
		@@ -300,7 +300,11 @@ dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \
		dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \
		sdm450-cdp-s2-overlay.dtbo \
		sdm450-mtp-s3-overlay.dtbo \
		sdm450-qrd-sku4-overlay.dtbo
		sdm632-ext-codec-cdp-s3-overlay.dtbo \
		sdm632-ext-codec-mtp-s4-overlay.dtbo \
		sdm632-rcm-overlay.dtbo \
		sdm450-qrd-sku4-overlay.dtbo \
		sdm632-qrd-overlay.dtbo

		dtbo-$(CONFIG_ARCH_SDM439) += sdm439-mtp-overlay.dtbo \
		sdm439-cdp-overlay.dtbo \
		@@ -350,6 +354,14 @@ sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \
		sdm632.dtb \
		sdm632-pm8004.dtb
		sdm632-rumi-overlay.dtbo-base := sdm632.dtb
		sdm632-ext-codec-cdp-s3-overlay.dtbo-base := sdm632.dtb \
		sdm632-pm8004.dtb
		sdm632-ext-codec-mtp-s4-overlay.dtbo-base := sdm632.dtb \
		sdm632-pm8004.dtb
		sdm632-rcm-overlay.dtbo-base := sdm632.dtb \
		sdm632-pm8004.dtb
		sdm632-qrd-overlay.dtbo-base := sdm632.dtb \
		sdm632-pm8004.dtb

		sdm439-mtp-overlay.dtbo-base := sdm439.dtb \
		msm8937-interposer-sdm439.dtb
		@@ -420,11 +432,19 @@ dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \

		dtb-$(CONFIG_ARCH_SDM632) += sdm632-rumi.dtb \
		sdm632-cdp-s2.dtb \
		sdm632-ext-codec-cdp-s3.dtb \
		sdm632-mtp-s3.dtb \
		sdm632-ext-codec-mtp-s4.dtb \
		sdm632-rcm.dtb \
		sdm632-qrd-sku4.dtb \
		sdm632-qrd.dtb \
		sdm632-pm8004-cdp-s2.dtb \
		sdm632-pm8004-ext-codec-cdp-s3.dtb \
		sdm632-pm8004-mtp-s3.dtb \
		sdm632-pm8004-qrd-sku4.dtb
		sdm632-pm8004-ext-codec-mtp-s4.dtb \
		sdm632-pm8004-rcm.dtb \
		sdm632-pm8004-qrd-sku4.dtb \
		sdm632-pm8004-qrd.dtb

		dtb-$(CONFIG_ARCH_SDM439) += sdm439-mtp.dtb \
		sdm439-cdp.dtb \

arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts

+1 −7

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		/dts-v1/;

		#include "sdm450.dtsi"
		#include "sdm450-qrd-sku4.dtsi"
		#include "sdm450-pmi632.dtsi"
		#include "sdm450-qrd-sku4.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM450 + PMI632 QRD SKU4";
		@@ -24,9 +24,3 @@
		qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
		};

		&pmi632_vadc {
		chan@4a {
		qcom,scale-function = <22>;
		};
		};

arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi

+27 −0

Original line number	Diff line number	Diff line
		@@ -150,3 +150,30 @@
		&sdhc_2 {
		cd-gpios = <&tlmm 133 0x0>;
		};

		&pmi632_vadc {
		chan@4a {
		qcom,scale-function = <22>;
		};
		};

		&soc {
		gpio_keys {
		camera_focus {
		label = "camera_focus";
		gpios = <&tlmm 87 0x1>;
		linux,input-type = <1>;
		linux,code = <0x210>;
		debounce-interval = <15>;
		};

		camera_snapshot {
		label = "camera_snapshot";
		gpios = <&tlmm 86 0x1>;
		linux,input-type = <1>;
		linux,code = <0x2fe>;
		debounce-interval = <15>;
		};
		};
		};

arch/arm64/boot/dts/qcom/sdm632-ext-codec-cdp-s3-overlay.dts

0 → 100644

+24 −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.
		*/

		/dts-v1/;
		/plugin/;

		#include "sdm632-ext-codec-cdp-s3.dtsi"

		/ {
		model = "Ext Codec CDP S3";
		compatible = "qcom,cdp";
		qcom,board-id = <1 3>;
		};

arch/arm64/boot/dts/qcom/sdm632-ext-codec-cdp-s3.dts

0 → 100644

+57 −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.
		*/

		/dts-v1/;

		#include "sdm632.dtsi"
		#include "sdm450-pmi632.dtsi"
		#include "sdm632-ext-codec-cdp-s3.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM632 + PMI632 Ext Codex CDP S3";
		compatible = "qcom,sdm632-cdp", "qcom,sdm632", "qcom,cdp";
		qcom,board-id = <1 3>;
		qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
		};


		&soc {
		gpio_keys {
		/delete-node/home;
		};
		};

		&tlmm {
		tlmm_gpio_key {
		gpio_key_active: gpio_key_active {
		mux {
		pins = "gpio85", "gpio86", "gpio87";
		};

		config {
		pins = "gpio85", "gpio86", "gpio87";
		};
		};

		gpio_key_suspend: gpio_key_suspend {
		mux {
		pins = "gpio85", "gpio86", "gpio87";
		};

		config {
		pins = "gpio85", "gpio86", "gpio87";
		};
		};
		};
		};