Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1237cd34 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: of_get_coresight_platform_data needs both OF and CORESIGHT"

parents 20135203 05a2bf76

include/linux/coresight.h

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static inline void coresight_disable_reg_clk(struct coresight_device *csdev) {} 
static inline void coresight_enable_reg_clk(struct coresight_device *csdev) {}

#endif



#ifdef CONFIG_OF

#if defined(CONFIG_OF) && defined(CONFIG_CORESIGHT)

extern int of_coresight_get_cpu(const struct device_node *node);

extern struct coresight_platform_data *

of_get_coresight_platform_data(struct device *dev,
@@ -304,7 +304,7 @@ static inline int of_coresight_get_cpu(const struct device_node *node) 
{ return 0; }

static inline struct coresight_platform_data *of_get_coresight_platform_data(

	struct device *dev, const struct device_node *node) { return NULL; }

static inlint struct coresight_cti_data *of_get_coresight_cti_data(

static inline struct coresight_cti_data *of_get_coresight_cti_data(

		struct device *dev, struct device_node *node) { return NULL; }

static inline int of_get_coresight_csr_name(struct device_node *node,

		const char **csr_name){ return -EINVAL; }