Merge tag 'amlogic-drivers' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/drivers

Pull "Amlogic driver updates for v4.17" from Kevin Hilman:

- socinfo: add more IDs for newer SoC detection
- firmware: update init to use module_platform_driver_probe
- soc: mix. VPU power controller fixes

* tag 'amlogic-drivers' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  amlogic: meson-gx-socinfo: Update soc ids
  firmware: meson-sm: rework meson_sm_init to use module_platform_driver_probe
  meson-gx-socinfo: make local function meson_gx_socinfo_init static
  meson-mx-socinfo: Make local function meson_mx_socinfo_init() static
  soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when domain is powered off
  soc: amlogic: meson-gx-pwrc-vpu: don't print error message on probe deferral

3 files changed, 19 insertions, 4 deletions

diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
index 2bdeebc48901..6289965c42e9 100644
--- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
+++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
@@ -184,7 +184,8 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
 
         rstc = devm_reset_control_array_get(&pdev->dev, false, false);
         if (IS_ERR(rstc)) {
-                dev_err(&pdev->dev, "failed to get reset lines\n");
+                if (PTR_ERR(rstc) != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "failed to get reset lines\n");
                 return PTR_ERR(rstc);
         }
 
@@ -224,7 +225,11 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
 
 static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev)
 {
-        meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
+        bool powered_off;
+
+        powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd);
+        if (!powered_off)
+                meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
 }
 
 static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = {
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index f2d8c3c53ea4..37ea0a1c24c8 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -33,6 +33,10 @@ static const struct meson_gx_soc_id {
         { "GXL", 0x21 },
         { "GXM", 0x22 },
         { "TXL", 0x23 },
+        { "TXLX", 0x24 },
+        { "AXG", 0x25 },
+        { "GXLX", 0x26 },
+        { "TXHD", 0x27 },
 };
 
 static const struct meson_gx_package_id {
@@ -41,12 +45,18 @@ static const struct meson_gx_package_id {
         unsigned int pack_id;
 } soc_packages[] = {
         { "S905", 0x1f, 0 },
+        { "S905H", 0x1f, 0x13 },
         { "S905M", 0x1f, 0x20 },
         { "S905D", 0x21, 0 },
         { "S905X", 0x21, 0x80 },
+        { "S905W", 0x21, 0xa0 },
         { "S905L", 0x21, 0xc0 },
         { "S905M2", 0x21, 0xe0 },
         { "S912", 0x22, 0 },
+        { "962X", 0x24, 0x10 },
+        { "962E", 0x24, 0x20 },
+        { "A113X", 0x25, 0x37 },
+        { "A113D", 0x25, 0x22 },
 };
 
 static inline unsigned int socinfo_to_major(u32 socinfo)
@@ -97,7 +107,7 @@ static const char *socinfo_to_soc_id(u32 socinfo)
         return "Unknown";
 }
 
-int __init meson_gx_socinfo_init(void)
+static int __init meson_gx_socinfo_init(void)
 {
         struct soc_device_attribute *soc_dev_attr;
         struct soc_device *soc_dev;
diff --git a/drivers/soc/amlogic/meson-mx-socinfo.c b/drivers/soc/amlogic/meson-mx-socinfo.c
index 7bfff5ff22a2..78f0f1aeca57 100644
--- a/drivers/soc/amlogic/meson-mx-socinfo.c
+++ b/drivers/soc/amlogic/meson-mx-socinfo.c
@@ -104,7 +104,7 @@ static const struct of_device_id meson_mx_socinfo_analog_top_ids[] = {
         { /* sentinel */ }
 };
 
-int __init meson_mx_socinfo_init(void)
+static int __init meson_mx_socinfo_init(void)
 {
         struct soc_device_attribute *soc_dev_attr;
         struct soc_device *soc_dev;