clk: Provide new devm_clk helpers for prepared and enabled clocks (31026805) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/clk/clk-devres.c

+27 −0

Original line number	Diff line number	Diff line
		@@ -66,12 +66,39 @@ struct clk devm_clk_get(struct device dev, const char *id)
		}
		EXPORT_SYMBOL(devm_clk_get);

		struct clk devm_clk_get_prepared(struct device dev, const char *id)
		{
		return __devm_clk_get(dev, id, clk_get, clk_prepare, clk_unprepare);
		}
		EXPORT_SYMBOL_GPL(devm_clk_get_prepared);

		struct clk devm_clk_get_enabled(struct device dev, const char *id)
		{
		return __devm_clk_get(dev, id, clk_get,
		clk_prepare_enable, clk_disable_unprepare);
		}
		EXPORT_SYMBOL_GPL(devm_clk_get_enabled);

		struct clk devm_clk_get_optional(struct device dev, const char *id)
		{
		return __devm_clk_get(dev, id, clk_get_optional, NULL, NULL);
		}
		EXPORT_SYMBOL(devm_clk_get_optional);

		struct clk devm_clk_get_optional_prepared(struct device dev, const char *id)
		{
		return __devm_clk_get(dev, id, clk_get_optional,
		clk_prepare, clk_unprepare);
		}
		EXPORT_SYMBOL_GPL(devm_clk_get_optional_prepared);

		struct clk devm_clk_get_optional_enabled(struct device dev, const char *id)
		{
		return __devm_clk_get(dev, id, clk_get_optional,
		clk_prepare_enable, clk_disable_unprepare);
		}
		EXPORT_SYMBOL_GPL(devm_clk_get_optional_enabled);

		struct clk_bulk_devres {
		struct clk_bulk_data *clks;
		int num_clks;

include/linux/clk.h

+109 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,47 @@ int __must_check devm_clk_bulk_get_all(struct device *dev,
		*/
		struct clk devm_clk_get(struct device dev, const char *id);

		/**
		* devm_clk_get_prepared - devm_clk_get() + clk_prepare()
		* @dev: device for clock "consumer"
		* @id: clock consumer ID
		*
		* Context: May sleep.
		*
		* Return: a struct clk corresponding to the clock producer, or
		* valid IS_ERR() condition containing errno. The implementation
		* uses @dev and @id to determine the clock consumer, and thereby
		* the clock producer. (IOW, @id may be identical strings, but
		* clk_get may return different clock producers depending on @dev.)
		*
		* The returned clk (if valid) is prepared. Drivers must however assume
		* that the clock is not enabled.
		*
		* The clock will automatically be unprepared and freed when the device
		* is unbound from the bus.
		*/
		struct clk devm_clk_get_prepared(struct device dev, const char *id);

		/**
		* devm_clk_get_enabled - devm_clk_get() + clk_prepare_enable()
		* @dev: device for clock "consumer"
		* @id: clock consumer ID
		*
		* Context: May sleep.
		*
		* Return: a struct clk corresponding to the clock producer, or
		* valid IS_ERR() condition containing errno. The implementation
		* uses @dev and @id to determine the clock consumer, and thereby
		* the clock producer. (IOW, @id may be identical strings, but
		* clk_get may return different clock producers depending on @dev.)
		*
		* The returned clk (if valid) is prepared and enabled.
		*
		* The clock will automatically be disabled, unprepared and freed
		* when the device is unbound from the bus.
		*/
		struct clk devm_clk_get_enabled(struct device dev, const char *id);

		/**
		* devm_clk_get_optional - lookup and obtain a managed reference to an optional
		* clock producer.
		@@ -429,6 +470,50 @@ struct clk devm_clk_get(struct device dev, const char *id);
		*/
		struct clk devm_clk_get_optional(struct device dev, const char *id);

		/**
		* devm_clk_get_optional_prepared - devm_clk_get_optional() + clk_prepare()
		* @dev: device for clock "consumer"
		* @id: clock consumer ID
		*
		* Context: May sleep.
		*
		* Return: a struct clk corresponding to the clock producer, or
		* valid IS_ERR() condition containing errno. The implementation
		* uses @dev and @id to determine the clock consumer, and thereby
		* the clock producer. If no such clk is found, it returns NULL
		* which serves as a dummy clk. That's the only difference compared
		* to devm_clk_get_prepared().
		*
		* The returned clk (if valid) is prepared. Drivers must however
		* assume that the clock is not enabled.
		*
		* The clock will automatically be unprepared and freed when the
		* device is unbound from the bus.
		*/
		struct clk devm_clk_get_optional_prepared(struct device dev, const char *id);

		/**
		* devm_clk_get_optional_enabled - devm_clk_get_optional() +
		* clk_prepare_enable()
		* @dev: device for clock "consumer"
		* @id: clock consumer ID
		*
		* Context: May sleep.
		*
		* Return: a struct clk corresponding to the clock producer, or
		* valid IS_ERR() condition containing errno. The implementation
		* uses @dev and @id to determine the clock consumer, and thereby
		* the clock producer. If no such clk is found, it returns NULL
		* which serves as a dummy clk. That's the only difference compared
		* to devm_clk_get_enabled().
		*
		* The returned clk (if valid) is prepared and enabled.
		*
		* The clock will automatically be disabled, unprepared and freed
		* when the device is unbound from the bus.
		*/
		struct clk devm_clk_get_optional_enabled(struct device dev, const char *id);

		/**
		* devm_get_clk_from_child - lookup and obtain a managed reference to a
		* clock producer from child node.
		@@ -770,12 +855,36 @@ static inline struct clk devm_clk_get(struct device dev, const char *id)
		return NULL;
		}

		static inline struct clk devm_clk_get_prepared(struct device dev,
		const char *id)
		{
		return NULL;
		}

		static inline struct clk devm_clk_get_enabled(struct device dev,
		const char *id)
		{
		return NULL;
		}

		static inline struct clk devm_clk_get_optional(struct device dev,
		const char *id)
		{
		return NULL;
		}

		static inline struct clk devm_clk_get_optional_prepared(struct device dev,
		const char *id)
		{
		return NULL;
		}

		static inline struct clk devm_clk_get_optional_enabled(struct device dev,
		const char *id)
		{
		return NULL;
		}

		static inline int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
		struct clk_bulk_data *clks)
		{