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

Commit 373a0b47 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: Add eMMC slave node on sdm670"

parents 2e5c1fcc 91a55d31

arch/arm64/boot/dts/qcom/sdm670-bus.dtsi

+18 −8
Original line number Diff line number Diff line
@@ -713,10 +713,10 @@ 
				&slv_qhs_ipa &slv_qhs_cpr_cx

				&slv_qhs_a1_noc_cfg &slv_qhs_aoss

				&slv_qhs_prng &slv_qhs_vsense_ctrl_cfg

				&slv_qhs_qupv3_south &slv_qhs_spdm

				&slv_qhs_crypto0_cfg &slv_qhs_pimem_cfg

				&slv_qhs_tlmm_north &slv_qhs_clk_ctl

				&slv_qhs_imem_cfg>;

				&slv_qhs_emmc_cfg &slv_qhs_qupv3_south

				&slv_qhs_spdm &slv_qhs_crypto0_cfg

				&slv_qhs_pimem_cfg &slv_qhs_tlmm_north

				&slv_qhs_clk_ctl &slv_qhs_imem_cfg>;

			qcom,bus-dev = <&fab_config_noc>;

			qcom,bcms = <&bcm_cn0>;

		};
@@ -741,10 +741,11 @@ 
				&slv_qhs_usb3_0 &slv_qhs_ipa

				&slv_qhs_cpr_cx &slv_qhs_a1_noc_cfg

				&slv_qhs_aoss &slv_qhs_prng

				&slv_qhs_vsense_ctrl_cfg &slv_qhs_qupv3_south

				&slv_qhs_spdm &slv_qhs_crypto0_cfg

				&slv_qhs_pimem_cfg &slv_qhs_tlmm_north

				&slv_qhs_clk_ctl &slv_qhs_imem_cfg>;

				&slv_qhs_vsense_ctrl_cfg &slv_qhs_emmc_cfg

				&slv_qhs_qupv3_south &slv_qhs_spdm

				&slv_qhs_crypto0_cfg &slv_qhs_pimem_cfg

				&slv_qhs_tlmm_north &slv_qhs_clk_ctl

				&slv_qhs_imem_cfg>;

			qcom,bus-dev = <&fab_config_noc>;

			qcom,bcms = <&bcm_cn0>;

		};
@@ -1379,6 +1380,15 @@ 
			qcom,bcms = <&bcm_cn0>;

		};



		slv_qhs_emmc_cfg:slv-qhs-emmc-cfg {

			cell-id = <MSM_BUS_SLAVE_EMMC_CFG>;

			label = "slv-qhs-emmc-cfg";

			qcom,buswidth = <4>;

			qcom,agg-ports = <1>;

			qcom,bus-dev = <&fab_config_noc>;

			qcom,bcms = <&bcm_cn0>;

		};



		slv_qhs_glm:slv-qhs-glm {

			cell-id = <MSM_BUS_SLAVE_GLM>;

			label = "slv-qhs-glm";

include/dt-bindings/msm/msm-bus-ids.h

+2 −1
Original line number Diff line number Diff line
@@ -606,7 +606,8 @@ 
#define	MSM_BUS_SLAVE_ANOC_SNOC 779

#define	MSM_BUS_SLAVE_ANOC_IPA 780

#define	MSM_BUS_SLAVE_EMAC_CFG 781

#define	MSM_BUS_SLAVE_LAST 782

#define	MSM_BUS_SLAVE_EMMC_CFG 782

#define	MSM_BUS_SLAVE_LAST 783



#define	MSM_BUS_SLAVE_EBI_CH0_DISPLAY 20512

#define	MSM_BUS_SLAVE_LLCC_DISPLAY 20513