Merge branches 'clk-bulk-optional', 'clk-kirkwood', 'clk-socfpga' and 'clk-docs' into clk-next

- Add a clk_bulk_get_optional() API (with devm too) - Support for Marvell 98DX1135 SoCs * clk-bulk-optional: clk: Document some devm_clk_bulk*() APIs clk: Add devm_clk_bulk_get_optional() function clk: Add clk_bulk_get_optional() function * clk-kirkwood: clk: kirkwood: Add support for MV98DX1135 dt-bindings: clock: mvebu: Add compatible string for 98dx1135 core clock * clk-socfpga: clk: socfpga: stratix10: fix divider entry for the emac clocks clk: socfpga: stratix10: add additional clocks needed for the NAND IP * clk-docs: clk: Grammar missing "and", Spelling s/statisfied/satisfied/

Stephen Boyd committed 7 years ago

Commit dfe1d3a5 parents e02cb1f 179175d 88aa7af 16e3c57 65e22189 files · +120 −12Browse files

Unified · Split

9 files

Documentation/devicetree/bindings/clock/mvebu-core-clock.txt +1 −0
Documentation/driver-model/devres.txt +4 −0
drivers/clk/clk-bulk.c +20 −3
drivers/clk/clk-devres.c +19 −3
drivers/clk/clk.c +2 −2
drivers/clk/mvebu/kirkwood.c +17 −0
drivers/clk/socfpga/clk-s10.c +7 −3
include/dt-bindings/clock/stratix10-clock.h +3 −1
include/linux/clk.h +47 −0

Documentation/devicetree/bindings/clock/mvebu-core-clock.txt+1−0

@@ -59,6 +59,7 @@ Required properties: · 58 unmodified lines
59	"marvell,dove-core-clock" - for Dove SoC core clocks	59	"marvell,dove-core-clock" - for Dove SoC core clocks
60	"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)	60	"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)
61	"marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC	61	"marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC
		62	"marvell,mv98dx1135-core-clock" - for Kirkwood 98dx1135 SoC
62	"marvell,mv88f5181-core-clock" - for Orion MV88F5181 SoC	63	"marvell,mv88f5181-core-clock" - for Orion MV88F5181 SoC
63	"marvell,mv88f5182-core-clock" - for Orion MV88F5182 SoC	64	"marvell,mv88f5182-core-clock" - for Orion MV88F5182 SoC
64	"marvell,mv88f5281-core-clock" - for Orion MV88F5281 SoC	65	"marvell,mv88f5281-core-clock" - for Orion MV88F5281 SoC

Documentation/driver-model/devres.txt+4−0

   devm_clk_get()
   devm_clk_get_optional()
   devm_clk_put()
+  devm_clk_bulk_get()
+  devm_clk_bulk_get_all()
+  devm_clk_bulk_get_optional()
+  devm_get_clk_from_childl()
   devm_clk_hw_register()
   devm_of_clk_add_hw_provider()
   devm_clk_hw_register_clkdev()

drivers/clk/clk-bulk.c+20−3

 }
 EXPORT_SYMBOL_GPL(clk_bulk_put);
-int __must_check clk_bulk_get(struct device *dev, int num_clks,
+static int __clk_bulk_get(struct device *dev, int num_clks,
-			      struct clk_bulk_data *clks)
+			  struct clk_bulk_data *clks, bool optional)
 {
 	int ret;
 	int i;
 		clks[i].clk = clk_get(dev, clks[i].id);
 		if (IS_ERR(clks[i].clk)) {
 			ret = PTR_ERR(clks[i].clk);
+			clks[i].clk = NULL;
+			if (ret == -ENOENT && optional)
+				continue;
 			if (ret != -EPROBE_DEFER)
 				dev_err(dev, "Failed to get clk '%s': %d\n",
 					clks[i].id, ret);
-			clks[i].clk = NULL;
 			goto err;
 		}
 	}
 	return ret;
 }
+int __must_check clk_bulk_get(struct device *dev, int num_clks,
+			      struct clk_bulk_data *clks)
+{
+	return __clk_bulk_get(dev, num_clks, clks, false);
+}
 EXPORT_SYMBOL(clk_bulk_get);
+int __must_check clk_bulk_get_optional(struct device *dev, int num_clks,
+				       struct clk_bulk_data *clks)
+{
+	return __clk_bulk_get(dev, num_clks, clks, true);
+}
+EXPORT_SYMBOL_GPL(clk_bulk_get_optional);
 void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks)
 {
 	if (IS_ERR_OR_NULL(clks))

drivers/clk/clk-devres.c+19−3

 	clk_bulk_put(devres->num_clks, devres->clks);
 }
-int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
+static int __devm_clk_bulk_get(struct device *dev, int num_clks,
-		      struct clk_bulk_data *clks)
+			       struct clk_bulk_data *clks, bool optional)
 {
 	struct clk_bulk_devres *devres;
 	int ret;
 	if (!devres)
 		return -ENOMEM;
-	ret = clk_bulk_get(dev, num_clks, clks);
+	if (optional)
+		ret = clk_bulk_get_optional(dev, num_clks, clks);
+	else
+		ret = clk_bulk_get(dev, num_clks, clks);
 	if (!ret) {
 		devres->clks = clks;
 		devres->num_clks = num_clks;
 	return ret;
 }
+int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
+		      struct clk_bulk_data *clks)
+{
+	return __devm_clk_bulk_get(dev, num_clks, clks, false);
+}
 EXPORT_SYMBOL_GPL(devm_clk_bulk_get);
+int __must_check devm_clk_bulk_get_optional(struct device *dev, int num_clks,
+		      struct clk_bulk_data *clks)
+{
+	return __devm_clk_bulk_get(dev, num_clks, clks, true);
+}
+EXPORT_SYMBOL_GPL(devm_clk_bulk_get_optional);
 int __must_check devm_clk_bulk_get_all(struct device *dev,
 				       struct clk_bulk_data **clks)
 {

drivers/clk/clk.c+2−2

@@ -2194,7 +2194,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) · 2193 unmodified lines
2194	EXPORT_SYMBOL_GPL(clk_set_rate);	2194	EXPORT_SYMBOL_GPL(clk_set_rate);
2195		2195
2196	/**	2196	/**
2197	* clk_set_rate_exclusive - specify a new rate get exclusive control	2197	* clk_set_rate_exclusive - specify a new rate and get exclusive control
2198	* @clk: the clk whose rate is being changed	2198	* @clk: the clk whose rate is being changed
2199	* @rate: the new rate for clk	2199	* @rate: the new rate for clk
2200	*	2200	*
@@ -2202,7 +2202,7 @@ EXPORT_SYMBOL_GPL(clk_set_rate); · 1 unmodified line
2202	* within a critical section	2202	* within a critical section
2203	*	2203	*
2204	* This can be used initially to ensure that at least 1 consumer is	2204	* This can be used initially to ensure that at least 1 consumer is
2205	* statisfied when several consumers are competing for exclusivity over the	2205	* satisfied when several consumers are competing for exclusivity over the
2206	* same clock provider.	2206	* same clock provider.
2207	*	2207	*
2208	* The exclusivity is not applied if setting the rate failed.	2208	* The exclusivity is not applied if setting the rate failed.

drivers/clk/mvebu/kirkwood.c+17−0

 	}
 }
+static u32 __init mv98dx1135_get_tclk_freq(void __iomem *sar)
+{
+	return 166666667;
+}
 static const struct coreclk_soc_desc kirkwood_coreclks = {
 	.get_tclk_freq = kirkwood_get_tclk_freq,
 	.get_cpu_freq = kirkwood_get_cpu_freq,
 	.num_ratios = ARRAY_SIZE(kirkwood_coreclk_ratios),
 };
+static const struct coreclk_soc_desc mv98dx1135_coreclks = {
+	.get_tclk_freq = mv98dx1135_get_tclk_freq,
+	.get_cpu_freq = kirkwood_get_cpu_freq,
+	.get_clk_ratio = kirkwood_get_clk_ratio,
+	.ratios = kirkwood_coreclk_ratios,
+	.num_ratios = ARRAY_SIZE(kirkwood_coreclk_ratios),
+};
 /*
  * Clock Gating Control
  */
 	if (of_device_is_compatible(np, "marvell,mv88f6180-core-clock"))
 		mvebu_coreclk_setup(np, &mv88f6180_coreclks);
+	else if (of_device_is_compatible(np, "marvell,mv98dx1135-core-clock"))
+		mvebu_coreclk_setup(np, &mv98dx1135_coreclks);
 	else
 		mvebu_coreclk_setup(np, &kirkwood_coreclks);
 	       kirkwood_clk_init);
 CLK_OF_DECLARE(mv88f6180_clk, "marvell,mv88f6180-core-clock",
 	       kirkwood_clk_init);
+CLK_OF_DECLARE(98dx1135_clk, "marvell,mv98dx1135-core-clock",
+	       kirkwood_clk_init);

drivers/clk/socfpga/clk-s10.c+7−3

 	{ STRATIX10_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux),
 	  0, 0, 0, 0x3C, 1},
 	{ STRATIX10_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux),
-	  0, 0, 4, 0xB0, 0},
+	  0, 0, 2, 0xB0, 0},
 	{ STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux),
-	  0, 0, 4, 0xB0, 1},
+	  0, 0, 2, 0xB0, 1},
 	{ STRATIX10_EMAC_PTP_FREE_CLK, "emac_ptp_free_clk", NULL, emac_ptp_free_mux,
 	  ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 4, 0xB0, 2},
 	{ STRATIX10_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux,
 	  8, 0, 0, 0, 0, 0, 0},
 	{ STRATIX10_SPI_M_CLK, "spi_m_clk", "l4_mp_clk", NULL, 1, 0, 0xA4,
 	  9, 0, 0, 0, 0, 0, 0},
-	{ STRATIX10_NAND_CLK, "nand_clk", "l4_main_clk", NULL, 1, 0, 0xA4,
+	{ STRATIX10_NAND_X_CLK, "nand_x_clk", "l4_mp_clk", NULL, 1, 0, 0xA4,
 	  10, 0, 0, 0, 0, 0, 0},
+	{ STRATIX10_NAND_CLK, "nand_clk", "nand_x_clk", NULL, 1, 0, 0xA4,
+	  10, 0, 0, 0, 0, 0, 4},
+	{ STRATIX10_NAND_ECC_CLK, "nand_ecc_clk", "nand_x_clk", NULL, 1, 0, 0xA4,
+	  10, 0, 0, 0, 0, 0, 4},
 };
 static int s10_clk_register_c_perip(const struct stratix10_perip_c_clock *clks,

include/dt-bindings/clock/stratix10-clock.h+3−1

@@ -79,6 +79,8 @@ · 78 unmodified lines
79	#define STRATIX10_USB_CLK 59	79	#define STRATIX10_USB_CLK 59
80	#define STRATIX10_SPI_M_CLK 60	80	#define STRATIX10_SPI_M_CLK 60
81	#define STRATIX10_NAND_CLK 61	81	#define STRATIX10_NAND_CLK 61
82	#define STRATIX10_NUM_CLKS 62	82	#define STRATIX10_NAND_X_CLK 62
		83	#define STRATIX10_NAND_ECC_CLK 63
		84	#define STRATIX10_NUM_CLKS 64
83		85
84	#endif /* __STRATIX10_CLOCK_H */	86	#endif /* __STRATIX10_CLOCK_H */

include/linux/clk.h+47−0

@@ -332,6 +332,19 @@ int __must_check clk_bulk_get(struct device *dev, int num_clks, · 331 unmodified lines
332	*/	332	*/
333	int __must_check clk_bulk_get_all(struct device *dev,	333	int __must_check clk_bulk_get_all(struct device *dev,
334	struct clk_bulk_data **clks);	334	struct clk_bulk_data **clks);
		335
		336	/**
		337	* clk_bulk_get_optional - lookup and obtain a number of references to clock producer
		338	* @dev: device for clock "consumer"
		339	* @num_clks: the number of clk_bulk_data
		340	* @clks: the clk_bulk_data table of consumer
		341	*
		342	* Behaves the same as clk_bulk_get() except where there is no clock producer.
		343	* In this case, instead of returning -ENOENT, the function returns 0 and
		344	* NULL for a clk for which a clock producer could not be determined.
		345	*/
		346	int __must_check clk_bulk_get_optional(struct device *dev, int num_clks,
		347	struct clk_bulk_data *clks);
335	/**	348	/**
336	* devm_clk_bulk_get - managed get multiple clk consumers	349	* devm_clk_bulk_get - managed get multiple clk consumers
337	* @dev: device for clock "consumer"	350	* @dev: device for clock "consumer"
@@ -346,6 +359,28 @@ int __must_check clk_bulk_get_all(struct device *dev, · 8 unmodified lines
346	*/	359	*/
347	int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,	360	int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
348	struct clk_bulk_data *clks);	361	struct clk_bulk_data *clks);
		362	/**
		363	* devm_clk_bulk_get_optional - managed get multiple optional consumer clocks
		364	* @dev: device for clock "consumer"
		365	* @clks: pointer to the clk_bulk_data table of consumer
		366	*
		367	* Behaves the same as devm_clk_bulk_get() except where there is no clock
		368	* producer. In this case, instead of returning -ENOENT, the function returns
		369	* NULL for given clk. It is assumed all clocks in clk_bulk_data are optional.
		370	*
		371	* Returns 0 if all clocks specified in clk_bulk_data table are obtained
		372	* successfully or for any clk there was no clk provider available, otherwise
		373	* returns valid IS_ERR() condition containing errno.
		374	* The implementation uses @dev and @clk_bulk_data.id to determine the
		375	* clock consumer, and thereby the clock producer.
		376	* The clock returned is stored in each @clk_bulk_data.clk field.
		377	*
		378	* Drivers must assume that the clock source is not enabled.
		379	*
		380	* clk_bulk_get should not be called from within interrupt context.
		381	*/
		382	int __must_check devm_clk_bulk_get_optional(struct device *dev, int num_clks,
		383	struct clk_bulk_data *clks);
349	/**	384	/**
350	* devm_clk_bulk_get_all - managed get multiple clk consumers	385	* devm_clk_bulk_get_all - managed get multiple clk consumers
351	* @dev: device for clock "consumer"	386	* @dev: device for clock "consumer"
@@ -718,6 +753,12 @@ static inline int __must_check clk_bulk_get(struct device *dev, int num_clks, · 366 unmodified lines
718	return 0;	753	return 0;
719	}	754	}
720		755
		756	static inline int __must_check clk_bulk_get_optional(struct device *dev,
		757	int num_clks, struct clk_bulk_data *clks)
		758	{
		759	return 0;
		760	}
		761
721	static inline int __must_check clk_bulk_get_all(struct device *dev,	762	static inline int __must_check clk_bulk_get_all(struct device *dev,
722	struct clk_bulk_data **clks)	763	struct clk_bulk_data **clks)
723	{	764	{
@@ -741,6 +782,12 @@ static inline int __must_check devm_clk_bulk_get(struct device *dev, int num_clk · 17 unmodified lines
741	return 0;	782	return 0;
742	}	783	}
743		784
		785	static inline int __must_check devm_clk_bulk_get_optional(struct device *dev,
		786	int num_clks, struct clk_bulk_data *clks)
		787	{
		788	return 0;
		789	}
		790
744	static inline int __must_check devm_clk_bulk_get_all(struct device *dev,	791	static inline int __must_check devm_clk_bulk_get_all(struct device *dev,
745	struct clk_bulk_data **clks)	792	struct clk_bulk_data **clks)
746	{	793	{

Merge branches 'clk-bulk-optional', 'clk-kirkwood', 'clk-socfpga' and 'clk-docs' into clk-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code