msm: rpm: Updated RPM enumerations for 8930
The RPM enumerations have been updated to match the resources supported
by RPM on 8930.
Change-Id: I718ee8ff37e3032ebfd5b9382568eedc0b80b267
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8930.c b/arch/arm/mach-msm/devices-8930.c
index 257f372..c75a4e3 100644
--- a/arch/arm/mach-msm/devices-8930.c
+++ b/arch/arm/mach-msm/devices-8930.c
@@ -39,7 +39,8 @@
MSM_RPM_MAP(8930, NOTIFICATION_CONFIGURED_0, NOTIFICATION, 4),
MSM_RPM_MAP(8930, NOTIFICATION_REGISTERED_0, NOTIFICATION, 4),
MSM_RPM_MAP(8930, INVALIDATE_0, INVALIDATE, 8),
- MSM_RPM_MAP(8930, TRIGGER_TIMED_0, TRIGGER_TIMED_0, 2),
+ MSM_RPM_MAP(8960, TRIGGER_TIMED_TO, TRIGGER_TIMED, 1),
+ MSM_RPM_MAP(8960, TRIGGER_TIMED_SCLK_COUNT, TRIGGER_TIMED, 1),
MSM_RPM_MAP(8930, RPM_CTL, RPM_CTL, 1),
MSM_RPM_MAP(8930, CXO_CLK, CXO_CLK, 1),
MSM_RPM_MAP(8930, PXO_CLK, PXO_CLK, 1),
@@ -57,7 +58,7 @@
APPS_FABRIC_CFG_CLKMOD, 3),
MSM_RPM_MAP(8930, APPS_FABRIC_CFG_IOCTL,
APPS_FABRIC_CFG_IOCTL, 1),
- MSM_RPM_MAP(8930, APPS_FABRIC_ARB_0, APPS_FABRIC_ARB, 6),
+ MSM_RPM_MAP(8930, APPS_FABRIC_ARB_0, APPS_FABRIC_ARB, 12),
MSM_RPM_MAP(8930, SYS_FABRIC_CFG_HALT_0,
SYS_FABRIC_CFG_HALT, 2),
MSM_RPM_MAP(8930, SYS_FABRIC_CFG_CLKMOD_0,
@@ -65,14 +66,14 @@
MSM_RPM_MAP(8930, SYS_FABRIC_CFG_IOCTL,
SYS_FABRIC_CFG_IOCTL, 1),
MSM_RPM_MAP(8930, SYSTEM_FABRIC_ARB_0,
- SYSTEM_FABRIC_ARB, 20),
+ SYSTEM_FABRIC_ARB, 29),
MSM_RPM_MAP(8930, MMSS_FABRIC_CFG_HALT_0,
MMSS_FABRIC_CFG_HALT, 2),
MSM_RPM_MAP(8930, MMSS_FABRIC_CFG_CLKMOD_0,
MMSS_FABRIC_CFG_CLKMOD, 3),
MSM_RPM_MAP(8930, MMSS_FABRIC_CFG_IOCTL,
MMSS_FABRIC_CFG_IOCTL, 1),
- MSM_RPM_MAP(8930, MM_FABRIC_ARB_0, MM_FABRIC_ARB, 11),
+ MSM_RPM_MAP(8930, MM_FABRIC_ARB_0, MM_FABRIC_ARB, 23),
MSM_RPM_MAP(8930, PM8038_S1_0, PM8038_S1, 2),
MSM_RPM_MAP(8930, PM8038_S2_0, PM8038_S2, 2),
MSM_RPM_MAP(8930, PM8038_S3_0, PM8038_S3, 2),
@@ -217,6 +218,7 @@
MSM_RPM_STATUS_ID_MAP(8930, CXO_BUFFERS),
MSM_RPM_STATUS_ID_MAP(8930, USB_OTG_SWITCH),
MSM_RPM_STATUS_ID_MAP(8930, HDMI_SWITCH),
+ MSM_RPM_STATUS_ID_MAP(8930, QDSS_CLK),
},
.target_ctrl_id = {
MSM_RPM_CTRL_MAP(8930, VERSION_MAJOR),
diff --git a/arch/arm/mach-msm/include/mach/rpm-8930.h b/arch/arm/mach-msm/include/mach/rpm-8930.h
index 304a185..04218b2 100644
--- a/arch/arm/mach-msm/include/mach/rpm-8930.h
+++ b/arch/arm/mach-msm/include/mach/rpm-8930.h
@@ -117,8 +117,8 @@
MSM_RPM_8930_ID_INVALIDATE_7 =
MSM_RPM_8930_ID_INVALIDATE_0 + 7,
- MSM_RPM_8930_ID_TRIGGER_TIMED_0 = 16,
- MSM_RPM_8930_ID_TRIGGER_TIMED_1 = 17,
+ MSM_RPM_8930_ID_TRIGGER_TIMED_TO_ = 16,
+ MSM_RPM_8930_ID_TRIGGER_TIMED_SCLK_COUNT = 17,
MSM_RPM_8930_ID_RPM_CTL = 18,
MSM_RPM_8930_ID_RESERVED_0 = 19,
MSM_RPM_8930_ID_RESERVED_5 =
@@ -140,106 +140,105 @@
MSM_RPM_8930_ID_APPS_FABRIC_CFG_CLKMOD_2 = 39,
MSM_RPM_8930_ID_APPS_FABRIC_CFG_IOCTL = 40,
MSM_RPM_8930_ID_APPS_FABRIC_ARB_0 = 41,
- MSM_RPM_8930_ID_APPS_FABRIC_ARB_5 =
- MSM_RPM_8930_ID_APPS_FABRIC_ARB_0 + 5,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_HALT_0 = 47,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_HALT_1 = 48,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_0 = 49,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_1 = 50,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_2 = 51,
- MSM_RPM_8930_ID_SYS_FABRIC_CFG_IOCTL = 52,
- MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_0 = 53,
- MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_19 =
- MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_0 + 19,
+ MSM_RPM_8930_ID_APPS_FABRIC_ARB_11 =
+ MSM_RPM_8930_ID_APPS_FABRIC_ARB_0 + 11,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_HALT_0 = 53,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_HALT_1 = 54,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_0 = 55,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_1 = 56,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_CLKMOD_2 = 57,
+ MSM_RPM_8930_ID_SYS_FABRIC_CFG_IOCTL = 58,
+ MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_0 = 59,
+ MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_28 =
+ MSM_RPM_8930_ID_SYSTEM_FABRIC_ARB_0 + 28,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_HALT_0 = 88,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_HALT_1 = 89,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_0 = 90,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_1 = 91,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_2 = 92,
+ MSM_RPM_8930_ID_MMSS_FABRIC_CFG_IOCTL = 93,
+ MSM_RPM_8930_ID_MM_FABRIC_ARB_0 = 94,
+ MSM_RPM_8930_ID_MM_FABRIC_ARB_22 =
+ MSM_RPM_8930_ID_MM_FABRIC_ARB_0 + 22,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_HALT_0 = 73,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_HALT_1 = 74,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_0 = 75,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_1 = 76,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_CLKMOD_2 = 77,
- MSM_RPM_8930_ID_MMSS_FABRIC_CFG_IOCTL = 78,
- MSM_RPM_8930_ID_MM_FABRIC_ARB_0 = 79,
- MSM_RPM_8930_ID_MM_FABRIC_ARB_10 =
- MSM_RPM_8930_ID_MM_FABRIC_ARB_0 + 10,
-
- MSM_RPM_8930_ID_PM8038_S1_0 = 90,
- MSM_RPM_8930_ID_PM8038_S1_1 = 91,
- MSM_RPM_8930_ID_PM8038_S2_0 = 92,
- MSM_RPM_8930_ID_PM8038_S2_1 = 93,
- MSM_RPM_8930_ID_PM8038_S3_0 = 94,
- MSM_RPM_8930_ID_PM8038_S3_1 = 95,
- MSM_RPM_8930_ID_PM8038_S4_0 = 96,
- MSM_RPM_8930_ID_PM8038_S4_1 = 97,
- MSM_RPM_8930_ID_PM8038_S5_0 = 98,
- MSM_RPM_8930_ID_PM8038_S5_1 = 99,
- MSM_RPM_8930_ID_PM8038_S6_0 = 100,
- MSM_RPM_8930_ID_PM8038_S6_1 = 101,
- MSM_RPM_8930_ID_PM8038_L1_0 = 102,
- MSM_RPM_8930_ID_PM8038_L1_1 = 103,
- MSM_RPM_8930_ID_PM8038_L2_0 = 104,
- MSM_RPM_8930_ID_PM8038_L2_1 = 105,
- MSM_RPM_8930_ID_PM8038_L3_0 = 106,
- MSM_RPM_8930_ID_PM8038_L3_1 = 107,
- MSM_RPM_8930_ID_PM8038_L4_0 = 108,
- MSM_RPM_8930_ID_PM8038_L4_1 = 109,
- MSM_RPM_8930_ID_PM8038_L5_0 = 110,
- MSM_RPM_8930_ID_PM8038_L5_1 = 111,
- MSM_RPM_8930_ID_PM8038_L6_0 = 112,
- MSM_RPM_8930_ID_PM8038_L6_1 = 113,
- MSM_RPM_8930_ID_PM8038_L7_0 = 114,
- MSM_RPM_8930_ID_PM8038_L7_1 = 115,
- MSM_RPM_8930_ID_PM8038_L8_0 = 116,
- MSM_RPM_8930_ID_PM8038_L8_1 = 117,
- MSM_RPM_8930_ID_PM8038_L9_0 = 118,
- MSM_RPM_8930_ID_PM8038_L9_1 = 119,
- MSM_RPM_8930_ID_PM8038_L10_0 = 120,
- MSM_RPM_8930_ID_PM8038_L10_1 = 121,
- MSM_RPM_8930_ID_PM8038_L11_0 = 122,
- MSM_RPM_8930_ID_PM8038_L11_1 = 123,
- MSM_RPM_8930_ID_PM8038_L12_0 = 124,
- MSM_RPM_8930_ID_PM8038_L12_1 = 125,
- MSM_RPM_8930_ID_PM8038_L13_0 = 126,
- MSM_RPM_8930_ID_PM8038_L13_1 = 127,
- MSM_RPM_8930_ID_PM8038_L14_0 = 128,
- MSM_RPM_8930_ID_PM8038_L14_1 = 129,
- MSM_RPM_8930_ID_PM8038_L15_0 = 130,
- MSM_RPM_8930_ID_PM8038_L15_1 = 131,
- MSM_RPM_8930_ID_PM8038_L16_0 = 132,
- MSM_RPM_8930_ID_PM8038_L16_1 = 133,
- MSM_RPM_8930_ID_PM8038_L17_0 = 134,
- MSM_RPM_8930_ID_PM8038_L17_1 = 135,
- MSM_RPM_8930_ID_PM8038_L18_0 = 136,
- MSM_RPM_8930_ID_PM8038_L18_1 = 137,
- MSM_RPM_8930_ID_PM8038_L19_0 = 138,
- MSM_RPM_8930_ID_PM8038_L19_1 = 139,
- MSM_RPM_8930_ID_PM8038_L20_0 = 140,
- MSM_RPM_8930_ID_PM8038_L20_1 = 141,
- MSM_RPM_8930_ID_PM8038_L21_0 = 142,
- MSM_RPM_8930_ID_PM8038_L21_1 = 143,
- MSM_RPM_8930_ID_PM8038_L22_0 = 144,
- MSM_RPM_8930_ID_PM8038_L22_1 = 145,
- MSM_RPM_8930_ID_PM8038_L23_0 = 146,
- MSM_RPM_8930_ID_PM8038_L23_1 = 147,
- MSM_RPM_8930_ID_PM8038_L24_0 = 148,
- MSM_RPM_8930_ID_PM8038_L24_1 = 149,
- MSM_RPM_8930_ID_PM8038_L25_0 = 150,
- MSM_RPM_8930_ID_PM8038_L25_1 = 151,
- MSM_RPM_8930_ID_PM8038_L26_0 = 152,
- MSM_RPM_8930_ID_PM8038_L26_1 = 153,
- MSM_RPM_8930_ID_PM8038_L27_0 = 154,
- MSM_RPM_8930_ID_PM8038_L27_1 = 155,
- MSM_RPM_8930_ID_PM8038_CLK1_0 = 156,
- MSM_RPM_8930_ID_PM8038_CLK1_1 = 157,
- MSM_RPM_8930_ID_PM8038_CLK2_0 = 158,
- MSM_RPM_8930_ID_PM8038_CLK2_1 = 159,
- MSM_RPM_8930_ID_PM8038_LVS1 = 160,
- MSM_RPM_8930_ID_PM8038_LVS2 = 161,
- MSM_RPM_8930_ID_NCP_0 = 162,
- MSM_RPM_8930_ID_NCP_1 = 163,
- MSM_RPM_8930_ID_CXO_BUFFERS = 164,
- MSM_RPM_8930_ID_USB_OTG_SWITCH = 165,
- MSM_RPM_8930_ID_HDMI_SWITCH = 166,
- MSM_RPM_8930_ID_QDSS_CLK = 167,
+ MSM_RPM_8930_ID_PM8038_S1_0 = 117,
+ MSM_RPM_8930_ID_PM8038_S1_1 = 118,
+ MSM_RPM_8930_ID_PM8038_S2_0 = 119,
+ MSM_RPM_8930_ID_PM8038_S2_1 = 120,
+ MSM_RPM_8930_ID_PM8038_S3_0 = 121,
+ MSM_RPM_8930_ID_PM8038_S3_1 = 122,
+ MSM_RPM_8930_ID_PM8038_S4_0 = 123,
+ MSM_RPM_8930_ID_PM8038_S4_1 = 124,
+ MSM_RPM_8930_ID_PM8038_S5_0 = 125,
+ MSM_RPM_8930_ID_PM8038_S5_1 = 126,
+ MSM_RPM_8930_ID_PM8038_S6_0 = 127,
+ MSM_RPM_8930_ID_PM8038_S6_1 = 128,
+ MSM_RPM_8930_ID_PM8038_L1_0 = 129,
+ MSM_RPM_8930_ID_PM8038_L1_1 = 130,
+ MSM_RPM_8930_ID_PM8038_L2_0 = 131,
+ MSM_RPM_8930_ID_PM8038_L2_1 = 132,
+ MSM_RPM_8930_ID_PM8038_L3_0 = 133,
+ MSM_RPM_8930_ID_PM8038_L3_1 = 134,
+ MSM_RPM_8930_ID_PM8038_L4_0 = 135,
+ MSM_RPM_8930_ID_PM8038_L4_1 = 136,
+ MSM_RPM_8930_ID_PM8038_L5_0 = 137,
+ MSM_RPM_8930_ID_PM8038_L5_1 = 138,
+ MSM_RPM_8930_ID_PM8038_L6_0 = 139,
+ MSM_RPM_8930_ID_PM8038_L6_1 = 140,
+ MSM_RPM_8930_ID_PM8038_L7_0 = 141,
+ MSM_RPM_8930_ID_PM8038_L7_1 = 142,
+ MSM_RPM_8930_ID_PM8038_L8_0 = 143,
+ MSM_RPM_8930_ID_PM8038_L8_1 = 144,
+ MSM_RPM_8930_ID_PM8038_L9_0 = 145,
+ MSM_RPM_8930_ID_PM8038_L9_1 = 146,
+ MSM_RPM_8930_ID_PM8038_L10_0 = 147,
+ MSM_RPM_8930_ID_PM8038_L10_1 = 148,
+ MSM_RPM_8930_ID_PM8038_L11_0 = 149,
+ MSM_RPM_8930_ID_PM8038_L11_1 = 150,
+ MSM_RPM_8930_ID_PM8038_L12_0 = 151,
+ MSM_RPM_8930_ID_PM8038_L12_1 = 152,
+ MSM_RPM_8930_ID_PM8038_L13_0 = 153,
+ MSM_RPM_8930_ID_PM8038_L13_1 = 154,
+ MSM_RPM_8930_ID_PM8038_L14_0 = 155,
+ MSM_RPM_8930_ID_PM8038_L14_1 = 156,
+ MSM_RPM_8930_ID_PM8038_L15_0 = 157,
+ MSM_RPM_8930_ID_PM8038_L15_1 = 158,
+ MSM_RPM_8930_ID_PM8038_L16_0 = 159,
+ MSM_RPM_8930_ID_PM8038_L16_1 = 160,
+ MSM_RPM_8930_ID_PM8038_L17_0 = 161,
+ MSM_RPM_8930_ID_PM8038_L17_1 = 162,
+ MSM_RPM_8930_ID_PM8038_L18_0 = 163,
+ MSM_RPM_8930_ID_PM8038_L18_1 = 164,
+ MSM_RPM_8930_ID_PM8038_L19_0 = 165,
+ MSM_RPM_8930_ID_PM8038_L19_1 = 166,
+ MSM_RPM_8930_ID_PM8038_L20_0 = 167,
+ MSM_RPM_8930_ID_PM8038_L20_1 = 168,
+ MSM_RPM_8930_ID_PM8038_L21_0 = 169,
+ MSM_RPM_8930_ID_PM8038_L21_1 = 170,
+ MSM_RPM_8930_ID_PM8038_L22_0 = 171,
+ MSM_RPM_8930_ID_PM8038_L22_1 = 172,
+ MSM_RPM_8930_ID_PM8038_L23_0 = 173,
+ MSM_RPM_8930_ID_PM8038_L23_1 = 174,
+ MSM_RPM_8930_ID_PM8038_L24_0 = 175,
+ MSM_RPM_8930_ID_PM8038_L24_1 = 176,
+ MSM_RPM_8930_ID_PM8038_L25_0 = 177,
+ MSM_RPM_8930_ID_PM8038_L25_1 = 178,
+ MSM_RPM_8930_ID_PM8038_L26_0 = 179,
+ MSM_RPM_8930_ID_PM8038_L26_1 = 180,
+ MSM_RPM_8930_ID_PM8038_L27_0 = 181,
+ MSM_RPM_8930_ID_PM8038_L27_1 = 182,
+ MSM_RPM_8930_ID_PM8038_CLK1_0 = 183,
+ MSM_RPM_8930_ID_PM8038_CLK1_1 = 184,
+ MSM_RPM_8930_ID_PM8038_CLK2_0 = 185,
+ MSM_RPM_8930_ID_PM8038_CLK2_1 = 186,
+ MSM_RPM_8930_ID_PM8038_LVS1 = 187,
+ MSM_RPM_8930_ID_PM8038_LVS2 = 188,
+ MSM_RPM_8930_ID_NCP_0 = 189,
+ MSM_RPM_8930_ID_NCP_1 = 190,
+ MSM_RPM_8930_ID_CXO_BUFFERS = 191,
+ MSM_RPM_8930_ID_USB_OTG_SWITCH = 192,
+ MSM_RPM_8930_ID_HDMI_SWITCH = 193,
+ MSM_RPM_8930_ID_QDSS_CLK = 194,
MSM_RPM_8930_ID_LAST = MSM_RPM_8930_ID_QDSS_CLK,
};
@@ -284,10 +283,6 @@
MSM_RPM_8930_STATUS_ID_PM8038_S3_1 = 36,
MSM_RPM_8930_STATUS_ID_PM8038_S4_0 = 37,
MSM_RPM_8930_STATUS_ID_PM8038_S4_1 = 38,
- MSM_RPM_8930_STATUS_ID_PM8038_S5_0 = 39,
- MSM_RPM_8930_STATUS_ID_PM8038_S5_1 = 40,
- MSM_RPM_8930_STATUS_ID_PM8038_S6_0 = 41,
- MSM_RPM_8930_STATUS_ID_PM8038_S6_1 = 42,
MSM_RPM_8930_STATUS_ID_PM8038_L1_0 = 43,
MSM_RPM_8930_STATUS_ID_PM8038_L1_1 = 44,
MSM_RPM_8930_STATUS_ID_PM8038_L2_0 = 45,
@@ -353,7 +348,8 @@
MSM_RPM_8930_STATUS_ID_CXO_BUFFERS = 105,
MSM_RPM_8930_STATUS_ID_USB_OTG_SWITCH = 106,
MSM_RPM_8930_STATUS_ID_HDMI_SWITCH = 107,
- MSM_RPM_8930_STATUS_ID_LAST = MSM_RPM_8930_STATUS_ID_HDMI_SWITCH,
+ MSM_RPM_8930_STATUS_ID_QDSS_CLK = 108,
+ MSM_RPM_8930_STATUS_ID_LAST = MSM_RPM_8930_STATUS_ID_QDSS_CLK,
};
#endif /* __ARCH_ARM_MACH_MSM_RPM_8930_H */
diff --git a/arch/arm/mach-msm/include/mach/rpm.h b/arch/arm/mach-msm/include/mach/rpm.h
index 40a8c9b..80ec683 100644
--- a/arch/arm/mach-msm/include/mach/rpm.h
+++ b/arch/arm/mach-msm/include/mach/rpm.h
@@ -601,6 +601,7 @@
MSM_RPM_STATUS_ID_DDR_DMM_1,
MSM_RPM_STATUS_ID_EBI1_CH0_RANGE,
MSM_RPM_STATUS_ID_EBI1_CH1_RANGE,
+ MSM_RPM_STATUS_ID_QDSS_CLK,
/* 8660 Specific */
MSM_RPM_STATUS_ID_PLL_4,