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

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

Merge "ARM: dts: msm: Update ids for new bus masters and slaves"

parents 1180b8e6 325e65c6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@
#define ADC_GPIO6_PU1				0x37
#define ADC_GPIO7_PU1				0x38
#define ADC_SBUx_PU1				0x39
#define ANA_IN					0x1d

/* 100k pull-up2 */
#define ADC_BAT_THERM_PU2			0x4a
+9 −0
Original line number Diff line number Diff line
@@ -609,6 +609,14 @@
#define	MSM_BUS_SLAVE_TLMM_NORTH 731
#define	MSM_BUS_SLAVE_TLMM_WEST 732
#define	MSM_BUS_SLAVE_SKL 733
#define	MSM_BUS_SLAVE_LPASS_TCM 734
#define	MSM_BUS_SLAVE_TLMM_CENTER 736
#define	MSM_BUS_MSS_NAV_CE_MPU_CFG 737
#define	MSM_BUS_SLAVE_A2NOC_THROTTLE_CFG 738
#define	MSM_BUS_SLAVE_CDSP 739
#define	MSM_BUS_SLAVE_CDSP_SMMU_CFG 740
#define	MSM_BUS_SLAVE_LPASS_MPU_CFG 741
#define	MSM_BUS_SLAVE_CSI_PHY_CFG 742
#define	MSM_BUS_SLAVE_SERVICE_A1NOC 744
#define	MSM_BUS_SLAVE_ANOC_PCIE_SNOC 745
#define	MSM_BUS_SLAVE_SERVICE_A2NOC 746
@@ -701,6 +709,7 @@
#define	MSM_BUS_SLAVE_AHB2PHY_2 836
#define	MSM_BUS_SLAVE_HWKM 837
#define	MSM_BUS_SLAVE_PKA_WRAPPER 838
#define	MSM_BUS_SLAVE_LAST 839

#define	MSM_BUS_SLAVE_EBI_CH0_DISPLAY 20512
#define	MSM_BUS_SLAVE_LLCC_DISPLAY 20513