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

Commit 0c0257c2 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: Introduce bus topology for msm cobalt"

parents 095eea59 fd3f5a09

arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi

0 → 100644
+1331 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1614,3 +1614,4 @@ 
#include "msmcobalt-camera.dtsi"

#include "msmcobalt-vidc.dtsi"

#include "msmcobalt-coresight.dtsi"

#include "msmcobalt-bus.dtsi"

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

+39 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 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
@@ -37,6 +37,8 @@ 
#define	MSM_BUS_FAB_A0_NOC 6145

#define	MSM_BUS_FAB_A1_NOC 6146

#define	MSM_BUS_FAB_A2_NOC 6147

#define	MSM_BUS_FAB_GNOC 6148

#define	MSM_BUS_FAB_CR_VIRT 6149



#define	MSM_BUS_MASTER_FIRST 1

#define	MSM_BUS_MASTER_AMPSS_M0 1
@@ -155,7 +157,12 @@ 
#define	MSM_BUS_MASTER_XI_USB_HSIC  113

#define	MSM_BUS_MASTER_SGMII	    114

#define	MSM_BUS_SPMI_FETCHER 115

#define	MSM_BUS_MASTER_LAST 116

#define	MSM_BUS_MASTER_GNOC_BIMC 116

#define	MSM_BUS_MASTER_CRVIRT_A2NOC 117

#define	MSM_BUS_MASTER_CNOC_A2NOC 118

#define	MSM_BUS_MASTER_WLAN 119

#define	MSM_BUS_MASTER_MSS_CE 120

#define	MSM_BUS_MASTER_MASTER_LAST 121



#define	MSM_BUS_SYSTEM_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB

#define	MSM_BUS_CPSS_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_CPSS_FPB
@@ -444,7 +451,19 @@ 
#define	MSM_BUS_SLAVE_SGMII 719

#define	MSM_BUS_SLAVE_SPMI_FETCHER 720

#define	MSM_BUS_PNOC_SLV_6 721

#define	MSM_BUS_SLAVE_LAST 722

#define	MSM_BUS_SLAVE_MMSS_SMMU_CFG 722

#define	MSM_BUS_SLAVE_WLAN 723

#define	MSM_BUS_SLAVE_CRVIRT_A2NOC 724

#define	MSM_BUS_SLAVE_CNOC_A2NOC 725

#define	MSM_BUS_SLAVE_GLM 726

#define	MSM_BUS_SLAVE_GNOC_BIMC 727

#define	MSM_BUS_SLAVE_GNOC_SNOC 728

#define	MSM_BUS_SLAVE_QM_CFG 729

#define	MSM_BUS_SLAVE_TLMM_EAST 730

#define	MSM_BUS_SLAVE_TLMM_NORTH 731

#define	MSM_BUS_SLAVE_TLMM_WEST 732

#define	MSM_BUS_SLAVE_SKL 733

#define	MSM_BUS_SLAVE_LAST 734



#define	MSM_BUS_SYSTEM_FPB_SLAVE_SYSTEM  MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB

#define	MSM_BUS_CPSS_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_CPSS_FPB
@@ -609,6 +628,11 @@ 
#define	ICBID_MASTER_XI_HSIC 141

#define	ICBID_MASTER_SGMII  142

#define	ICBID_MASTER_SPMI_FETCHER 143

#define	ICBID_MASTER_GNOC_BIMC 144

#define	ICBID_MASTER_CRVIRT_A2NOC 145

#define	ICBID_MASTER_CNOC_A2NOC 146

#define	ICBID_MASTER_WLAN 147

#define	ICBID_MASTER_MSS_CE 148



#define	ICBID_SLAVE_EBI1 0

#define	ICBID_SLAVE_APPSS_L2 1
@@ -826,4 +850,15 @@ 
#define	ICBID_SLAVE_BIMC_PCNOC   202

#define	ICBID_SLAVE_PCNOC_BIMC_1 203

#define	ICBID_SLAVE_SPMI_FETCHER 204

#define	ICBID_SLAVE_MMSS_SMMU_CFG 205

#define	ICBID_SLAVE_WLAN 206

#define	ICBID_SLAVE_CRVIRT_A2NOC 207

#define	ICBID_SLAVE_CNOC_A2NOC 208

#define	ICBID_SLAVE_GLM 209

#define	ICBID_SLAVE_GNOC_BIMC 210

#define	ICBID_SLAVE_GNOC_SNOC 211

#define	ICBID_SLAVE_QM_CFG 212

#define	ICBID_SLAVE_TLMM_EAST 213

#define	ICBID_SLAVE_TLMM_NORTH 214

#define	ICBID_SLAVE_TLMM_WEST 215

#endif