Merge branch 'fixes-v5.14' into fixes

diff --combined drivers/bus/ti-sysc.c
index 188cdb0a394ef41fac1e2c248f0ff32e05f97bf5,2587ed43ee8af39c13e54cc1a30d2c0f69bda427..0ef98e3ba3410bc595dae526afd835d088e33d1d
--- 1/drivers/bus/ti-sysc.c
--- 2/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@@ -100,7 -100,6 +100,7 @@@ static const char * const clock_names[S
   * @cookie: data used by legacy platform callbacks
   * @name: name if available
   * @revision: interconnect target module revision
 + * @reserved: target module is reserved and already in use
   * @enabled: sysc runtime enabled status
   * @needs_resume: runtime resume needed on resume from suspend
   * @child_needs_resume: runtime resume needed for child on resume from suspend
@@@ -131,7 -130,6 +131,7 @@@ struct sysc 
        struct ti_sysc_cookie cookie;
        const char *name;
        u32 revision;
 +      unsigned int reserved:1;
        unsigned int enabled:1;
        unsigned int needs_resume:1;
        unsigned int child_needs_resume:1;
@@@ -2953,6 -2951,8 +2953,8 @@@ static int sysc_init_soc(struct sysc *d
                case SOC_3430 ... SOC_3630:
                        sysc_add_disabled(0x48304000);  /* timer12 */
                        break;
+               case SOC_AM3:
+                       sysc_add_disabled(0x48310000);  /* rng */
                default:
                        break;
                }
@@@ -3095,8 -3095,8 +3097,8 @@@ static int sysc_probe(struct platform_d
                return error;
  
        error = sysc_check_active_timer(ddata);
 -      if (error)
 -              return error;
 +      if (error == -EBUSY)
 +              ddata->reserved = true;
  
        error = sysc_get_clocks(ddata);
        if (error)
@@@ -3132,15 -3132,11 +3134,15 @@@
        sysc_show_registers(ddata);
  
        ddata->dev->type = &sysc_device_type;
 -      error = of_platform_populate(ddata->dev->of_node, sysc_match_table,
 -                                   pdata ? pdata->auxdata : NULL,
 -                                   ddata->dev);
 -      if (error)
 -              goto err;
 +
 +      if (!ddata->reserved) {
 +              error = of_platform_populate(ddata->dev->of_node,
 +                                           sysc_match_table,
 +                                           pdata ? pdata->auxdata : NULL,
 +                                           ddata->dev);
 +              if (error)
 +                      goto err;
 +      }
  
        INIT_DELAYED_WORK(&ddata->idle_work, ti_sysc_idle);