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

Commit 1c882c18 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: Add USB3_1 and Crypto_core2 to APQ8084."

parents 27aed98f 09593ac3

arch/arm/boot/dts/qcom/apq8084-bus.dtsi

+33 −6
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ 
		mas-vpu-proc {

			cell-id = <53>;

			label = "mas-qdss-bam";

			qcom,masterp = <1>;

			qcom,masterp = <0>;

			qcom,tier = <2>;

			qcom,mode = "Fixed";

			qcom,qport = <1>;
@@ -389,6 +389,19 @@ 
			qcom,prio0 = <1>;

		};



		mas-crypto-core2 {

			cell-id = <97>;

			label = "mas-crypto-core2";

			qcom,masterp = <2>;

			qcom,tier = <2>;

			qcom,mode = "Fixed";

			qcom,qport = <9>;

			qcom,mas-hw-id = <64>;

			qcom,hw-sel = "NoC";

			qcom,prio1 = <1>;

			qcom,prio0 = <1>;

		};



		mas-lpass-proc {

			cell-id = <11>;

			label = "mas-lpass-proc";
@@ -489,6 +502,20 @@ 
			qcom,iface-clk-node = "msm_usb3";

		};



		mas-usb3_1 {

			cell-id = <101>;

			label = "mas-usb3_1";

			qcom,masterp = <18>;

			qcom,tier = <2>;

			qcom,mode = "Fixed";

			qcom,qport = <11>;

			qcom,mas-hw-id = <69>;

			qcom,prio1 = <1>;

			qcom,prio0 = <1>;

			qcom,hw-sel = "NoC";

			qcom,iface-clk-node = "msm_usb3_1";

		};



		mas-pcie-0 {

			cell-id = <45>;

			label = "mas-pcie0";
@@ -1038,7 +1065,7 @@ 
		slv-spdm-wrapper {

			cell-id = <633>;

			label = "slv-spdm-wrapper";

			qcom,slavep = <14>;

			qcom,slavep = <12>;

			qcom,tier = <2>;

			qcom,buswidth = <8>;

			qcom,slv-hw-id = <60>;
@@ -1074,7 +1101,7 @@ 
		slv-rbcpr-cfg {

			cell-id = <636>;

			label = "slv-rbcpr-cfg";

			qcom,slavep = <22>;

			qcom,slavep = <19>;

			qcom,tier = <2>;

			qcom,buswidth = <8>;

			qcom,slv-hw-id = <64>;
@@ -1083,7 +1110,7 @@ 
		slv-rbcpr-qdss-apu-cfg {

			cell-id = <637>;

			label = "slv-rbcpr-qdss-apu-cfg";

			qcom,slavep = <21>;

			qcom,slavep = <18>;

			qcom,tier = <2>;

			qcom,buswidth = <8>;

			qcom,slv-hw-id = <65>;
@@ -1122,7 +1149,7 @@ 
		slv-cnoc-mnoc-cfg {

			cell-id = <640>;

			label = "slv-cnoc-mnoc-cfg";

			qcom,slavep = <24>;

			qcom,slavep = <20>;

			qcom,tier = <2>;

			qcom,buswidth = <8>;

			qcom,slv-hw-id = <66>;
@@ -1286,7 +1313,7 @@ 
			cell-id = <2048>;

			label = "fab_mmss_noc";

			qcom,gateway;

			qcom,masterp = <2>;

			qcom,masterp = <4>;

			qcom,qport = <2>;

			qcom,buswidth = <16>;

			qcom,ws = <10000>;

arch/arm/mach-msm/clock-8084.c

+1 −0
Original line number Diff line number Diff line
@@ -6089,6 +6089,7 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("core_clk", gcc_usb30_master_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_axi_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_axi_clk.c, "msm_usb3"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_sec_axi_clk.c, "msm_usb3_1"),

	CLK_LOOKUP("sleep_clk", gcc_usb30_sleep_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("sleep_a_clk", gcc_usb2a_phy_sleep_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("utmi_clk",   gcc_usb30_mock_utmi_clk.c, "f9200000.ssusb"),

include/linux/msm-bus-board.h

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ enum msm_bus_fabric_master_type { 
	MSM_BUS_MASTER_EMAC,

	MSM_BUS_MASTER_VPU_1,

	MSM_BUS_MASTER_PCIE_1,

	MSM_BUS_MASTER_USB3_1,



	MSM_BUS_MASTER_LAST,