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

Commit f972a13d 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: Introduce plutonium bus topology"

parents f49406ef 3ae9442d

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

0 → 100644
+1432 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msmplutonium-sim.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 




#include "msmplutonium.dtsi"

#include "msmplutonium.dtsi"

#include "msmplutonium-pinctrl.dtsi"

#include "msmplutonium-pinctrl.dtsi"

#include "msmplutonium-bus.dtsi"

/ {

/ {

	model = "Qualcomm Technologies, Inc. MSM plutonium SIM";

	model = "Qualcomm Technologies, Inc. MSM plutonium SIM";

	compatible = "qcom,msmplutonium-sim", "qcom,msmplutonium", "qcom,sim";

	compatible = "qcom,msmplutonium-sim", "qcom,msmplutonium", "qcom,sim";

drivers/soc/qcom/subsys-pil-tz.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ static void scm_pas_disable_bw(void) 
	mutex_unlock(&scm_pas_bw_mutex);

	mutex_unlock(&scm_pas_bw_mutex);

}

}





static void scm_pas_init(enum msm_bus_fabric_master_type id)

static void scm_pas_init(int id)

{

{

	int i, rate;

	int i, rate;

	static int is_inited;

	static int is_inited;

include/dt-bindings/msm/msm-bus-ids.h

0 → 100644
+621 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/msm-bus-board.h

+1 −346

File changed.

Preview size limit exceeded, changes collapsed.