From d46c22b3fdb58623f1bf372d028313a5d3e7b79b Mon Sep 17 00:00:00 2001
From: Patrick Delaunay <patrick.delaunay@st.com>
Date: Mon, 4 Feb 2019 11:26:16 +0100
Subject: [PATCH] power: stpmu1: rename files to stpmic1

Prepare file modification for kernel alignment and
rename driver to stpmic1.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
 arch/arm/dts/stm32mp157c-ed1.dts                      | 2 +-
 board/st/stm32mp1/board.c                             | 2 +-
 board/st/stm32mp1/spl.c                               | 2 +-
 drivers/power/pmic/Makefile                           | 2 +-
 drivers/power/pmic/{stpmu1.c => stpmic1.c}            | 2 +-
 drivers/power/regulator/Makefile                      | 2 +-
 drivers/power/regulator/{stpmu1.c => stpmic1.c}       | 2 +-
 include/dt-bindings/mfd/{st,stpmu1.h => st,stpmic1.h} | 0
 include/power/{stpmu1.h => stpmic1.h}                 | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename drivers/power/pmic/{stpmu1.c => stpmic1.c} (98%)
 rename drivers/power/regulator/{stpmu1.c => stpmic1.c} (99%)
 rename include/dt-bindings/mfd/{st,stpmu1.h => st,stpmic1.h} (100%)
 rename include/power/{stpmu1.h => stpmic1.h} (100%)

diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts
index 7a9b742d36..ddee286ab1 100644
--- a/arch/arm/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/dts/stm32mp157c-ed1.dts
@@ -8,7 +8,7 @@
 #include "stm32mp157c.dtsi"
 #include "stm32mp157-pinctrl.dtsi"
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/mfd/st,stpmu1.h>
+#include <dt-bindings/mfd/st,stpmic1.h>
 
 / {
 	model = "STMicroelectronics STM32MP157C eval daughter";
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c
index 5f31ea99f5..1bb97792c9 100644
--- a/board/st/stm32mp1/board.c
+++ b/board/st/stm32mp1/board.c
@@ -8,7 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
 #include <power/pmic.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
 void board_debug_uart_init(void)
diff --git a/board/st/stm32mp1/spl.c b/board/st/stm32mp1/spl.c
index f3db0d6385..1202297d2e 100644
--- a/board/st/stm32mp1/spl.c
+++ b/board/st/stm32mp1/spl.c
@@ -11,7 +11,7 @@
 #include <asm/io.h>
 #include <post.h>
 #include <power/pmic.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 #include <asm/arch/ddr.h>
 
 void spl_board_init(void)
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 637352ab2b..147ac76366 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_DM_PMIC_TPS65910) += pmic_tps65910_dm.o
 obj-$(CONFIG_$(SPL_)PMIC_PALMAS) += palmas.o
 obj-$(CONFIG_$(SPL_)PMIC_LP873X) += lp873x.o
 obj-$(CONFIG_$(SPL_)PMIC_LP87565) += lp87565.o
-obj-$(CONFIG_PMIC_STPMU1) += stpmu1.o
+obj-$(CONFIG_PMIC_STPMU1) += stpmic1.o
 
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MAX77696) += pmic_max77696.o
diff --git a/drivers/power/pmic/stpmu1.c b/drivers/power/pmic/stpmic1.c
similarity index 98%
rename from drivers/power/pmic/stpmu1.c
rename to drivers/power/pmic/stpmic1.c
index 47af012332..157ce8bfb6 100644
--- a/drivers/power/pmic/stpmu1.c
+++ b/drivers/power/pmic/stpmic1.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <power/pmic.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 
 #define STMPU1_NUM_OF_REGS 0x100
 
diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile
index f617ce723a..cfc91e83a1 100644
--- a/drivers/power/regulator/Makefile
+++ b/drivers/power/regulator/Makefile
@@ -24,4 +24,4 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP873X) += lp873x_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP87565) += lp87565_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o
 obj-$(CONFIG_DM_REGULATOR_TPS65910) += tps65910_regulator.o
-obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMU1) += stpmu1.o
+obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMU1) += stpmic1.o
diff --git a/drivers/power/regulator/stpmu1.c b/drivers/power/regulator/stpmic1.c
similarity index 99%
rename from drivers/power/regulator/stpmu1.c
rename to drivers/power/regulator/stpmic1.c
index 2e64051ac0..c62a19a68a 100644
--- a/drivers/power/regulator/stpmu1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 
 struct stpmu1_range {
 	int min_uv;
diff --git a/include/dt-bindings/mfd/st,stpmu1.h b/include/dt-bindings/mfd/st,stpmic1.h
similarity index 100%
rename from include/dt-bindings/mfd/st,stpmu1.h
rename to include/dt-bindings/mfd/st,stpmic1.h
diff --git a/include/power/stpmu1.h b/include/power/stpmic1.h
similarity index 100%
rename from include/power/stpmu1.h
rename to include/power/stpmic1.h
-- 
2.25.1