summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2023-03-17 13:37:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-29 12:21:23 +0200
commit67ca1b9346fe255cfe503b967407fd24ec76da37 (patch)
treea89bba51dbbaa6ea7efb9181196fdd431509fa0e
parent3f84aa5ec052dba960baca4ab8a352d43d47028e (diff)
downloadlinux-stable-67ca1b9346fe255cfe503b967407fd24ec76da37.tar.gz
linux-stable-67ca1b9346fe255cfe503b967407fd24ec76da37.tar.bz2
linux-stable-67ca1b9346fe255cfe503b967407fd24ec76da37.zip
soc: amlogic: meson-gx-socinfo: use new soc_device_register functionality to populate machine name
A new fallback mechanism has been added to soc_device_register that populates machine with the DT model information if machine isn't set yet. This allows to remove this code here. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/ac3b4356-d4c3-25e4-9bc2-c5b369c676b2@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/soc/amlogic/meson-gx-socinfo.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index 165f7548401b..6abb730344ab 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -174,11 +174,6 @@ static int __init meson_gx_socinfo_init(void)
return -ENODEV;
soc_dev_attr->family = "Amlogic Meson";
-
- np = of_find_node_by_path("/");
- of_property_read_string(np, "model", &soc_dev_attr->machine);
- of_node_put(np);
-
soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x:%x - %x:%x",
socinfo_to_major(socinfo),
socinfo_to_minor(socinfo),