2021-03-19 12:45:53

by Kishon Vijay Abraham I

Subject: [PATCH v7 08/13] phy: cadence-torrent: Use a common header file for Cadence SERDES

No functional change. In order to have a single header file for all
Cadence SERDES move phy-cadence-torrent.h to phy-cadence.h. This is
in preparation for adding Cadence Sierra SERDES specific macros.

Signed-off-by: Kishon Vijay Abraham I <[email protected]>
Reviewed-by: Swapnil Jakhade <[email protected]>
---
.../devicetree/bindings/phy/phy-cadence-torrent.yaml | 2 +-
drivers/phy/cadence/phy-cadence-torrent.c | 2 +-
.../phy/{phy-cadence-torrent.h => phy-cadence.h} | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
rename include/dt-bindings/phy/{phy-cadence-torrent.h => phy-cadence.h} (51%)

diff --git a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml
index 4608599a31d8..01dcd14e7b2a 100644
--- a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml
+++ b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml
@@ -184,7 +184,7 @@ examples:
};
- |
#include <dt-bindings/phy/phy.h>
- #include <dt-bindings/phy/phy-cadence-torrent.h>
+ #include <dt-bindings/phy/phy-cadence.h>

bus {
#address-cells = <2>;
diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
index 95160da3e667..3fdab0d288c4 100644
--- a/drivers/phy/cadence/phy-cadence-torrent.c
+++ b/drivers/phy/cadence/phy-cadence-torrent.c
@@ -7,7 +7,7 @@
*/

#include <dt-bindings/phy/phy.h>
-#include <dt-bindings/phy/phy-cadence-torrent.h>
+#include <dt-bindings/phy/phy-cadence.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/delay.h>
diff --git a/include/dt-bindings/phy/phy-cadence-torrent.h b/include/dt-bindings/phy/phy-cadence.h
similarity index 51%
rename from include/dt-bindings/phy/phy-cadence-torrent.h
rename to include/dt-bindings/phy/phy-cadence.h
index 3c92c6192493..4a5ea52a856f 100644
--- a/include/dt-bindings/phy/phy-cadence-torrent.h
+++ b/include/dt-bindings/phy/phy-cadence.h
@@ -1,15 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * This header provides constants for Cadence Torrent SERDES.
+ * This header provides constants for Cadence SERDES.
*/

-#ifndef _DT_BINDINGS_TORRENT_SERDES_H
-#define _DT_BINDINGS_TORRENT_SERDES_H
+#ifndef _DT_BINDINGS_CADENCE_SERDES_H
+#define _DT_BINDINGS_CADENCE_SERDES_H

+/* Torrent */
#define TORRENT_SERDES_NO_SSC 0
#define TORRENT_SERDES_EXTERNAL_SSC 1
#define TORRENT_SERDES_INTERNAL_SSC 2

#define CDNS_TORRENT_REFCLK_DRIVER 0

-#endif /* _DT_BINDINGS_TORRENT_SERDES_H */
+#endif /* _DT_BINDINGS_CADENCE_SERDES_H */
--
2.17.1

2021-03-23 22:35:41

by Rob Herring (Arm)

Subject: Re: [PATCH v7 08/13] phy: cadence-torrent: Use a common header file for Cadence SERDES

On Fri, 19 Mar 2021 18:11:23 +0530, Kishon Vijay Abraham I wrote:
> No functional change. In order to have a single header file for all
> Cadence SERDES move phy-cadence-torrent.h to phy-cadence.h. This is
> in preparation for adding Cadence Sierra SERDES specific macros.
>
> Signed-off-by: Kishon Vijay Abraham I <[email protected]>
> Reviewed-by: Swapnil Jakhade <[email protected]>
> ---
> .../devicetree/bindings/phy/phy-cadence-torrent.yaml | 2 +-
> drivers/phy/cadence/phy-cadence-torrent.c | 2 +-
> .../phy/{phy-cadence-torrent.h => phy-cadence.h} | 9 +++++----
> 3 files changed, 7 insertions(+), 6 deletions(-)
> rename include/dt-bindings/phy/{phy-cadence-torrent.h => phy-cadence.h} (51%)
>

Acked-by: Rob Herring <[email protected]>