summaryrefslogtreecommitdiffstats
path: root/configs/kylin-rk3036_defconfig
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2016-05-12 12:03:35 -0600
committerSimon Glass <sjg@chromium.org>2016-05-26 20:48:31 -0600
commit11636258981a083957c19f3979796fde5e7e8080 (patch)
tree5410060bbc3291d6f3cc8d456a39b1462dd2626b /configs/kylin-rk3036_defconfig
parent6f82fac2f278173f5afe5b4b5dbc269646d11c0b (diff)
downloadtalos-obmc-uboot-11636258981a083957c19f3979796fde5e7e8080.tar.gz
talos-obmc-uboot-11636258981a083957c19f3979796fde5e7e8080.zip
Rename reset to sysreset
The current reset API implements a method to reset the entire system. In the near future, I'd like to introduce code that implements the device tree reset bindings; i.e. the equivalent of the Linux kernel's reset API. This controls resets to individual HW blocks or external chips with reset signals. It doesn't make sense to merge the two APIs into one since they have different semantic purposes. Resolve the naming conflict by renaming the existing reset API to sysreset instead, so the new reset API can be called just reset. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'configs/kylin-rk3036_defconfig')
-rw-r--r--configs/kylin-rk3036_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 50fbe654bf..0ff6c6b9a4 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -28,7 +28,7 @@ CONFIG_CLK=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_LED=y
-CONFIG_RESET=y
+CONFIG_SYSRESET=y
CONFIG_DM_MMC=y
CONFIG_ROCKCHIP_DWMMC=y
CONFIG_PINCTRL=y
OpenPOWER on IntegriCloud