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

Commit 2357e462 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update compatible property for SPS driver on all targets"

parents 97c976a9 85f7ad58

Documentation/devicetree/bindings/dma/sps/sps.txt

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Peripheral-to-Memory (a.k.a. BAM-System) mode. SPS includes BAM (Bus 
Access Module) hardware block, BAM DMA peripheral, and pipe memory.



Required property:

  - compatible: should be "qcom,msm_sps" or "qcom,msm_sps_4k"

  - compatible: should be "qcom,msm-sps" or "qcom,msm-sps-4k"



Optional properties:

  - reg: offset and size for the memory mapping, including maps for
@@ -34,7 +34,7 @@ Optional properties: 
Example:



	qcom,sps@f9980000 {

		compatible = "qcom,msm_sps";

		compatible = "qcom,msm-sps";

		reg = <0xf9984000 0x15000>,

		      <0xf9999000 0xb000>,

		      <0xfe803000 0x4800>;

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

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ 
	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		compatible = "qcom,msm-sps-4k";

		qcom,pipe-attr-ee;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ 
	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		compatible = "qcom,msm-sps-4k";

		qcom,pipe-attr-ee;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -2133,7 +2133,7 @@ 
	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		compatible = "qcom,msm-sps-4k";

		qcom,pipe-attr-ee;

	};

drivers/platform/msm/sps/sps.c

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

/* Copyright (c) 2011-2018, 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
@@ -2813,10 +2813,10 @@ static int get_device_tree_data(struct platform_device *pdev) 
}



static const struct of_device_id msm_sps_match[] = {

	{	.compatible = "qcom,msm_sps",

	{	.compatible = "qcom,msm-sps",

		.data = &bam_types[SPS_BAM_NDP]

	},

	{	.compatible = "qcom,msm_sps_4k",

	{	.compatible = "qcom,msm-sps-4k",

		.data = &bam_types[SPS_BAM_NDP_4K]

	},

	{}