Merge "ARM: dts: msm: modify wlan pil base address for prairie-iot" (f0aa6cf9) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -314,3 +314,4 @@ compatible = "qcom,trinket-iot"
		compatible = "qcom,trinketp-iot"
		compatible = "qcom,trinket-iot-idp"
		compatible = "qcom,trinketp-iot-idp"
		compatible = "qcom,qcs610-idp"

arch/arm64/boot/dts/qcom/Makefile

+17 −2

Original line number	Diff line number	Diff line
		@@ -248,7 +248,12 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		sa6155p-v2-adp-air-overlay.dtbo \
		qcs610-iot-overlay.dtbo \
		qcs610-ipc-overlay.dtbo \
		qcs410-iot-overlay.dtbo
		qcs410-iot-overlay.dtbo \
		prairie-iot-idp-overlay.dtbo \
		prairie-iot-external-codec-idp-overlay.dtbo \
		prairie-iot-usbc-idp-overlay.dtbo \
		prairie-iot-cmd-mone-display-idp-overlay.dtbo \
		prairie-iot-usbc-minidp-idp-overlay.dtbo

		sm6150-rumi-overlay.dtbo-base := sm6150.dtb
		sm6150-qrd-overlay.dtbo-base := sm6150.dtb
		@@ -268,6 +273,11 @@ sa6155p-v2-adp-air-overlay.dtbo-base := sa6155p.dtb
		qcs610-iot-overlay.dtbo-base := qcs610.dtb
		qcs610-ipc-overlay.dtbo-base := qcs610.dtb
		qcs410-iot-overlay.dtbo-base := qcs410.dtb
		prairie-iot-idp-overlay.dtbo-base := qcs610.dtb
		prairie-iot-external-codec-idp-overlay.dtbo-base := qcs610.dtb
		prairie-iot-usbc-idp-overlay.dtbo-base := qcs610.dtb
		prairie-iot-cmd-mode-display-idp-overlay.dtbo-base := qcs610.dtb
		prairie-iot-usbc-minidp-idp-overlay.dtbo-base := qcs610.dtb
		else
		dtb-$(CONFIG_ARCH_SM6150) += sm6150-rumi.dtb \
		sm6150-qrd.dtb \
		@@ -286,7 +296,12 @@ dtb-$(CONFIG_ARCH_SM6150) += sm6150-rumi.dtb \
		sa6155p-v2-adp-air.dtb \
		qcs610-iot.dtb \
		qcs610-ipc.dtb \
		qcs410-iot.dtb
		qcs410-iot.dtb \
		prairie-iot-idp.dtb \
		prairie-iot-external-codec-idp.dtb \
		prairie-iot-usbc-idp.dtb \
		prairie-iot-cmd-mode-display-idp.dtb \
		prairie-iot-usbc-minidp-idp.dtb

		endif

arch/arm64/boot/dts/qcom/prairie-iot-cmd-mode-display-idp-overlay.dts

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2020, 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 <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/clock/qcom,camcc-sm6150.h>

		#include "prairie-iot-idp.dtsi"
		#include "sm6150-audio-overlay.dtsi"

		/ {
		model = "Command mode display IDP overlay";
		compatible = "qcom,qcs610-idp", "qcom,qcs610", "qcom,idp";
		qcom,msm-id = <401 0x0>;
		qcom,board-id = <34 3>;
		};

		&qupv3_se1_i2c {
		synaptics_dsx@20 {
		compatible = "synaptics,dsx-i2c";
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <89 0x2008>;
		vdd-supply = <&pm6150_l10>;
		avdd-supply = <&pm6150l_l7>;
		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>;
		synaptics,pwr-reg-name = "avdd";
		synaptics,bus-reg-name = "vdd";
		synaptics,ub-i2c-addr = <0x20>;
		synaptics,max-y-for-2d = <2159>;
		synaptics,irq-gpio = <&tlmm 89 0x2008>;
		synaptics,reset-gpio = <&tlmm 88 0x0>;
		synaptics,irq-on-state = <0>;
		synaptics,power-delay-ms = <200>;
		synaptics,reset-delay-ms = <200>;
		synaptics,reset-on-state = <0>;
		synaptics,reset-active-ms = <20>;
		};

		himax_ts@48 {
		status = "disabled";
		};
		};

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

arch/arm64/boot/dts/qcom/prairie-iot-cmd-mode-display-idp.dts

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2020, 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 "qcs610.dtsi"
		#include "prairie-iot-idp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. QCS610 Command mode display IDP";
		compatible = "qcom,qcs610-idp", "qcom,qcs610", "qcom,idp";
		qcom,msm-id = <401 0x0>;
		qcom,board-id = <34 3>;
		};

arch/arm64/boot/dts/qcom/prairie-iot-external-codec-idp-overlay.dts

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2020, 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 <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/clock/qcom,camcc-sm6150.h>

		#include "prairie-iot-idp.dtsi"
		#include "sm6150-ext-codec-audio-overlay.dtsi"
		#include "sm6150-external-codec.dtsi"

		/ {
		model = "External Audio Codec IDP overlay";
		compatible = "qcom,qcs610-idp", "qcom,qcs610", "qcom,idp";
		qcom,msm-id = <401 0x0>;
		qcom,board-id = <34 1>;
		};

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