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

Commit dee817cc 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 PCIE 1 node to APQ8084 bus topology" into msm-3.10

parents 2d2cfdfa 8f32cc8a

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

+11 −0
Original line number Diff line number Diff line
@@ -500,6 +500,17 @@ 
			qcom,hw-sel = "NoC";

		};



		mas-pcie-1 {

			cell-id = <100>;

			label = "mas-pcie1";

			qcom,masterp = <20>;

			qcom,tier = <2>;

			qcom,mode = "Fixed";

			qcom,prio1 = <1>;

			qcom,prio0 = <1>;

			qcom,hw-sel = "NoC";

		};



		slv-ampss {

			cell-id = <520>;

			label = "slv-ampss";

include/linux/msm-bus-board.h

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

	MSM_BUS_MASTER_EMAC,

	MSM_BUS_MASTER_VPU_1,

	MSM_BUS_MASTER_PCIE_1,



	MSM_BUS_MASTER_LAST,