From: Tom Rini <trini@konsulko.com>
Date: Mon, 27 Jul 2020 15:15:37 +0000 (-0400)
Subject: Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u... 
X-Git-Tag: v2020.10~98
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

binman support for FIT
new UCLASS_SOC
patman switch 'test' command
minor fdt fixes
patman usability improvements
---

4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514
diff --combined configs/sandbox64_defconfig
index 45edd3b,a3b7ff4..5794d1d
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@@ -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
diff --combined configs/sandbox_defconfig
index 9f3ac90,17c9b33..4110497
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@@ -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
diff --combined configs/sandbox_flattree_defconfig
index efdacef,93ab210..bea27f6
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@@ -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
diff --combined configs/sandbox_spl_defconfig
index c2f8732,25c974f..ffb6a6f
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@@ -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
diff --combined drivers/pinctrl/renesas/pfc.c
index 7ba7849,340c8c0..7183b11
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@@ -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;
  
@@@ -854,10 -853,6 +854,10 @@@
  	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",