UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware: raspberrypi: Introduce rpi_firmware_find_node() 

A significant number of RaspberryPi drivers using the firmware don't
have a phandle to it, so end up scanning the device tree to find a node
with the firmware compatible.

That code is duplicated everywhere, so let's introduce a helper instead.

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220815-rpi-fix-4k-60-v5-1-fe9e7ac8b111@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
This commit is contained in:
Maxime Ripard 2022-10-27 14:52:41 +02:00
parent 3e4a21a29d
commit bc63897bc3
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/firmware/raspberrypi.c
View File

@ -311,6 +311,18 @@ static int rpi_firmware_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id rpi_firmware_of_match[] = {
{ .compatible = "raspberrypi,bcm2835-firmware", },
{},
};
MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);
struct device_node *rpi_firmware_find_node(void)
{
return of_find_matching_node(NULL, rpi_firmware_of_match);
}
EXPORT_SYMBOL_GPL(rpi_firmware_find_node);
/** /**
* rpi_firmware_get - Get pointer to rpi_firmware structure. * rpi_firmware_get - Get pointer to rpi_firmware structure.
* @firmware_node: Pointer to the firmware Device Tree node. * @firmware_node: Pointer to the firmware Device Tree node.
@ -366,12 +378,6 @@ struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
} }
EXPORT_SYMBOL_GPL(devm_rpi_firmware_get); EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);
static const struct of_device_id rpi_firmware_of_match[] = {
{ .compatible = "raspberrypi,bcm2835-firmware", },
{},
};
MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);
static struct platform_driver rpi_firmware_driver = { static struct platform_driver rpi_firmware_driver = {
.driver = { .driver = {
.name = "raspberrypi-firmware", .name = "raspberrypi-firmware",

7
include/soc/bcm2835/raspberrypi-firmware.h
View File

@ -142,6 +142,7 @@ int rpi_firmware_property(struct rpi_firmware *fw,
int rpi_firmware_property_list(struct rpi_firmware *fw, int rpi_firmware_property_list(struct rpi_firmware *fw,
void *data, size_t tag_size); void *data, size_t tag_size);
void rpi_firmware_put(struct rpi_firmware *fw); void rpi_firmware_put(struct rpi_firmware *fw);
struct device_node *rpi_firmware_find_node(void);
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node); struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
struct rpi_firmware *devm_rpi_firmware_get(struct device *dev, struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
struct device_node *firmware_node); struct device_node *firmware_node);
@ -159,6 +160,12 @@ static inline int rpi_firmware_property_list(struct rpi_firmware *fw,
} }
static inline void rpi_firmware_put(struct rpi_firmware *fw) { } static inline void rpi_firmware_put(struct rpi_firmware *fw) { }
static inline struct device_node *rpi_firmware_find_node(void)
{
return NULL;
}
static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
{ {
return NULL; return NULL;