On 12 May 2016 at 12:03, Stephen Warren swarren@wwwdotorg.org wrote:
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
arch/arm/lib/Makefile | 2 +- arch/arm/mach-rockchip/rk3036/reset_rk3036.c | 20 +++--- arch/arm/mach-rockchip/rk3288/reset_rk3288.c | 20 +++--- arch/arm/mach-snapdragon/reset.c | 18 ++--- arch/sandbox/cpu/state.c | 4 +- arch/sandbox/include/asm/state.h | 6 +- configs/chromebook_jerry_defconfig | 2 +- configs/dragonboard410c_defconfig | 2 +- configs/evb-rk3036_defconfig | 2 +- configs/firefly-rk3288_defconfig | 2 +- configs/kylin-rk3036_defconfig | 2 +- configs/rock2_defconfig | 2 +- configs/sandbox_defconfig | 2 +- drivers/clk/clk_rk3036.c | 2 +- drivers/clk/clk_rk3288.c | 2 +- drivers/misc/Kconfig | 10 +-- drivers/misc/Makefile | 4 +- drivers/misc/{reset-uclass.c => sysreset-uclass.c} | 32 ++++----- .../misc/{reset_sandbox.c => sysreset_sandbox.c} | 61 +++++++++-------- include/dm/uclass-id.h | 2 +- include/{reset.h => sysreset.h} | 42 ++++++------ test/dm/Makefile | 2 +- test/dm/{reset.c => sysreset.c} | 80 +++++++++++----------- 23 files changed, 161 insertions(+), 160 deletions(-) rename drivers/misc/{reset-uclass.c => sysreset-uclass.c} (55%) rename drivers/misc/{reset_sandbox.c => sysreset_sandbox.c} (46%) rename include/{reset.h => sysreset.h} (47%) rename test/dm/{reset.c => sysreset.c} (16%)
Acked-by: Simon Glass sjg@chromium.org