Merge "ARM: dts: msm: Add cpu clock debug node for sdxprairie" (9066a03d) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -335,8 +335,9 @@

		clock_debugcc: qcom,cc-debug {
		compatible = "qcom,debugcc-sdxprairie";
		qcom,cc-count = <1>;
		qcom,cc-count = <2>;
		qcom,gcc = <&clock_gcc>;
		qcom,cpucc = <&cpucc_debug>;
		clock-names = "xo_clk_src";
		clocks = <&clock_rpmh RPMH_CXO_CLK>;
		#clock-cells = <1>;
		@@ -361,6 +362,11 @@
		#clock-cells = <1>;
		};

		cpucc_debug: syscon@1781101c {
		compatible = "syscon";
		reg = <0x1781101c 0x4>;
		};

		spmi_bus: qcom,spmi@c440000 {
		compatible = "qcom,spmi-pmic-arb";
		reg = <0xc440000 0xd00>,

+8 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -91,6 +91,7 @@ static const char *const debug_mux_parent_names[] = {
		"measure_only_bimc_clk",
		"measure_only_ipa_2x_clk",
		"measure_only_snoc_clk",
		"apcs_mux_clk",
		};

		static struct clk_debug_mux gcc_debug_mux = {
		@@ -219,6 +220,8 @@ static struct clk_debug_mux gcc_debug_mux = {
		0xAC, 0x3FF, 0, 0xF, 0, 4, 0x79000, 0x29000, 0x29004 },
		{ "measure_only_snoc_clk", 0x109, 4, GCC,
		0x109, 0x3FF, 0, 0xF, 0, 4, 0x79000, 0x29000, 0x29004 },
		{ "apcs_mux_clk", 0x7C, 4, CPU_CC,
		0x3, 0x7, 0x3, 0x0, 0, 1, 0, 0, U32_MAX, 1 },
		),
		.hw.init = &(struct clk_init_data){
		.name = "gcc_debug_mux",
		@@ -273,6 +276,10 @@ static int clk_debug_sdxprairie_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		ret = map_debug_bases(pdev, "qcom,cpucc", CPU_CC);
		if (ret)
		return ret;

		clk = devm_clk_register(&pdev->dev, &gcc_debug_mux.hw);
		if (IS_ERR(clk)) {
		dev_err(&pdev->dev, "Unable to register GCC debug mux\n");