add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/sound/soc/ux500/ux500_msp_i2s.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) ST-Ericsson SA 2012
3
4
  *
..
..
@@ -7,10 +8,6 @@
7
8
  *         for ST-Ericsson.
8
9
  *
9
10
  * License terms:
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of the GNU General Public License version 2 as published
13
- * by the Free Software Foundation.
14
11
  */
15
12
 
16
13
 #include <linux/module.h>
..
..
@@ -398,7 +395,7 @@
398
395
 
399
396
 static void flush_fifo_rx(struct ux500_msp *msp)
400
397
 {
401
-	u32 reg_val_DR, reg_val_GCR, reg_val_FLR;
398
+	u32 reg_val_GCR, reg_val_FLR;
402
399
 	u32 limit = 32;
403
400
 
404
401
 	reg_val_GCR = readl(msp->registers + MSP_GCR);
..
..
@@ -406,7 +403,7 @@
406
403
 
407
404
 	reg_val_FLR = readl(msp->registers + MSP_FLR);
408
405
 	while (!(reg_val_FLR & RX_FIFO_EMPTY) && limit--) {
409
-		reg_val_DR = readl(msp->registers + MSP_DR);
406
+		readl(msp->registers + MSP_DR);
410
407
 		reg_val_FLR = readl(msp->registers + MSP_FLR);
411
408
 	}
412
409
 
..
..
@@ -415,7 +412,7 @@
415
412
 
416
413
 static void flush_fifo_tx(struct ux500_msp *msp)
417
414
 {
418
-	u32 reg_val_TSTDR, reg_val_GCR, reg_val_FLR;
415
+	u32 reg_val_GCR, reg_val_FLR;
419
416
 	u32 limit = 32;
420
417
 
421
418
 	reg_val_GCR = readl(msp->registers + MSP_GCR);
..
..
@@ -424,7 +421,7 @@
424
421
 
425
422
 	reg_val_FLR = readl(msp->registers + MSP_FLR);
426
423
 	while (!(reg_val_FLR & TX_FIFO_EMPTY) && limit--) {
427
-		reg_val_TSTDR = readl(msp->registers + MSP_TSTDR);
424
+		readl(msp->registers + MSP_TSTDR);
428
425
 		reg_val_FLR = readl(msp->registers + MSP_FLR);
429
426
 	}
430
427
 	writel(0x0, msp->registers + MSP_ITCR);
..
..
@@ -536,7 +533,6 @@
536
533
 static int disable_msp(struct ux500_msp *msp, unsigned int dir)
537
534
 {
538
535
 	u32 reg_val_GCR;
539
-	int status = 0;
540
536
 	unsigned int disable_tx, disable_rx;
541
537
 
542
538
 	reg_val_GCR = readl(msp->registers + MSP_GCR);
..
..
@@ -569,7 +565,7 @@
569
565
 	else if (disable_rx)
570
566
 		disable_msp_rx(msp);
571
567
 
572
-	return status;
568
+	return 0;
573
569
 }
574
570
 
575
571
 int ux500_msp_i2s_trigger(struct ux500_msp *msp, int cmd, int direction)