Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Mon, 27 Jul 2020 15:15:37 +0000 (11:15 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 27 Jul 2020 15:15:37 +0000 (11:15 -0400)
binman support for FIT
new UCLASS_SOC
patman switch 'test' command
minor fdt fixes
patman usability improvements

1  2 
configs/sandbox64_defconfig
configs/sandbox_defconfig
configs/sandbox_flattree_defconfig
configs/sandbox_spl_defconfig
drivers/pinctrl/renesas/pfc.c

@@@ -30,7 -30,6 +30,7 @@@ CONFIG_CMD_GREPENV=
  CONFIG_CMD_ENV_CALLBACK=y
  CONFIG_CMD_ENV_FLAGS=y
  CONFIG_CMD_NVEDIT_EFI=y
 +CONFIG_CMD_NVEDIT_INFO=y
  CONFIG_LOOPW=y
  CONFIG_CMD_MD5SUM=y
  CONFIG_CMD_MEMINFO=y
@@@ -119,6 -118,7 +119,7 @@@ CONFIG_LED_GPIO=
  CONFIG_DM_MAILBOX=y
  CONFIG_SANDBOX_MBOX=y
  CONFIG_MISC=y
+ CONFIG_SOC_DEVICE=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_LPC=y
@@@ -34,7 -34,6 +34,7 @@@ CONFIG_CMD_GREPENV=
  CONFIG_CMD_ENV_CALLBACK=y
  CONFIG_CMD_ENV_FLAGS=y
  CONFIG_CMD_NVEDIT_EFI=y
 +CONFIG_CMD_NVEDIT_INFO=y
  CONFIG_LOOPW=y
  CONFIG_CMD_MD5SUM=y
  CONFIG_CMD_MEMINFO=y
@@@ -140,6 -139,7 +140,7 @@@ CONFIG_LED_GPIO=
  CONFIG_DM_MAILBOX=y
  CONFIG_SANDBOX_MBOX=y
  CONFIG_MISC=y
+ CONFIG_SOC_DEVICE=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_LPC=y
@@@ -24,7 -24,6 +24,7 @@@ CONFIG_CMD_BOOTEFI_HELLO=
  # CONFIG_CMD_ELF is not set
  CONFIG_CMD_ASKENV=y
  CONFIG_CMD_GREPENV=y
 +CONFIG_CMD_NVEDIT_INFO=y
  CONFIG_LOOPW=y
  CONFIG_CMD_MD5SUM=y
  CONFIG_CMD_MEMINFO=y
@@@ -104,6 -103,7 +104,7 @@@ CONFIG_LED_GPIO=
  CONFIG_DM_MAILBOX=y
  CONFIG_SANDBOX_MBOX=y
  CONFIG_MISC=y
+ CONFIG_SOC_DEVICE=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_LPC=y
@@@ -34,7 -34,6 +34,7 @@@ CONFIG_CMD_ASKENV=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_ENV_CALLBACK=y
  CONFIG_CMD_ENV_FLAGS=y
 +CONFIG_CMD_NVEDIT_INFO=y
  CONFIG_LOOPW=y
  CONFIG_CMD_MD5SUM=y
  CONFIG_CMD_MEMINFO=y
@@@ -121,6 -120,7 +121,7 @@@ CONFIG_LED_GPIO=
  CONFIG_DM_MAILBOX=y
  CONFIG_SANDBOX_MBOX=y
  CONFIG_MISC=y
+ CONFIG_SOC_DEVICE=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_LPC=y
@@@ -32,7 -32,6 +32,7 @@@ enum sh_pfc_model 
        SH_PFC_R8A7794,
        SH_PFC_R8A7795,
        SH_PFC_R8A7796,
 +      SH_PFC_R8A774A1,
        SH_PFC_R8A77965,
        SH_PFC_R8A77970,
        SH_PFC_R8A77980,
@@@ -818,7 -817,7 +818,7 @@@ static int sh_pfc_pinctrl_probe(struct 
        enum sh_pfc_model model = dev_get_driver_data(dev);
        fdt_addr_t base;
  
-       base = devfdt_get_addr(dev);
+       base = dev_read_addr(dev);
        if (base == FDT_ADDR_T_NONE)
                return -EINVAL;
  
        if (model == SH_PFC_R8A7796)
                priv->pfc.info = &r8a7796_pinmux_info;
  #endif
 +#ifdef CONFIG_PINCTRL_PFC_R8A774A1
 +      if (model == SH_PFC_R8A774A1)
 +              priv->pfc.info = &r8a774a1_pinmux_info;
 +#endif
  #ifdef CONFIG_PINCTRL_PFC_R8A77965
        if (model == SH_PFC_R8A77965)
                priv->pfc.info = &r8a77965_pinmux_info;
@@@ -929,12 -924,6 +929,12 @@@ static const struct udevice_id sh_pfc_p
                .data = SH_PFC_R8A7796,
        },
  #endif
 +#ifdef CONFIG_PINCTRL_PFC_R8A774A1
 +      {
 +              .compatible = "renesas,pfc-r8a774a1",
 +              .data = SH_PFC_R8A774A1,
 +      },
 +#endif
  #ifdef CONFIG_PINCTRL_PFC_R8A77965
        {
                .compatible = "renesas,pfc-r8a77965",