提交 c7d0a032 编写于 作者: A Arnd Bergmann

Merge tag 'arm-soc/for-4.17/drivers-fixes' of https://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom SoCs drivers fixes, please pull the
following:

- Geert makes the Raspberry Pi firmwware return -ENOSYS (similar to
  other subsystems) when CONFIG_RASPBERRYPI_FIRMWARE is off.

- Florian fixes an incorrect annotation in the Raspberry Pi power domain
  driver, spotted by sparse

* tag 'arm-soc/for-4.17/drivers-fixes' of https://github.com/Broadcom/stblinux:
  soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure
  soc: bcm: raspberrypi-power: Fix use of __packed
...@@ -45,7 +45,7 @@ struct rpi_power_domains { ...@@ -45,7 +45,7 @@ struct rpi_power_domains {
struct rpi_power_domain_packet { struct rpi_power_domain_packet {
u32 domain; u32 domain;
u32 on; u32 on;
} __packet; };
/* /*
* Asks the firmware to enable or disable power on a specific power * Asks the firmware to enable or disable power on a specific power
......
...@@ -143,13 +143,13 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node); ...@@ -143,13 +143,13 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
void *data, size_t len) void *data, size_t len)
{ {
return 0; return -ENOSYS;
} }
static inline int rpi_firmware_property_list(struct rpi_firmware *fw, static inline int rpi_firmware_property_list(struct rpi_firmware *fw,
void *data, size_t tag_size) void *data, size_t tag_size)
{ {
return 0; return -ENOSYS;
} }
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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册