Merge "ARM: dts: msm: Add QPIC clock support for sdxprairie" (b538291a) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -967,7 +967,6 @@
		reg-names = "nand_phys",
		"bam_phys";
		qcom,reg-adjustment-offset = <0x4000>;
		qcom,qpic-clk-rpmh;

		interrupts = <0 135 0>;
		interrupt-names = "bam_irq";
		@@ -980,6 +979,9 @@
		/* Voting for max b/w on PNOC bus for now */
		<91 512 400000 400000>;

		clock-names = "core_clk";
		clocks = <&clock_rpmh RPMH_QPIC_CLK>;

		status = "disabled";
		};

drivers/mtd/devices/msm_qpic_nand.c

+14 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 Google, Inc.
		* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-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
		@@ -3201,7 +3201,7 @@ static int msm_nand_bam_init(struct msm_nand_info *nand_info)
		{
		struct sps_bam_props bam = {0};
		int rc = 0;

		struct msm_nand_chip *chip = &nand_info->nand_chip;
		bam.phys_addr = nand_info->bam_phys;
		bam.virt_addr = nand_info->bam_base;
		bam.irq = nand_info->bam_irq;
		@@ -3222,7 +3222,12 @@ static int msm_nand_bam_init(struct msm_nand_info *nand_info)
		*/
		bam.manage = SPS_BAM_MGR_DEVICE_REMOTE \| SPS_BAM_MGR_MULTI_EE;
		bam.ipc_loglevel = QPIC_BAM_DEFAULT_IPC_LOGLVL;

		mutex_lock(&nand_info->lock);
		rc = msm_nand_get_device(chip->dev);
		if (rc) {
		pr_err("failed to get the device err:%d\n", rc);
		goto out;
		}
		rc = sps_phy2h(bam.phys_addr, &nand_info->sps.bam_handle);
		if (!rc)
		goto init_sps_ep;
		@@ -3230,7 +3235,7 @@ static int msm_nand_bam_init(struct msm_nand_info *nand_info)
		if (rc) {
		pr_err("%s: sps_register_bam_device() failed with %d\n",
		__func__, rc);
		goto out;
		goto put_dev;
		}
		pr_info("%s: BAM device registered: bam_handle 0x%lx\n",
		__func__, nand_info->sps.bam_handle);
		@@ -3238,7 +3243,7 @@ static int msm_nand_bam_init(struct msm_nand_info *nand_info)
		rc = msm_nand_init_endpoint(nand_info, &nand_info->sps.data_prod,
		SPS_DATA_PROD_PIPE_INDEX);
		if (rc)
		goto out;
		goto put_dev;
		rc = msm_nand_init_endpoint(nand_info, &nand_info->sps.data_cons,
		SPS_DATA_CONS_PIPE_INDEX);
		if (rc)
		@@ -3248,12 +3253,15 @@ static int msm_nand_bam_init(struct msm_nand_info *nand_info)
		SPS_CMD_CONS_PIPE_INDEX);
		if (rc)
		goto deinit_data_cons;
		goto out;
		goto put_dev;
		deinit_data_cons:
		msm_nand_deinit_endpoint(nand_info, &nand_info->sps.data_cons);
		deinit_data_prod:
		msm_nand_deinit_endpoint(nand_info, &nand_info->sps.data_prod);
		put_dev:
		rc = msm_nand_put_device(chip->dev);
		out:
		mutex_unlock(&nand_info->lock);
		return rc;
		}