Merge "hwrng: Get clock source based on dtsi flag" (6cb75038) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/char/hw_random/msm_rng.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,10 @@ static int msm_rng_probe(struct platform_device *pdev)
		"qcom,msm-rng-iface-clk")) {
		msm_rng_dev->prng_clk = clk_get(&pdev->dev,
		"iface_clk");
		} else if (of_property_read_bool(pdev->dev.of_node,
		"qcom,msm-rng-hwkm-clk")) {
		msm_rng_dev->prng_clk = clk_get(&pdev->dev,
		"km_clk_src");
		} else {
		msm_rng_dev->prng_clk = clk_get(&pdev->dev,
		"core_clk");

+5 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef __MSM_BUS_IDS_H
		@@ -699,6 +699,8 @@
		#define MSM_BUS_SLAVE_ANOC_SNOC 834
		#define MSM_BUS_SLAVE_GPU_CDSP_BIMC 835
		#define MSM_BUS_SLAVE_AHB2PHY_2 836
		#define MSM_BUS_SLAVE_HWKM 837
		#define MSM_BUS_SLAVE_PKA_WRAPPER 838

		#define MSM_BUS_SLAVE_EBI_CH0_DISPLAY 20512
		#define MSM_BUS_SLAVE_LLCC_DISPLAY 20513
		@@ -1175,4 +1177,6 @@
		#define ICBID_SLAVE_MAPSS 277
		#define ICBID_SLAVE_MDSP_MPU_CFG 278
		#define ICBID_SLAVE_CAMERA_RT_THROTTLE_CFG 279
		#define ICBID_SLAVE_HWKM 280
		#define ICBID_SLAVE_PKA_WRAPPER 281
		#endif