Drop TI compatibility clocks

Hi all,

In order to prepare the TI clocks for fixing lots of devicetree warnings, let's first drop the now unused compatibility clocks.

The dra7 changes depend on my still pending omap-for-v5.17/fixes-not-urgent pull request that did not make it for v5.17-rc series so far.

Regards,

Tony

Tony Lindgren (3):
clk: ti: Drop legacy compatibility clocks for am3
clk: ti: Drop legacy compatibility clocks for am4
clk: ti: Drop legacy compatibility clocks for dra7

 drivers/clk/ti/Makefile          |   9 +-
 drivers/clk/ti/clk-33xx-compat.c | 218 --------
 drivers/clk/ti/clk-33xx.c        |   5 +-
 drivers/clk/ti/clk-43xx-compat.c | 225 ---------
 drivers/clk/ti/clk-43xx.c        |   5 +-
 drivers/clk/ti/clk-7xx-compat.c  | 820 -------------------------------
 drivers/clk/ti/clk-7xx.c         |   5 +-
 drivers/clk/ti/clkctrl.c         |  33 +-
 drivers/clk/ti/clock.h           |   3 -
 include/dt-bindings/clock/am3.h  |  93 ----
 include/dt-bindings/clock/am4.h  |  98 ----
 include/dt-bindings/clock/dra7.h | 168 -------
 12 files changed, 15 insertions(+), 1667 deletions(-)
 delete mode 100644 drivers/clk/ti/clk-33xx-compat.c
 delete mode 100644 drivers/clk/ti/clk-43xx-compat.c
 delete mode 100644 drivers/clk/ti/clk-7xx-compat.c

2.35.1

We no longer have users for the compatibility clocks and we can drop them. These are old duplicate clocks for what we using.

---
 drivers/clk/ti/Makefile          |   3 +-
 drivers/clk/ti/clk-33xx-compat.c | 218 -------------------------------
 drivers/clk/ti/clk-33xx.c        |   5 +-
 drivers/clk/ti/clkctrl.c         |   8 +-
 include/dt-bindings/clock/am3.h  |  93 -------------
 5 files changed, 4 insertions(+), 323 deletions(-)
 delete mode 100644 drivers/clk/ti/clk-33xx-compat.c

@@ -6,8 +6,7 @@ clk-common				= dpll.o composite.o divider.o gate.o \
 					  fixed-factor.o mux.o apll.o \
 					  clkt_dpll.o clkt_iclk.o clkt_dflt.o \
 					  clkctrl.o
-obj-$(CONFIG_SOC_AM33XX)		+= $(clk-common) clk-33xx.o dpll3xxx.o \
-					  clk-33xx-compat.o
+obj-$(CONFIG_SOC_AM33XX)		+= $(clk-common) clk-33xx.o dpll3xxx.o
 obj-$(CONFIG_SOC_TI81XX)		+= $(clk-common) fapll.o clk-814x.o clk-816x.o
 obj-$(CONFIG_ARCH_OMAP2)		+= $(clk-common) interface.o clk-2xxx.o
 obj-$(CONFIG_ARCH_OMAP3)		+= $(clk-common) interface.o \

@@ -279,10 +279,7 @@ int __init am33xx_dt_clk_init(void)
 {
 	struct clk *clk1, *clk2;
 
-	if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-		ti_dt_clocks_register(am33xx_compat_clks);
-	else
-		ti_dt_clocks_register(am33xx_clks);
+	ti_dt_clocks_register(am33xx_clks);
 
 	omap2_clk_disable_autoidle_all();
 

@@ -542,12 +542,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 		soc_mask = CLKF_SOC_DRA76;
 #endif
 #ifdef CONFIG_SOC_AM33XX
-	if (of_machine_is_compatible("ti,am33xx")) {
-		if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-			data = am3_clkctrl_compat_data;
-		else
-			data = am3_clkctrl_data;
-	}
+	if (of_machine_is_compatible("ti,am33xx"))
+		data = am3_clkctrl_data;
 #endif
 #ifdef CONFIG_SOC_AM43XX
 	if (of_machine_is_compatible("ti,am4372")) {

2.35.1

Quoting Tony Lindgren (2022-02-03 00:56:16)

Applied to clk-next

We no longer have users for the compatibility clocks and we can drop them. These are old duplicate clocks for what we using.

---
 drivers/clk/ti/Makefile          |   3 +-
 drivers/clk/ti/clk-43xx-compat.c | 225 -------------------------------
 drivers/clk/ti/clk-43xx.c        |   5 +-
 drivers/clk/ti/clkctrl.c         |  16 +--
 drivers/clk/ti/clock.h           |   3 -
 include/dt-bindings/clock/am4.h  |  98 --------------
 6 files changed, 6 insertions(+), 344 deletions(-)
 delete mode 100644 drivers/clk/ti/clk-43xx-compat.c

@@ -18,8 +18,7 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(clk-common) clk-54xx.o \
 obj-$(CONFIG_SOC_DRA7XX)		+= $(clk-common) clk-7xx.o \
 					   clk-dra7-atl.o dpll3xxx.o \
 					   dpll44xx.o clk-7xx-compat.o
-obj-$(CONFIG_SOC_AM43XX)		+= $(clk-common) dpll3xxx.o clk-43xx.o \
-					   clk-43xx-compat.o
+obj-$(CONFIG_SOC_AM43XX)		+= $(clk-common) dpll3xxx.o clk-43xx.o
 
 endif	# CONFIG_ARCH_OMAP2PLUS
 

@@ -282,10 +282,7 @@ int __init am43xx_dt_clk_init(void)
 {
 	struct clk *clk1, *clk2;
 
-	if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-		ti_dt_clocks_register(am43xx_compat_clks);
-	else
-		ti_dt_clocks_register(am43xx_clks);
+	ti_dt_clocks_register(am43xx_clks);
 
 	omap2_clk_disable_autoidle_all();
 

@@ -546,19 +546,11 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 		data = am3_clkctrl_data;
 #endif
 #ifdef CONFIG_SOC_AM43XX
-	if (of_machine_is_compatible("ti,am4372")) {
-		if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-			data = am4_clkctrl_compat_data;
-		else
-			data = am4_clkctrl_data;
-	}
+	if (of_machine_is_compatible("ti,am4372"))
+		data = am4_clkctrl_data;
 
-	if (of_machine_is_compatible("ti,am438x")) {
-		if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-			data = am438x_clkctrl_compat_data;
-		else
-			data = am438x_clkctrl_data;
-	}
+	if (of_machine_is_compatible("ti,am438x"))
+		data = am438x_clkctrl_data;
 #endif
 #ifdef CONFIG_SOC_TI81XX
 	if (of_machine_is_compatible("ti,dm814"))

@@ -201,10 +201,7 @@ extern const struct omap_clkctrl_data am3_clkctrl_data[];
 extern const struct omap_clkctrl_data am3_clkctrl_compat_data[];
 extern struct ti_dt_clk am33xx_compat_clks[];
 extern const struct omap_clkctrl_data am4_clkctrl_data[];
-extern const struct omap_clkctrl_data am4_clkctrl_compat_data[];
-extern struct ti_dt_clk am43xx_compat_clks[];
 extern const struct omap_clkctrl_data am438x_clkctrl_data[];
-extern const struct omap_clkctrl_data am438x_clkctrl_compat_data[];
 extern const struct omap_clkctrl_data dm814_clkctrl_data[];
 extern const struct omap_clkctrl_data dm816_clkctrl_data[];
 

2.35.1

Quoting Tony Lindgren (2022-02-03 00:56:17)

Applied to clk-next

We no longer have users for the compatibility clocks and we can drop them. These are old duplicate clocks for what we using.

Depends-on: 31aa7056bbec ("ARM: dts: Don't use legacy clock defines for dra7 clkctrl")
Depends-on: 9206a3af4fc0 ("clk: ti: Move dra7 clock devices out of the legacy section")

---
 drivers/clk/ti/Makefile          |   3 +-
 drivers/clk/ti/clk-7xx-compat.c  | 820 -------------------------------
 drivers/clk/ti/clk-7xx.c         |   5 +-
 drivers/clk/ti/clkctrl.c         |   9 +-
 include/dt-bindings/clock/dra7.h | 168 -------
 5 files changed, 5 insertions(+), 1000 deletions(-)
 delete mode 100644 drivers/clk/ti/clk-7xx-compat.c

@@ -17,7 +17,8 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(clk-common) clk-54xx.o \
 					   dpll3xxx.o dpll44xx.o
 obj-$(CONFIG_SOC_DRA7XX)		+= $(clk-common) clk-7xx.o \
 					   clk-dra7-atl.o dpll3xxx.o \
-					   dpll44xx.o clk-7xx-compat.o
+					   dpll44xx.o
+
 obj-$(CONFIG_SOC_AM43XX)		+= $(clk-common) dpll3xxx.o clk-43xx.o
 
 endif	# CONFIG_ARCH_OMAP2PLUS

@@ -946,10 +946,7 @@ int __init dra7xx_dt_clk_init(void)
 	int rc;
 	struct clk *dpll_ck, *hdcp_ck;
 
-	if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-		ti_dt_clocks_register(dra7xx_compat_clks);
-	else
-		ti_dt_clocks_register(dra7xx_clks);
+	ti_dt_clocks_register(dra7xx_clks);
 
 	omap2_clk_disable_autoidle_all();
 

@@ -527,13 +527,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 		data = omap5_clkctrl_data;
 #endif
 #ifdef CONFIG_SOC_DRA7XX
-	if (of_machine_is_compatible("ti,dra7")) {
-		if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-			data = dra7_clkctrl_compat_data;
-		else
-			data = dra7_clkctrl_data;
-	}
-
+	if (of_machine_is_compatible("ti,dra7"))
+		data = dra7_clkctrl_data;
 	if (of_machine_is_compatible("ti,dra72"))
 		soc_mask = CLKF_SOC_DRA72;
 	if (of_machine_is_compatible("ti,dra74"))

2.35.1

Quoting Tony Lindgren (2022-02-03 00:56:18)

Applied to clk-next

Quoting Tony Lindgren (2022-02-03 00:56:15)

What should I do with this one though?

Well the dependencies are now merged to the mainline kernel, so you could merge in commit 31aa7056bbec, then apply this series if otherwise OK.

Commit 31aa7056bbec is based on the old v5.16-rc1. It would bring few other fixes from mainline too if pulled on a v5.17-rc1 based branch:

31aa7056bbec ("ARM: dts: Don't use legacy clock defines for dra7 clkctrl") 9206a3af4fc0 ("clk: ti: Move dra7 clock devices out of the legacy section") 23885389dbbb ("ARM: dts: Fix timer regression for beagleboard revision c") 29a5e8496b3a ("ARM: dts: am335x-wega: Fix typo in mcasp property rx-num-evt") 34596ba380b0 ("ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of") 80c469a0a037 ("ARM: OMAP2+: hwmod: Add of_node_put() before break")

Regards,

Tony

Quoting Tony Lindgren (2022-03-11 23:52:36)

Ok. Looks like I can merge v5.17-rc4 and then apply these patches. I'll do that now. Thanks!