Skip to contentSkip to conversation

mfd: madera: Remove some unused registers and fix some defaults

PATCH Applied Charles Keepax 2 participants 4 messages Jun 26, 2019 – Jun 27, 2019

Subsystems (2)
lore
Share & tools
lore

Charles Keepax

author maintainer
#0 lore raw

PATCH 1/2 mfd: madera: Remove some unused registers and fix some defaults

---
 drivers/mfd/cs47l15-tables.c         |   2 -
 drivers/mfd/cs47l35-tables.c         |  54 +---------------
 drivers/mfd/cs47l85-tables.c         | 122 ++---------------------------------
 drivers/mfd/cs47l90-tables.c         |  76 ----------------------
 drivers/mfd/cs47l92-tables.c         |   1 -
 include/linux/mfd/madera/registers.h |  80 -----------------------
 6 files changed, 6 insertions(+), 329 deletions(-)
drivers/mfd/cs47l15-tables.c +0 -2
index 1b4f6f79eac2c..73db8d03b531f 100644
@@ -88,7 +88,6 @@ static const struct reg_default cs47l15_reg_default[] = {
 	{ 0x00000174, 0x007d }, /* R372 (0x174) - FLL1 Control 4 */
 	{ 0x00000175, 0x0000 }, /* R373 (0x175) - FLL1 Control 5 */
 	{ 0x00000176, 0x0000 }, /* R374 (0x176) - FLL1 Control 6 */
-	{ 0x00000177, 0x0281 }, /* R375 (0x177) - FLL1 Loop Filter Test 1 */
 	{ 0x00000179, 0x0000 }, /* R377 (0x179) - FLL1 Control 7 */
 	{ 0x0000017a, 0x2906 }, /* R378 (0x17A) - FLL1 EFS 2 */
 	{ 0x00000181, 0x0000 }, /* R385 (0x181) - FLL1 Synchroniser 1 */
@@ -746,7 +745,6 @@ static bool cs47l15_16bit_readable_register(struct device *dev,
 	case MADERA_FLL1_CONTROL_1 ... MADERA_FLL1_CONTROL_6:
 	case MADERA_FLL1_CONTROL_7:
 	case MADERA_FLL1_EFS_2:
-	case MADERA_FLL1_LOOP_FILTER_TEST_1:
 	case MADERA_FLL1_SYNCHRONISER_1 ... MADERA_FLL1_SYNCHRONISER_7:
 	case MADERA_FLL1_SPREAD_SPECTRUM:
 	case MADERA_FLL1_GPIO_CLOCK:
drivers/mfd/cs47l35-tables.c +1 -53

91 lines not on this page · raw message

drivers/mfd/cs47l85-tables.c +5 -117

195 lines not on this page · raw message

drivers/mfd/cs47l90-tables.c +0 -76

124 lines not on this page · raw message

drivers/mfd/cs47l92-tables.c +0 -1
index 3dc1fefe68f59..c8a2343813502 100644
@@ -1063,7 +1063,6 @@ static const struct reg_default cs47l92_reg_default[] = {
 	{ 0x0000185e, 0xffff }, /* R6238 (0x185e) - IRQ1 Mask 31 */
 	{ 0x0000185f, 0xffff }, /* R6239 (0x185f) - IRQ1 Mask 32 */
 	{ 0x00001860, 0x0001 }, /* R6240 (0x1860) - IRQ1 Mask 33 */
-	{ 0x00001948, 0x031f }, /* R6472 (0x1948) - IRQ2 Mask 9 */
 	{ 0x00001a06, 0x0000 }, /* R6662 (0x1a06) - Interrupt Debounce 7 */
 	{ 0x00001a80, 0x4400 }, /* R6784 (0x1a80) - IRQ1 Ctrl */
 };
include/linux/mfd/madera/registers.h +0 -80

118 lines not on this page · raw message

Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 2/2 mfd: madera: Fixup SPDX headers

GPL-2.0-only is the preferred way of expressing v2 of the GPL, so switch to that. Remove some redundant copyright notices and correct some instances where the wrong comment type has been used in header files.

---
 drivers/mfd/cs47l15-tables.c         | 2 +-
 drivers/mfd/cs47l35-tables.c         | 6 +-----
 drivers/mfd/cs47l85-tables.c         | 6 +-----
 drivers/mfd/cs47l90-tables.c         | 6 +-----
 drivers/mfd/cs47l92-tables.c         | 2 +-
 drivers/mfd/madera-core.c            | 6 +-----
 drivers/mfd/madera-i2c.c             | 6 +-----
 drivers/mfd/madera-spi.c             | 6 +-----
 include/linux/mfd/madera/core.h      | 6 +-----
 include/linux/mfd/madera/pdata.h     | 6 +-----
 include/linux/mfd/madera/registers.h | 6 +-----
 11 files changed, 11 insertions(+), 47 deletions(-)
drivers/mfd/cs47l15-tables.c +1 -1
index 73db8d03b531f..f81b45336690e 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Regmap tables for CS47L15 codec
  *
drivers/mfd/cs47l35-tables.c +1 -5
index fe838cbc2a7ee..a0bc6c5100d63 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Regmap tables for CS47L35 codec
  *
  * Copyright (C) 2015-2017 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
drivers/mfd/cs47l85-tables.c +1 -5
index d0198b5e86bac..270d8eda3f5f2 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Regmap tables for CS47L85 codec
  *
  * Copyright (C) 2015-2017 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
drivers/mfd/cs47l90-tables.c +1 -5
index 2c761fc241f30..7345fc09c0bb6 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Regmap tables for CS47L90 codec
  *
  * Copyright (C) 2015-2017 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
drivers/mfd/cs47l92-tables.c +1 -1
index c8a2343813502..f296e355df4da 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Regmap tables for CS47L92 codec
  *
drivers/mfd/madera-core.c +1 -5
index b9e9c169c6cc7..29540cbf75934 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Core MFD support for Cirrus Logic Madera codecs
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
drivers/mfd/madera-i2c.c +1 -5
index 3f4ab5dcf5c3d..6b965eb034b6c 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * I2C bus interface to Cirrus Logic Madera codecs
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
drivers/mfd/madera-spi.c +1 -5
index d76c7e7376d7c..e860f5ff09336 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * SPI bus interface to Cirrus Logic Madera codecs
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #include <linux/device.h>
include/linux/mfd/madera/core.h +1 -5
index 7b87f9a02ecc2..7ffa696cce7ca 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MFD internals for Cirrus Logic Madera codecs
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #ifndef MADERA_CORE_H
include/linux/mfd/madera/pdata.h +1 -5
index dd00ab824e5be..ec0711bcad503 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Platform data for Cirrus Logic Madera codecs
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #ifndef MADERA_PDATA_H
include/linux/mfd/madera/registers.h +1 -5
index 53c2377b54b29..fe909d1777622 100644
@@ -1,12 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Madera register definitions
  *
  * Copyright (C) 2015-2018 Cirrus Logic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; version 2.
  */
 
 #ifndef MADERA_REGISTERS_H
Signature · 1 line
2.11.0
Applied
#2 lore raw

Re: [PATCH 2/2] mfd: madera: Fixup SPDX headers

Quoted 5 lines · Charles Keepax

GPL-2.0-only is the preferred way of expressing v2 of the GPL, so switch to that. Remove some redundant copyright notices and correct some instances where the wrong comment type has been used in header files.

Quoted 13 lines
---
 drivers/mfd/cs47l15-tables.c         | 2 +-
 drivers/mfd/cs47l35-tables.c         | 6 +-----
 drivers/mfd/cs47l85-tables.c         | 6 +-----
 drivers/mfd/cs47l90-tables.c         | 6 +-----
 drivers/mfd/cs47l92-tables.c         | 2 +-
 drivers/mfd/madera-core.c            | 6 +-----
 drivers/mfd/madera-i2c.c             | 6 +-----
 drivers/mfd/madera-spi.c             | 6 +-----
 include/linux/mfd/madera/core.h      | 6 +-----
 include/linux/mfd/madera/pdata.h     | 6 +-----
 include/linux/mfd/madera/registers.h | 6 +-----
 11 files changed, 11 insertions(+), 47 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#3 lore raw
In reply to Charles Keepax
Quoted 9 lines · Charles Keepax
---
 drivers/mfd/cs47l15-tables.c         |   2 -
 drivers/mfd/cs47l35-tables.c         |  54 +---------------
 drivers/mfd/cs47l85-tables.c         | 122 ++---------------------------------
 drivers/mfd/cs47l90-tables.c         |  76 ----------------------
 drivers/mfd/cs47l92-tables.c         |   1 -
 include/linux/mfd/madera/registers.h |  80 -----------------------
 6 files changed, 6 insertions(+), 329 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog