diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 13:06:26 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 13:06:26 +0300 |
| commit | f1c047c2f7dd9337441f6711733bb79ac4d7d2e7 (patch) | |
| tree | cc349e74e88ef38fbf5b38d48e9b0859b64853d7 /drivers/soc | |
| parent | 800b432012d47dafb5606b5267a45d554ae5d1a3 (diff) | |
| parent | f2ed165619c16577c02b703a114a1f6b52026df4 (diff) | |
| download | linux-f1c047c2f7dd9337441f6711733bb79ac4d7d2e7.tar.xz | |
Merge tag 'amlogic-drivers-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers
Amlogic drivers changes for v6.6:
- Add C3 Power Domains
- Explicitly include correct DT includes in Amlogic SoC drivers
- fix to avoid potential NULL pointer dereference in meson_sm
- Merge of genpd-v6.5-rc1-1 to move genpd amlogic drivers
* tag 'amlogic-drivers-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
firmware: meson_sm: fix to avoid potential NULL pointer dereference
soc: amlogic: Explicitly include correct DT includes
soc: c3: Add support for power domains controller
dt-bindings: power: add Amlogic C3 power domains
soc: amlogic: use name instead of index as criterion
Link: https://lore.kernel.org/r/77e328b5-0d47-36e8-f62d-c745df06fb87@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/amlogic/meson-canvas.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c index 383b0cfc584e..b6e06c4d2117 100644 --- a/drivers/soc/amlogic/meson-canvas.c +++ b/drivers/soc/amlogic/meson-canvas.c @@ -8,6 +8,7 @@ #include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/soc/amlogic/meson-canvas.h> #include <linux/of_address.h> |