← Back to branch summary

~hui.wang/alsa-driver/dkms-packaging.sof

« back to all changes in this revision

Viewing changes to patches-utopic/include_dir.patch

  • Committer: Hui Wang
  • Date: 2016-03-23 09:34:10 UTC
  • Revision ID: hui.wang@canonical.com-20160323093410-o75bahsmrr6jsqaj
fix sync_audio_rate patch conflict for trusty, utopic, vivid and wily. (sync_audio_rate.patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches-utopic/include_dir.patch
1
1
Index: oem-audio-hda-daily-0.1/hda_codec.c
2
2
===================================================================
3
 
--- oem-audio-hda-daily-0.1.orig/hda_codec.c    2016-03-11 10:32:46.081037289 +0800
4
 
+++ oem-audio-hda-daily-0.1/hda_codec.c 2016-03-11 10:32:46.069037289 +0800
 
3
--- oem-audio-hda-daily-0.1.orig/hda_codec.c    2016-03-23 17:18:40.237718089 +0800
 
4
+++ oem-audio-hda-daily-0.1/hda_codec.c 2016-03-23 17:18:40.229718090 +0800
5
5
@@ -37,7 +37,7 @@
6
6
 #include "hda_local.h"
7
7
 #include "hda_beep.h"
13
13
 #define codec_in_pm(codec)     atomic_read(&(codec)->core.in_pm)
14
14
Index: oem-audio-hda-daily-0.1/hda_codec.h
15
15
===================================================================
16
 
--- oem-audio-hda-daily-0.1.orig/hda_codec.h    2016-03-11 10:32:46.081037289 +0800
17
 
+++ oem-audio-hda-daily-0.1/hda_codec.h 2016-03-11 10:32:46.073037289 +0800
 
16
--- oem-audio-hda-daily-0.1.orig/hda_codec.h    2016-03-23 17:18:40.237718089 +0800
 
17
+++ oem-audio-hda-daily-0.1/hda_codec.h 2016-03-23 17:18:40.229718090 +0800
18
18
@@ -27,9 +27,9 @@
19
19
 #include <sound/control.h>
20
20
 #include <sound/pcm.h>
30
30
  * Structures
31
31
Index: oem-audio-hda-daily-0.1/hdacore/hda_bus_type.c
32
32
===================================================================
33
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hda_bus_type.c 2016-03-11 10:32:46.081037289 +0800
34
 
+++ oem-audio-hda-daily-0.1/hdacore/hda_bus_type.c      2016-03-11 10:32:46.073037289 +0800
 
33
--- oem-audio-hda-daily-0.1.orig/hdacore/hda_bus_type.c 2016-03-23 17:18:40.237718089 +0800
 
34
+++ oem-audio-hda-daily-0.1/hdacore/hda_bus_type.c      2016-03-23 17:18:40.229718090 +0800
35
35
@@ -6,7 +6,7 @@
36
36
 #include <linux/module.h>
37
37
 #include <linux/mod_devicetable.h>
43
43
 MODULE_LICENSE("GPL");
44
44
Index: oem-audio-hda-daily-0.1/hdacore/hdac_bus.c
45
45
===================================================================
46
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_bus.c     2016-03-11 10:32:46.081037289 +0800
47
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_bus.c  2016-03-11 10:32:46.073037289 +0800
 
46
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_bus.c     2016-03-23 17:18:40.237718089 +0800
 
47
+++ oem-audio-hda-daily-0.1/hdacore/hdac_bus.c  2016-03-23 17:18:40.229718090 +0800
48
48
@@ -6,7 +6,7 @@
49
49
 #include <linux/device.h>
50
50
 #include <linux/module.h>
56
56
 static void process_unsol_events(struct work_struct *work);
57
57
Index: oem-audio-hda-daily-0.1/hdacore/hdac_device.c
58
58
===================================================================
59
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_device.c  2016-03-11 10:32:46.081037289 +0800
60
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_device.c       2016-03-11 10:32:46.073037289 +0800
 
59
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_device.c  2016-03-23 17:18:40.237718089 +0800
 
60
+++ oem-audio-hda-daily-0.1/hdacore/hdac_device.c       2016-03-23 17:18:40.229718090 +0800
61
61
@@ -8,8 +8,8 @@
62
62
 #include <linux/module.h>
63
63
 #include <linux/export.h>
71
71
 
72
72
Index: oem-audio-hda-daily-0.1/hdacore/hdac_sysfs.c
73
73
===================================================================
74
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_sysfs.c   2016-03-11 10:32:46.081037289 +0800
75
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_sysfs.c        2016-03-11 10:32:46.073037289 +0800
 
74
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_sysfs.c   2016-03-23 17:18:40.237718089 +0800
 
75
+++ oem-audio-hda-daily-0.1/hdacore/hdac_sysfs.c        2016-03-23 17:18:40.229718090 +0800
76
76
@@ -6,7 +6,7 @@
77
77
 #include <linux/sysfs.h>
78
78
 #include <linux/device.h>
84
84
 struct hdac_widget_tree {
85
85
Index: oem-audio-hda-daily-0.1/hdacore/trace.h
86
86
===================================================================
87
 
--- oem-audio-hda-daily-0.1.orig/hdacore/trace.h        2016-03-11 10:32:46.081037289 +0800
88
 
+++ oem-audio-hda-daily-0.1/hdacore/trace.h     2016-03-11 10:32:46.073037289 +0800
 
87
--- oem-audio-hda-daily-0.1.orig/hdacore/trace.h        2016-03-23 17:18:40.237718089 +0800
 
88
+++ oem-audio-hda-daily-0.1/hdacore/trace.h     2016-03-23 17:18:40.229718090 +0800
89
89
@@ -6,7 +6,7 @@
90
90
 
91
91
 #include <linux/tracepoint.h>
97
97
 #define HDAC_MSG_MAX   500
98
98
Index: oem-audio-hda-daily-0.1/hda_hwdep.c
99
99
===================================================================
100
 
--- oem-audio-hda-daily-0.1.orig/hda_hwdep.c    2016-03-11 10:32:46.081037289 +0800
101
 
+++ oem-audio-hda-daily-0.1/hda_hwdep.c 2016-03-11 10:32:46.073037289 +0800
 
100
--- oem-audio-hda-daily-0.1.orig/hda_hwdep.c    2016-03-23 17:18:40.237718089 +0800
 
101
+++ oem-audio-hda-daily-0.1/hda_hwdep.c 2016-03-23 17:18:40.229718090 +0800
102
102
@@ -24,7 +24,7 @@
103
103
 #include <sound/core.h>
104
104
 #include "hda_codec.h"
110
110
 /*
111
111
Index: oem-audio-hda-daily-0.1/hda_sysfs.c
112
112
===================================================================
113
 
--- oem-audio-hda-daily-0.1.orig/hda_sysfs.c    2016-03-11 10:32:46.081037289 +0800
114
 
+++ oem-audio-hda-daily-0.1/hda_sysfs.c 2016-03-11 10:32:46.073037289 +0800
 
113
--- oem-audio-hda-daily-0.1.orig/hda_sysfs.c    2016-03-23 17:18:40.237718089 +0800
 
114
+++ oem-audio-hda-daily-0.1/hda_sysfs.c 2016-03-23 17:18:40.233718090 +0800
115
115
@@ -16,7 +16,7 @@
116
116
 #include <sound/core.h>
117
117
 #include "hda_codec.h"
123
123
 /* hint string pair */
124
124
Index: oem-audio-hda-daily-0.1/include/hdaudio.h
125
125
===================================================================
126
 
--- oem-audio-hda-daily-0.1.orig/include/hdaudio.h      2016-03-11 10:32:46.081037289 +0800
127
 
+++ oem-audio-hda-daily-0.1/include/hdaudio.h   2016-03-11 10:32:46.073037289 +0800
 
126
--- oem-audio-hda-daily-0.1.orig/include/hdaudio.h      2016-03-23 17:18:40.237718089 +0800
 
127
+++ oem-audio-hda-daily-0.1/include/hdaudio.h   2016-03-23 17:18:40.233718090 +0800
128
128
@@ -10,7 +10,7 @@
129
129
 #include <linux/timecounter.h>
130
130
 #include <sound/core.h>
136
136
 /* codec node id */
137
137
Index: oem-audio-hda-daily-0.1/hdacore/hdac_regmap.c
138
138
===================================================================
139
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_regmap.c  2016-03-11 10:32:46.081037289 +0800
140
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_regmap.c       2016-03-11 10:32:46.073037289 +0800
 
139
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_regmap.c  2016-03-23 17:18:40.237718089 +0800
 
140
+++ oem-audio-hda-daily-0.1/hdacore/hdac_regmap.c       2016-03-23 17:18:40.233718090 +0800
141
141
@@ -18,8 +18,8 @@
142
142
 #include <linux/pm.h>
143
143
 #include <linux/pm_runtime.h>
151
151
 {
152
152
Index: oem-audio-hda-daily-0.1/hdacore/array.c
153
153
===================================================================
154
 
--- oem-audio-hda-daily-0.1.orig/hdacore/array.c        2016-03-11 10:32:46.081037289 +0800
155
 
+++ oem-audio-hda-daily-0.1/hdacore/array.c     2016-03-11 10:32:46.073037289 +0800
 
154
--- oem-audio-hda-daily-0.1.orig/hdacore/array.c        2016-03-23 17:18:40.237718089 +0800
 
155
+++ oem-audio-hda-daily-0.1/hdacore/array.c     2016-03-23 17:18:40.233718090 +0800
156
156
@@ -4,7 +4,7 @@
157
157
 
158
158
 #include <linux/slab.h>
164
164
  * snd_array_new - get a new element from the given array
165
165
Index: oem-audio-hda-daily-0.1/include/hda_regmap.h
166
166
===================================================================
167
 
--- oem-audio-hda-daily-0.1.orig/include/hda_regmap.h   2016-03-11 10:32:46.081037289 +0800
168
 
+++ oem-audio-hda-daily-0.1/include/hda_regmap.h        2016-03-11 10:32:46.073037289 +0800
 
167
--- oem-audio-hda-daily-0.1.orig/include/hda_regmap.h   2016-03-23 17:18:40.237718089 +0800
 
168
+++ oem-audio-hda-daily-0.1/include/hda_regmap.h        2016-03-23 17:18:40.233718090 +0800
169
169
@@ -7,7 +7,7 @@
170
170
 
171
171
 #include <linux/regmap.h>
177
177
 
178
178
Index: oem-audio-hda-daily-0.1/hdacore/hdac_stream.c
179
179
===================================================================
180
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_stream.c  2016-03-11 10:32:46.081037289 +0800
181
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_stream.c       2016-03-11 10:32:46.073037289 +0800
 
180
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_stream.c  2016-03-23 17:18:40.237718089 +0800
 
181
+++ oem-audio-hda-daily-0.1/hdacore/hdac_stream.c       2016-03-23 17:18:40.233718090 +0800
182
182
@@ -8,8 +8,8 @@
183
183
 #include <linux/clocksource.h>
184
184
 #include <sound/core.h>
192
192
 /**
193
193
Index: oem-audio-hda-daily-0.1/hda_controller.h
194
194
===================================================================
195
 
--- oem-audio-hda-daily-0.1.orig/hda_controller.h       2016-03-11 10:32:46.081037289 +0800
196
 
+++ oem-audio-hda-daily-0.1/hda_controller.h    2016-03-11 10:32:46.073037289 +0800
 
195
--- oem-audio-hda-daily-0.1.orig/hda_controller.h       2016-03-23 17:18:40.237718089 +0800
 
196
+++ oem-audio-hda-daily-0.1/hda_controller.h    2016-03-23 17:18:40.233718090 +0800
197
197
@@ -21,7 +21,7 @@
198
198
 #include <sound/pcm.h>
199
199
 #include <sound/initval.h>
205
205
 #define AZX_DEFAULT_CODECS     4
206
206
Index: oem-audio-hda-daily-0.1/hdacore/hdac_controller.c
207
207
===================================================================
208
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_controller.c      2016-03-11 10:32:46.081037289 +0800
209
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_controller.c   2016-03-11 10:32:46.073037289 +0800
 
208
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_controller.c      2016-03-23 17:18:40.237718089 +0800
 
209
+++ oem-audio-hda-daily-0.1/hdacore/hdac_controller.c   2016-03-23 17:18:40.233718090 +0800
210
210
@@ -6,8 +6,8 @@
211
211
 #include <linux/delay.h>
212
212
 #include <linux/export.h>
220
220
 static void azx_clear_corbrp(struct hdac_bus *bus)
221
221
Index: oem-audio-hda-daily-0.1/include/hda_register.h
222
222
===================================================================
223
 
--- oem-audio-hda-daily-0.1.orig/include/hda_register.h 2016-03-11 10:32:46.081037289 +0800
224
 
+++ oem-audio-hda-daily-0.1/include/hda_register.h      2016-03-11 10:32:46.073037289 +0800
 
223
--- oem-audio-hda-daily-0.1.orig/include/hda_register.h 2016-03-23 17:18:40.237718089 +0800
 
224
+++ oem-audio-hda-daily-0.1/include/hda_register.h      2016-03-23 17:18:40.233718090 +0800
225
225
@@ -8,7 +8,7 @@
226
226
 #define __SOUND_HDA_REGISTER_H
227
227
 
233
233
 #define   AZX_GCAP_64OK                (1 << 0)   /* 64bit address support */
234
234
Index: oem-audio-hda-daily-0.1/hdacore/hdac_i915.c
235
235
===================================================================
236
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c    2016-03-11 10:32:46.081037289 +0800
237
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2016-03-11 10:32:46.073037289 +0800
 
236
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c    2016-03-23 17:18:40.237718089 +0800
 
237
+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2016-03-23 17:18:40.233718090 +0800
238
238
@@ -18,8 +18,8 @@
239
239
 #include <linux/component.h>
240
240
 #include <drm/i915_component.h>
248
248
 
249
249
Index: oem-audio-hda-daily-0.1/hda_intel.c
250
250
===================================================================
251
 
--- oem-audio-hda-daily-0.1.orig/hda_intel.c    2016-03-11 10:32:46.081037289 +0800
252
 
+++ oem-audio-hda-daily-0.1/hda_intel.c 2016-03-11 10:32:46.073037289 +0800
 
251
--- oem-audio-hda-daily-0.1.orig/hda_intel.c    2016-03-23 17:18:40.237718089 +0800
 
252
+++ oem-audio-hda-daily-0.1/hda_intel.c 2016-03-23 17:18:40.233718090 +0800
253
253
@@ -57,8 +57,8 @@
254
254
 #endif
255
255
 #include <sound/core.h>
263
263
 #include <linux/firmware.h>
264
264
Index: oem-audio-hda-daily-0.1/patch_hdmi.c
265
265
===================================================================
266
 
--- oem-audio-hda-daily-0.1.orig/patch_hdmi.c   2016-03-11 10:32:46.081037289 +0800
267
 
+++ oem-audio-hda-daily-0.1/patch_hdmi.c        2016-03-11 10:32:46.077037289 +0800
 
266
--- oem-audio-hda-daily-0.1.orig/patch_hdmi.c   2016-03-23 17:18:40.237718089 +0800
 
267
+++ oem-audio-hda-daily-0.1/patch_hdmi.c        2016-03-23 17:18:40.237718089 +0800
268
268
@@ -37,9 +37,9 @@
269
269
 #include <sound/jack.h>
270
270
 #include <sound/asoundef.h>
280
280
 #include "hda_jack.h"
281
281
Index: oem-audio-hda-daily-0.1/include/hda_chmap.h
282
282
===================================================================
283
 
--- oem-audio-hda-daily-0.1.orig/include/hda_chmap.h    2016-03-11 10:32:46.081037289 +0800
284
 
+++ oem-audio-hda-daily-0.1/include/hda_chmap.h 2016-03-11 10:32:46.077037289 +0800
 
283
--- oem-audio-hda-daily-0.1.orig/include/hda_chmap.h    2016-03-23 17:18:40.237718089 +0800
 
284
+++ oem-audio-hda-daily-0.1/include/hda_chmap.h 2016-03-23 17:18:40.237718089 +0800
285
285
@@ -6,7 +6,7 @@
286
286
 #define __SOUND_HDA_CHMAP_H
287
287
 
293
293
 #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
294
294
Index: oem-audio-hda-daily-0.1/hda_eld.c
295
295
===================================================================
296
 
--- oem-audio-hda-daily-0.1.orig/hda_eld.c      2016-03-11 10:32:30.085036692 +0800
297
 
+++ oem-audio-hda-daily-0.1/hda_eld.c   2016-03-11 10:33:15.049038371 +0800
 
296
--- oem-audio-hda-daily-0.1.orig/hda_eld.c      2016-03-23 17:18:40.237718089 +0800
 
297
+++ oem-audio-hda-daily-0.1/hda_eld.c   2016-03-23 17:18:40.237718089 +0800
298
298
@@ -26,7 +26,7 @@
299
299
 #include <linux/slab.h>
300
300
 #include <sound/core.h>
306
306
 
307
307
Index: oem-audio-hda-daily-0.1/hdacore/hdmi_chmap.c
308
308
===================================================================
309
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdmi_chmap.c   2016-03-11 10:32:30.089036692 +0800
310
 
+++ oem-audio-hda-daily-0.1/hdacore/hdmi_chmap.c        2016-03-11 10:34:31.461041225 +0800
 
309
--- oem-audio-hda-daily-0.1.orig/hdacore/hdmi_chmap.c   2016-03-23 17:18:40.237718089 +0800
 
310
+++ oem-audio-hda-daily-0.1/hdacore/hdmi_chmap.c        2016-03-23 17:18:40.237718089 +0800
311
311
@@ -5,7 +5,7 @@
312
312
 #include <linux/module.h>
313
313
 #include <sound/control.h>
317
317
 
318
318
 /*
319
319
  * CEA speaker placement:
 
320
Index: oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_bus.c
 
321
===================================================================
 
322
--- oem-audio-hda-daily-0.1.orig/hdacore/ext/hdac_ext_bus.c     2016-03-23 17:18:16.737719182 +0800
 
323
+++ oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_bus.c  2016-03-23 17:20:16.577713610 +0800
 
324
@@ -20,7 +20,7 @@
 
325
 #include <linux/module.h>
 
326
 #include <linux/slab.h>
 
327
 #include <linux/io.h>
 
328
-#include <sound/hdaudio_ext.h>
 
329
+#include "../../include/hdaudio_ext.h"
 
330
 
 
331
 MODULE_DESCRIPTION("HDA extended core");
 
332
 MODULE_LICENSE("GPL v2");
 
333
Index: oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_controller.c
 
334
===================================================================
 
335
--- oem-audio-hda-daily-0.1.orig/hdacore/ext/hdac_ext_controller.c      2016-03-23 17:18:16.737719182 +0800
 
336
+++ oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_controller.c   2016-03-23 17:19:53.273714693 +0800
 
337
@@ -19,8 +19,8 @@
 
338
 
 
339
 #include <linux/delay.h>
 
340
 #include <linux/slab.h>
 
341
-#include <sound/hda_register.h>
 
342
-#include <sound/hdaudio_ext.h>
 
343
+#include "../../include/hda_register.h"
 
344
+#include "../../include/hdaudio_ext.h"
 
345
 
 
346
 /*
 
347
  * maximum HDAC capablities we should parse to avoid endless looping:
 
348
Index: oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_stream.c
 
349
===================================================================
 
350
--- oem-audio-hda-daily-0.1.orig/hdacore/ext/hdac_ext_stream.c  2016-03-23 17:18:16.737719182 +0800
 
351
+++ oem-audio-hda-daily-0.1/hdacore/ext/hdac_ext_stream.c       2016-03-23 17:20:14.365713713 +0800
 
352
@@ -20,8 +20,8 @@
 
353
 #include <linux/delay.h>
 
354
 #include <linux/slab.h>
 
355
 #include <sound/pcm.h>
 
356
-#include <sound/hda_register.h>
 
357
-#include <sound/hdaudio_ext.h>
 
358
+#include "../../include/hda_register.h"
 
359
+#include "../../include/hdaudio_ext.h"
 
360
 
 
361
 /**
 
362
  * snd_hdac_ext_stream_init - initialize each stream (aka device)