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

Commit 6a662735 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial dts support for trinket-iot"

parents d8d7d242 168e06a0
Loading
Loading
Loading
Loading
+32 −2
Original line number Diff line number Diff line
@@ -331,7 +331,17 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		trinket-external-codec-idp-overlay.dtbo \
		trinket-usbc-external-codec-idp-overlay.dtbo \
		trinket-usbc-idp-overlay.dtbo \
		trinket-dp-idp-overlay.dtbo
		trinket-dp-idp-overlay.dtbo \
		trinket-iot-idp-overlay.dtbo \
		trinketp-iot-idp-overlay.dtbo \
		trinket-iot-external-codec-idp-overlay.dtbo \
		trinketp-iot-external-codec-idp-overlay.dtbo \
		trinket-iot-usbc-external-codec-idp-overlay.dtbo \
		trinketp-iot-usbc-external-codec-idp-overlay.dtbo \
		trinket-iot-usbc-idp-overlay.dtbo \
		trinketp-iot-usbc-idp-overlay.dtbo \
		trinket-iot-dp-idp-overlay.dtbo \
		trinketp-iot-dp-idp-overlay.dtbo

trinket-rumi-overlay.dtbo-base := trinket.dtb
trinket-idp-overlay.dtbo-base := trinket.dtb
@@ -340,6 +350,16 @@ trinket-external-codec-idp-overlay.dtbo-base := trinket.dtb
trinket-usbc-external-codec-idp-overlay.dtbo-base := trinket.dtb
trinket-usbc-idp-overlay.dtbo-base := trinket.dtb
trinket-dp-idp-overlay.dtbo-base := trinket.dtb
trinket-iot-idp-overlay.dtbo-base := trinket-iot.dtb
trinketp-iot-idp-overlay.dtbo-base := trinketp-iot.dtb
trinket-iot-external-codec-idp-overlay.dtbo-base := trinket-iot.dtb
trinketp-iot-external-codec-idp-overlay.dtbo-base := trinketp-iot.dtb
trinket-iot-usbc-external-codec-idp-overlay.dtbo-base := trinket-iot.dtb
trinketp-iot-usbc-external-codec-idp-overlay.dtbo-base := trinketp-iot.dtb
trinket-iot-usbc-idp-overlay.dtbo-base := trinket-iot.dtb
trinketp-iot-usbc-idp-overlay.dtbo-base := trinketp-iot.dtb
trinket-iot-dp-idp-overlay.dtbo-base := trinket-iot.dtb
trinketp-iot-dp-idp-overlay.dtbo-base := trinketp-iot.dtb
else
dtb-$(CONFIG_ARCH_TRINKET)	+= trinket-rumi.dtb \
	trinket-idp.dtb \
@@ -347,7 +367,17 @@ dtb-$(CONFIG_ARCH_TRINKET) += trinket-rumi.dtb \
	trinket-external-codec-idp.dtb \
	trinket-usbc-external-codec-idp.dtb \
	trinket-usbc-idp.dtb \
	trinket-dp-idp.dtb
	trinket-dp-idp.dtb \
	trinket-iot-idp.dtb \
	trinketp-iot-idp.dtb \
	trinket-iot-external-codec-idp.dtb \
	trinketp-iot-external-codec-idp.dtb \
	trinket-iot-usbc-external-codec-idp.dtb \
	trinketp-iot-usbc-external-codec-idp.dtb \
	trinket-iot-usbc-idp.dtb \
	trinketp-iot-usbc-idp.dtb \
	trinket-iot-dp-idp.dtb \
	trinketp-iot-dp-idp.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+51 −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,gcc-trinket.h>
#include "trinket-iot-idp.dtsi"
#include "trinket-audio-overlay.dtsi"

/ {
	model = "Display Port Enable IDP";
	compatible = "qcom,trinket-iot-idp", "qcom,trinket-iot", "qcom,idp";
	qcom,msm-id = <467 0x10000>;
	qcom,board-id = <34 4>;
};

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

&sde_dp {
	status = "ok";
	qcom,dp-hpd-gpio = <&tlmm 100 0>;
	qcom,dp-low-power-hw-hpd;
};

&mdss_dp_pll {
	status = "ok";
};

&usb0 {
	dwc3@4e00000 {
		usb-phy = <&qusb_phy0>, <&usb_nop_phy>;
		maximum-speed = "high-speed";
	};
};

&mdss_mdp {
	connectors = <&sde_wb &sde_dsi &sde_dp>;
};
+44 −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 "trinket-iot.dtsi"
#include "trinket-iot-idp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. TRINKET IOT Disp. Port Enable IDP";
	compatible = "qcom,trinket-iot-idp", "qcom,trinket-iot", "qcom,idp";
	qcom,board-id = <34 4>;
};

&sde_dp {
	status = "ok";
	qcom,dp-hpd-gpio = <&tlmm 100 0>;
	qcom,dp-low-power-hw-hpd;
};

&mdss_dp_pll {
	status = "ok";
};

&usb0 {
	dwc3@4e00000 {
		usb-phy = <&qusb_phy0>, <&usb_nop_phy>;
		maximum-speed = "high-speed";
	};
};

&mdss_mdp {
	connectors = <&sde_wb &sde_dsi &sde_dp>;
};
+31 −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 "trinket-iot-idp.dtsi"
#include "trinket-tasha-codec-audio-overlay.dtsi"
#include "trinket-tasha-codec.dtsi"

/ {
	model = "Ext Audio Codec IDP";
	compatible = "qcom,trinket-iot-idp", "qcom,trinket-iot", "qcom,idp";
	qcom,msm-id = <467 0x10000>;
	qcom,board-id = <34 1>;
};

&dsi_td4330_truly_cmd_display {
	qcom,dsi-display-active;
};
+24 −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 "trinket-iot.dtsi"
#include "trinket-iot-idp.dtsi"
#include "trinket-tasha-codec-audio-overlay.dtsi"
#include "trinket-tasha-codec.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. TRINKET IOT Ext Audio Codec IDP";
	compatible = "qcom,trinket-iot-idp", "qcom,trinket-iot", "qcom,idp";
	qcom,board-id = <34 1>;
};
Loading