Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk
authorTom Rini <trini@konsulko.com>
Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 2 Aug 2019 17:29:46 +0000 (13:29 -0400)
- Port more CCF code to work with i.MX8 devices.

1  2 
configs/sandbox_defconfig
configs/sandbox_flattree_defconfig

index aa09c4571a76bf62a3c70b2de643a3b5d61f42d3,7ff7122fb6be79171c48488ca959f35448889c1f..7355e3aa1ef0cadaf605414671006dfa1addaf9c
@@@ -93,6 -93,7 +93,7 @@@ CONFIG_BOOTCOUNT_LIMIT=
  CONFIG_DM_BOOTCOUNT=y
  CONFIG_DM_BOOTCOUNT_RTC=y
  CONFIG_CLK=y
+ CONFIG_CLK_COMPOSITE_CCF=y
  CONFIG_SANDBOX_CLK_CCF=y
  CONFIG_CPU=y
  CONFIG_DM_DEMO=y
@@@ -107,6 -108,7 +108,6 @@@ CONFIG_PM8916_GPIO=
  CONFIG_SANDBOX_GPIO=y
  CONFIG_DM_HWSPINLOCK=y
  CONFIG_HWSPINLOCK_SANDBOX=y
 -CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_I2C_CROS_EC_LDO=y
  CONFIG_DM_I2C_GPIO=y
index a70793b7ade67679ff4cdb19434ee9c0666fbb75,610457e0aa44d2b0004128a2704518a5e7e35636..898815fe531cc637215ddf5151309c6fda4dcb1b
@@@ -66,6 -66,7 +66,7 @@@ CONFIG_DEBUG_DEVRES=
  CONFIG_ADC=y
  CONFIG_ADC_SANDBOX=y
  CONFIG_CLK=y
+ CONFIG_CLK_COMPOSITE_CCF=y
  CONFIG_SANDBOX_CLK_CCF=y
  CONFIG_CPU=y
  CONFIG_DM_DEMO=y
@@@ -75,6 -76,7 +76,6 @@@ CONFIG_BOARD=
  CONFIG_BOARD_SANDBOX=y
  CONFIG_PM8916_GPIO=y
  CONFIG_SANDBOX_GPIO=y
 -CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_I2C_CROS_EC_LDO=y
  CONFIG_DM_I2C_GPIO=y