sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'amlogic-drivers-for-v6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers-late

Browse Source 
Amlogic Drivers for v6.19:
- Canvas device leak fix and error handling simplification
- Add more SoCs definitions
- Suport more SoCs for meson-gx-ao-secure

* tag 'amlogic-drivers-for-v6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: amlogic: meson-gx-socinfo: add new SoCs id
  dt-bindings: arm: amlogic: meson-gx-ao-secure: support more SoCs
  soc: amlogic: canvas: simplify lookup error handling
  soc: amlogic: canvas: fix device leak on lookup

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-11-27 22:57:07 +01:00
parent 3d892259d1 ba8abbdfd0
commit e9191aa446
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
View File

@@ -34,6 +34,9 @@ properties:
- amlogic,a4-ao-secure - amlogic,a4-ao-secure
- amlogic,c3-ao-secure - amlogic,c3-ao-secure
- amlogic,s4-ao-secure - amlogic,s4-ao-secure
- amlogic,s6-ao-secure
- amlogic,s7-ao-secure
- amlogic,s7d-ao-secure
- amlogic,t7-ao-secure - amlogic,t7-ao-secure
- const: amlogic,meson-gx-ao-secure - const: amlogic,meson-gx-ao-secure
- const: syscon - const: syscon

12
drivers/soc/amlogic/meson-canvas.c
View File

@@ -60,12 +60,9 @@ struct meson_canvas *meson_canvas_get(struct device *dev)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
canvas_pdev = of_find_device_by_node(canvas_node); canvas_pdev = of_find_device_by_node(canvas_node);
if (!canvas_pdev) {
of_node_put(canvas_node);
return ERR_PTR(-EPROBE_DEFER);
}
of_node_put(canvas_node); of_node_put(canvas_node);
if (!canvas_pdev)
return ERR_PTR(-EPROBE_DEFER);
/* /*
* If priv is NULL, it's probably because the canvas hasn't * If priv is NULL, it's probably because the canvas hasn't
@@ -73,10 +70,9 @@ struct meson_canvas *meson_canvas_get(struct device *dev)
* current state, this driver probe cannot return -EPROBE_DEFER * current state, this driver probe cannot return -EPROBE_DEFER
*/ */
canvas = dev_get_drvdata(&canvas_pdev->dev); canvas = dev_get_drvdata(&canvas_pdev->dev);
if (!canvas) { put_device(&canvas_pdev->dev);
put_device(&canvas_pdev->dev); if (!canvas)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
}
return canvas; return canvas;
} }

6
drivers/soc/amlogic/meson-gx-socinfo.c
View File

@@ -46,6 +46,9 @@ static const struct meson_gx_soc_id {
{ "A5", 0x3c }, { "A5", 0x3c },
{ "C3", 0x3d }, { "C3", 0x3d },
{ "A4", 0x40 }, { "A4", 0x40 },
{ "S7", 0x46 },
{ "S7D", 0x47 },
{ "S6", 0x48 },
}; };
static const struct meson_gx_package_id { static const struct meson_gx_package_id {
@@ -86,6 +89,9 @@ static const struct meson_gx_package_id {
{ "A311D2", 0x36, 0x1, 0xf }, { "A311D2", 0x36, 0x1, 0xf },
{ "A113X2", 0x3c, 0x1, 0xf }, { "A113X2", 0x3c, 0x1, 0xf },
{ "A113L2", 0x40, 0x1, 0xf }, { "A113L2", 0x40, 0x1, 0xf },
{ "S805X3", 0x46, 0x3, 0xf },
{ "S905X5M", 0x47, 0x1, 0xf },
{ "S905X5", 0x48, 0x1, 0xf },
}; };
static inline unsigned int socinfo_to_major(u32 socinfo) static inline unsigned int socinfo_to_major(u32 socinfo)