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

Commit 70ff4dcd 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: Export axi sleep clocks for MDM9640"

parents 18cad5ec 0290d892

arch/arm/boot/dts/qcom/mdm9640-cc.dtsi

+1 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -938,14 +938,12 @@ 
		compatible = "qcom,gate-clk";

		qcom,en-offset = <GCC_APCS_CLOCK_SLEEP_ENA_VOTE>;

		qcom,en-bit = <13>;

		qcom,always-on;

	};



	bimc_apss_axi_clk_sleep: bimc_apss_axi_clk_sleep {

		compatible = "qcom,gate-clk";

		qcom,en-offset = <GCC_APCS_CLOCK_SLEEP_ENA_VOTE>;

		qcom,en-bit = <15>;

		qcom,always-on;

	};



	gcc_blsp1_ahb_clk: gcc_blsp1_ahb_clk {

include/dt-bindings/clock/msm-clocks-9640.h

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -120,6 +120,8 @@ 
#define clk_gcc_mss_q6_bimc_axi_clk		&gcc_mss_q6_bimc_axi_clk

#define clk_gcc_boot_rom_ahb_clk		&gcc_boot_rom_ahb_clk

#define clk_gcc_prng_ahb_clk			&gcc_prng_ahb_clk

#define clk_bimc_apss_axi_clk_sleep		&bimc_apss_axi_clk_sleep

#define clk_apss_axi_clk_sleep			&apss_axi_clk_sleep



/* a7pll */

#define clk_a7pll_clk				&a7pll_clk