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

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

Merge changes I31269f91,Iff073312 into msm-4.14 

* changes:
  ARM: dts: msm: Add and enable the OSM clock controller for SDMSHRIKE
  defconfig: msm: Enable the CPU clock driver for SDMSHRIKE
parents fc3d2633 c3736121

arch/arm64/boot/dts/qcom/sdmshrike.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <dt-bindings/clock/qcom,gcc-sdmshrike.h>

#include <dt-bindings/clock/qcom,npucc-sdm855.h>

#include <dt-bindings/clock/qcom,dispcc-sdm855.h>

#include <dt-bindings/clock/qcom,cpucc-sdm855.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/soc/qcom,tcs-mbox.h>
@@ -387,6 +388,16 @@ 
		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_cpucc: qcom,cpucc@18321000 {

		compatible = "qcom,clk-cpu-osm-sdmshrike";

		reg = <0x18321000 0x1400>,

			<0x18323000 0x1400>,

			<0x18325800 0x1400>;

		reg-names = "osm_l3_base", "osm_pwrcl_base",

			"osm_perfcl_base";

		#clock-cells = <1>;

	};

};



&emac_gdsc {

arch/arm64/configs/sdmshrike-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_CLOCK_CPU_OSM=y

CONFIG_MSM_DISPCC_SDM855=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_MSM_GCC_SDMSHRIKE=y

arch/arm64/configs/sdmshrike_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_CLOCK_CPU_OSM=y

CONFIG_MSM_DISPCC_SDM855=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_MSM_GCC_SDMSHRIKE=y