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

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

Merge "ARM: dts: msm: Add QUPv3 and SE4 dt nodes for SCUBA"

parents c76de96a 6e27046e

qcom/scuba-pinctrl.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -7,5 +7,33 @@ 
		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;



		qupv3_se4_2uart_pins: qupv3_se4_2uart_pins {

			qupv3_se4_2uart_active: qupv3_se4_2uart_active {

				mux {

					pins = "gpio12", "gpio13";

					function = "qup4";

				};



				config {

					pins = "gpio12", "gpio13";

					drive-strength = <2>;

					bias-disable;

				};

			};



			qupv3_se4_2uart_sleep: qupv3_se4_2uart_sleep {

				mux {

					pins = "gpio12", "gpio13";

					function = "gpio";

				};



				config {

					pins = "gpio12", "gpio13";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};

	};

};

qcom/scuba-qupv3.dtsi

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#include <dt-bindings/msm/msm-bus-ids.h>



&soc {

	/* QUPv3_0 wrapper instance: Top Level QUP */

	qupv3_0: qcom,qupv3_0_geni_se@4ac0000 {

		compatible = "qcom,qupv3-geni-se";

		reg = <0x4ac0000 0x2000>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-bus-ids =

			<MSM_BUS_MASTER_QUP_CORE_0 MSM_BUS_SLAVE_QUP_CORE_0>,

			<MSM_BUS_MASTER_QUP_0 MSM_BUS_SLAVE_EBI_CH0>;

		qcom,vote-for-bw;

	};



	/* Debug Console UART Instance: QUPV3_0_SE4 */

	qupv3_se4_2uart: qcom,qup_uart@4a90000 {

		compatible = "qcom,msm-geni-console";

		reg = <0x4a90000 0x4000>;

		reg-names = "se_phys";

		clock-names = "se-clk", "m-ahb", "s-ahb";

		clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>,

			<&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,

			<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&qupv3_se4_2uart_active>;

		pinctrl-1 = <&qupv3_se4_2uart_sleep>;

		interrupts = <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>;

		qcom,wrapper-core = <&qupv3_0>;

		status = "disabled";

	};

};

qcom/scuba.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ 
#include "scuba-pinctrl.dtsi"

#include "scuba-stub-regulator.dtsi"

#include "scuba-gdsc.dtsi"

#include "scuba-qupv3.dtsi"



&gcc_camss_top_gdsc {

	status = "ok";
@@ -570,3 +571,7 @@ 
&gpu_gx_gdsc {

	status = "ok";

};



&qupv3_se4_2uart {

	status = "ok";

};