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

Commit 2415494a 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: msm: Add RPMh dummy clocks for sdxpoorwills" into msm-4.9

parents 7c3968e2 139d7795
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@


#include "skeleton.dtsi"

#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,gcc-sdxpoorwills.h>

/ {
@@ -148,6 +150,12 @@
		#clock-cells = <1>;
	};

	clock_rpmh: qcom,rpmhclk {
		compatible = "qcom,dummycc";
		clock-output-names = "rpmh_clocks";
		#clock-cells = <1>;
	};

	blsp1_uart2: serial@831000 {
		compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
		reg = <0x831000 0x200>;
+2 −0
Original line number Diff line number Diff line
@@ -27,5 +27,7 @@
#define RPMH_RF_CLK2_A						9
#define RPMH_RF_CLK3						10
#define RPMH_RF_CLK3_A						11
#define RPMH_RF_CLK4						12
#define RPMH_RF_CLK4_A						13

#endif