File tree 3 files changed +10
-1
lines changed
3 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -59,6 +59,7 @@ struct sdw_intel {
59
59
};
60
60
61
61
struct sdw_intel_prop {
62
+ u16 doaise ;
62
63
u16 doais ;
63
64
u16 dodse ;
64
65
u16 dods ;
Original file line number Diff line number Diff line change @@ -27,17 +27,20 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
27
27
void __iomem * shim_vs = sdw -> link_res -> shim_vs ;
28
28
struct sdw_bus * bus = & sdw -> cdns .bus ;
29
29
struct sdw_intel_prop * intel_prop ;
30
+ u16 doaise ;
30
31
u16 doais ;
31
32
u16 dodse ;
32
33
u16 dods ;
33
34
u16 act ;
34
35
35
36
intel_prop = bus -> vendor_specific_prop ;
37
+ doaise = intel_prop -> doaise ;
36
38
doais = intel_prop -> doais ;
37
39
dodse = intel_prop -> dodse ;
38
40
dods = intel_prop -> dods ;
39
41
40
42
act = intel_readw (shim_vs , SDW_SHIM2_INTEL_VS_ACTMCTL );
43
+ u16p_replace_bits (& act , doaise , SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE );
41
44
u16p_replace_bits (& act , doais , SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS );
42
45
u16p_replace_bits (& act , dodse , SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE );
43
46
u16p_replace_bits (& act , dods , SDW_SHIM2_INTEL_VS_ACTMCTL_DODS );
Original file line number Diff line number Diff line change @@ -159,10 +159,14 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
159
159
return - ENOMEM ;
160
160
161
161
/* initialize with hardware defaults, in case the properties are not found */
162
+ intel_prop -> doaise = 0x1 ;
162
163
intel_prop -> doais = 0x3 ;
163
164
intel_prop -> dodse = 0x0 ;
164
165
intel_prop -> dods = 0x1 ;
165
166
167
+ fwnode_property_read_u16 (link ,
168
+ "intel-sdw-doaise" ,
169
+ & intel_prop -> doaise );
166
170
fwnode_property_read_u16 (link ,
167
171
"intel-sdw-doais" ,
168
172
& intel_prop -> doais );
@@ -174,7 +178,8 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
174
178
& intel_prop -> dods );
175
179
bus -> vendor_specific_prop = intel_prop ;
176
180
177
- dev_dbg (bus -> dev , "doais %#x dodse %#x dods %#x\n" ,
181
+ dev_dbg (bus -> dev , "doaise %#x doais %#x dodse %#x dods %#x\n" ,
182
+ intel_prop -> doaise ,
178
183
intel_prop -> doais ,
179
184
intel_prop -> dodse ,
180
185
intel_prop -> dods );
You can’t perform that action at this time.
0 commit comments