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

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

Merge "ARM: dts: msm: add roi misr register address for Gen3 platform"

parents 1eb948d7 7b644b24

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

+11 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-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
@@ -87,6 +87,16 @@ 
	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



&mdss_mdp {

	/* roi misr related hw block */

	qcom,sde-roi-misr-off = <0x82820 0x82880 0x828e0>;

	qcom,sde-roi-misr-size = <0x60>;



	qcom,sde-dspp-blocks {

		qcom,sde-dspp-roi-misr = <0x1200 0x00010000>;

	};

};



#include "sa6155-pcie.dtsi"



&soc {

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

+9 −0
Original line number Diff line number Diff line
@@ -404,6 +404,15 @@ 
	qcom,sde-mixer-display-pref = "primary", "none", "none",

				"none", "none", "none";

	/delete-property/ qcom,sde-has-dest-scaler;



	/* roi misr related hw block */

	qcom,sde-roi-misr-off = <0x82820 0x82880 0x828e0

				0x82940 0x829a0 0x82a00>;

	qcom,sde-roi-misr-size = <0x60>;



	qcom,sde-dspp-blocks {

		qcom,sde-dspp-roi-misr = <0x1200 0x00010000>;

	};

};



#include <dt-bindings/gpio/gpio.h>

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,17 @@ 
	qcom,msm-id = <405 0x20000>;

};



&mdss_mdp {

	/* roi misr related hw block */

	qcom,sde-roi-misr-off = <0x82820 0x82880 0x828e0

				0x82940 0x829a0 0x82a00>;

	qcom,sde-roi-misr-size = <0x60>;



	qcom,sde-dspp-blocks {

		qcom,sde-dspp-roi-misr = <0x1200 0x00010000>;

	};

};



&soc {

	hsi2s: qcom,hsi2s {

		compatible = "qcom,sa8195-hsi2s", "qcom,hsi2s";