Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7d55751a079464c804a174076d816af157f8376b

Authored by Murali Karicheri
Committed by Sekhar Nori
1 parent 42ac1a0330
Exists in smarct4x-processor-sdk-linux-02.00.01 and in 3 other branches processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-02.00.01, smarct4x-800-processor-sdk-linux-02.00.01

phy: keystone: rename data structures based on vendor recommendation 

The IP is owned by 3rd party and this patch makes updates to the code
to change constants and data structures per vendor recommendation.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Showing 1 changed file with 17 additions and 17 deletions Side-by-side Diff

drivers/phy/phy-keystone-serdes.c
Diff comments   View file @ 7d55751
... ... @@ -125,7 +125,7 @@
125 125 ((MOD_VER(serdes) == 0x4eb9) || (MOD_VER(serdes) == 0x4ebd))
126 126  
127 127 #define MAX_COMPARATORS 5
128   -#define DFE_OFFSET_SAMPLES 100
  128 +#define OFFSET_SAMPLES 100
129 129  
130 130 /* yes comparator starts from 1 */
131 131 #define for_each_comparator(i) \
... ... @@ -234,7 +234,7 @@
234 234 u32 lane_seeds;
235 235 u32 fast_train;
236 236 u32 active_lane;
237   - u32 c1, c2, cm, attn, boost, dlpf, cdrcal;
  237 + u32 c1, c2, cm, attn, boost, dlpf, rxcal;
238 238 u32 lane_config[KSERDES_MAX_LANES];
239 239 };
240 240  
... ... @@ -263,7 +263,7 @@
263 263 struct kserdes_config sc;
264 264 };
265 265  
266   -struct kserdes_comparator_tap_ofs {
  266 +struct kserdes_cmp_tap_ofs {
267 267 u32 cmp;
268 268 u32 tap1;
269 269 u32 tap2;
... ... @@ -273,7 +273,7 @@
273 273 };
274 274  
275 275 struct kserdes_lane_offsets {
276   - struct kserdes_comparator_tap_ofs ct_ofs[MAX_COMPARATORS];
  276 + struct kserdes_cmp_tap_ofs ct_ofs[MAX_COMPARATORS];
277 277 };
278 278  
279 279 struct kserdes_offsets {
... ... @@ -934,7 +934,7 @@
934 934 /* lane is 0-based */
935 935 static void
936 936 _kserdes_get_cmp_tap_offsets_xge(void __iomem *sregs, u32 lane, u32 cmp,
937   - struct kserdes_comparator_tap_ofs *ofs)
  937 + struct kserdes_cmp_tap_ofs *ofs)
938 938 {
939 939 /* set comparator number */
940 940 FINSR(sregs, CML_REG(0x8c), 23, 21, cmp);
... ... @@ -963,8 +963,8 @@
963 963 static void kserdes_add_offsets_xge(struct kserdes_config *sc,
964 964 struct kserdes_offsets *sofs)
965 965 {
966   - struct kserdes_comparator_tap_ofs *ctofs;
967   - struct kserdes_comparator_tap_ofs sample;
  966 + struct kserdes_cmp_tap_ofs *ctofs;
  967 + struct kserdes_cmp_tap_ofs sample;
968 968 struct kserdes_lane_offsets *lofs;
969 969 u32 lane, cmp;
970 970  
... ... @@ -989,7 +989,7 @@
989 989 /* lane is 0-based */
990 990 static void
991 991 kserdes_get_cmp_tap_offsets_non_xge(void __iomem *sregs, u32 lane, u32 cmp,
992   - struct kserdes_comparator_tap_ofs *ofs)
  992 + struct kserdes_cmp_tap_ofs *ofs)
993 993 {
994 994 /* set comparator number */
995 995 FINSR(sregs, CML_REG(0x8c), 23, 21, cmp);
... ... @@ -1002,8 +1002,8 @@
1002 1002 static void kserdes_add_offsets_non_xge(struct kserdes_config *sc,
1003 1003 struct kserdes_offsets *sofs)
1004 1004 {
1005   - struct kserdes_comparator_tap_ofs *ctofs;
1006   - struct kserdes_comparator_tap_ofs sample;
  1005 + struct kserdes_cmp_tap_ofs *ctofs;
  1006 + struct kserdes_cmp_tap_ofs sample;
1007 1007 struct kserdes_lane_offsets *lofs;
1008 1008 u32 lane, cmp;
1009 1009  
... ... @@ -1023,7 +1023,7 @@
1023 1023 static void kserdes_get_average_offsets(struct kserdes_config *sc, u32 samples,
1024 1024 struct kserdes_offsets *sofs)
1025 1025 {
1026   - struct kserdes_comparator_tap_ofs *ctofs;
  1026 + struct kserdes_cmp_tap_ofs *ctofs;
1027 1027 struct kserdes_lane_offsets *lofs;
1028 1028 u32 i, lane, cmp;
1029 1029 int ret;
... ... @@ -1067,7 +1067,7 @@
1067 1067  
1068 1068 static void
1069 1069 _kserdes_override_cmp_tap_offsets(void __iomem *sregs, u32 lane, u32 cmp,
1070   - struct kserdes_comparator_tap_ofs *ofs)
  1070 + struct kserdes_cmp_tap_ofs *ofs)
1071 1071 {
1072 1072 FINSR(sregs, CML_REG(0xf0), 27, 26, (lane + 1));
1073 1073  
... ... @@ -1120,7 +1120,7 @@
1120 1120  
1121 1121 static void
1122 1122 _kserdes_override_cmp_tap_offsets_cdfe(void __iomem *sregs, u32 lane, u32 cmp,
1123   - struct kserdes_comparator_tap_ofs *ofs)
  1123 + struct kserdes_cmp_tap_ofs *ofs)
1124 1124 {
1125 1125 FINSR(sregs, LANEX_REG(lane, 0x58), 16, 16, 0x1);
1126 1126 FINSR(sregs, LANEX_REG(lane, 0x48), 16, 16, 0x1);
... ... @@ -1144,7 +1144,7 @@
1144 1144 static void kserdes_set_offsets_xge(struct kserdes_config *sc,
1145 1145 struct kserdes_offsets *sofs)
1146 1146 {
1147   - struct kserdes_comparator_tap_ofs *ctofs;
  1147 + struct kserdes_cmp_tap_ofs *ctofs;
1148 1148 struct kserdes_lane_offsets *lofs;
1149 1149 u32 lane, cmp;
1150 1150  
... ... @@ -1163,7 +1163,7 @@
1163 1163 static void kserdes_set_offsets_non_xge(struct kserdes_config *sc,
1164 1164 struct kserdes_offsets *sofs)
1165 1165 {
1166   - struct kserdes_comparator_tap_ofs *ctofs;
  1166 + struct kserdes_cmp_tap_ofs *ctofs;
1167 1167 struct kserdes_lane_offsets *lofs;
1168 1168 u32 lane, cmp;
1169 1169  
... ... @@ -1198,7 +1198,7 @@
1198 1198 usleep_range(10, 20);
1199 1199  
1200 1200 /* Get offset */
1201   - kserdes_get_average_offsets(sc, DFE_OFFSET_SAMPLES, sofs);
  1201 + kserdes_get_average_offsets(sc, OFFSET_SAMPLES, sofs);
1202 1202 kserdes_set_offsets(sc, sofs);
1203 1203 /* amount of time to sleep is by experiment */
1204 1204 usleep_range(10, 20);
... ... @@ -1771,7 +1771,7 @@
1771 1771 fw->dlpf = (val_0 >> 2) & 0x3ff;
1772 1772  
1773 1773 val_0 = _kserdes_read_select_tbus(sc->regs, lane + 1, 0x6);
1774   - fw->cdrcal = (val_0 >> 3) & 0xff;
  1774 + fw->rxcal = (val_0 >> 3) & 0xff;
1775 1775 }
1776 1776  
1777 1777 static inline void kserdes_xfw_mem_init(struct kserdes_config *sc)