ARM: STi: DT: Move reset controller constants into common location

By popular vote, the DT binding includes for reset controllers are located
in include/dt-bindings/reset/. Move the STi reset constants in there, too,
to avoid confusion.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Patrice Chotard <patrice.chotard@st.com>

diff --git a/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
index 54ae9f747e45175425696159a2234d5a40716c25..9ca27761f8116116cd379222c15d1503550e077f 100644 (file)
--- a/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
@@ -39,4 +39,4 @@ Example:
        };
 
 Macro definitions for the supported reset channels can be found in:
-include/dt-bindings/reset-controller/stih407-resets.h
+include/dt-bindings/reset/stih407-resets.h

diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
index 5ab26b7e9d35c9e696927fc121029f146be3523d..1cfd21d1dfa1826753be5486a7ca3f282ba500e2 100644 (file)
--- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
@@ -43,5 +43,5 @@ example:
 
 Macro definitions for the supported reset channels can be found in:
 
-include/dt-bindings/reset-controller/stih415-resets.h
-include/dt-bindings/reset-controller/stih416-resets.h
+include/dt-bindings/reset/stih415-resets.h
+include/dt-bindings/reset/stih416-resets.h

diff --git a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
index a8d3d3c25ca265fc40f4ed688c01d5901efc3638..891a2fd85ed619ca0274b1709e3093fc0713f4c2 100644 (file)
--- a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
@@ -42,5 +42,5 @@ example:
 
 Macro definitions for the supported reset channels can be found in:
 
-include/dt-bindings/reset-controller/stih415-resets.h
-include/dt-bindings/reset-controller/stih416-resets.h
+include/dt-bindings/reset/stih415-resets.h
+include/dt-bindings/reset/stih416-resets.h

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 838b812cbda10c1ec991aa0a471a7956e1fbace2..eab3477e0a0e2f32f4f8c00303c3fd96230785dc 100644 (file)
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -9,7 +9,7 @@
 #include "stih407-pinctrl.dtsi"
 #include <dt-bindings/mfd/st-lpc.h>
 #include <dt-bindings/phy/phy.h>
-#include <dt-bindings/reset-controller/stih407-resets.h>
+#include <dt-bindings/reset/stih407-resets.h>
 #include <dt-bindings/interrupt-controller/irq-st.h>
 / {
        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index 19b019b5f30e6aab57d5a793c06a2fdc834b43d3..12427e651e5e947da74b11fabbc5ef4ed93c50d8 100644 (file)
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -10,7 +10,7 @@
 #include "stih415-clock.dtsi"
 #include "stih415-pinctrl.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/reset-controller/stih415-resets.h>
+#include <dt-bindings/reset/stih415-resets.h>
 / {
 
        L2: cache-controller {

diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 9dca173e694a1c28715cdc196325c88f16c45cd0..9e3170ccd18c628f54d5896558c1646283c535da 100644 (file)
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -12,7 +12,7 @@
 
 #include <dt-bindings/phy/phy.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/reset-controller/stih416-resets.h>
+#include <dt-bindings/reset/stih416-resets.h>
 #include <dt-bindings/interrupt-controller/irq-st.h>
 / {
        L2: cache-controller {

diff --git a/drivers/reset/sti/reset-stih407.c b/drivers/reset/sti/reset-stih407.c
index d83db5d72d08c119736314cca53f9024826aa235..f7a6cb0939833c0502fbd4e22c056aeb2665d5f6 100644 (file)
--- a/drivers/reset/sti/reset-stih407.c
+++ b/drivers/reset/sti/reset-stih407.c
@@ -11,7 +11,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
-#include <dt-bindings/reset-controller/stih407-resets.h>
+#include <dt-bindings/reset/stih407-resets.h>
 #include "reset-syscfg.h"
 
 /* STiH407 Peripheral powerdown definitions. */

diff --git a/drivers/reset/sti/reset-stih415.c b/drivers/reset/sti/reset-stih415.c
index 8dad603d863c9b779d6e34c006d886c19531f1ec..f7b49d5a62dc9390e044b0f9e3f5b3d8cf955df3 100644 (file)
--- a/drivers/reset/sti/reset-stih415.c
+++ b/drivers/reset/sti/reset-stih415.c
@@ -13,7 +13,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
-#include <dt-bindings/reset-controller/stih415-resets.h>
+#include <dt-bindings/reset/stih415-resets.h>
 
 #include "reset-syscfg.h"
 

diff --git a/drivers/reset/sti/reset-stih416.c b/drivers/reset/sti/reset-stih416.c
index 79aed70a26c013b800a521e9e626e5f48df41e61..d65a82e74004eef349b40eb9d03c191b90861433 100644 (file)
--- a/drivers/reset/sti/reset-stih416.c
+++ b/drivers/reset/sti/reset-stih416.c
@@ -13,7 +13,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
-#include <dt-bindings/reset-controller/stih416-resets.h>
+#include <dt-bindings/reset/stih416-resets.h>
 
 #include "reset-syscfg.h"
 

diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
deleted file mode 100644 (file)
index 02d4328..0000000
--- a/include/dt-bindings/reset-controller/stih407-resets.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This header provides constants for the reset controller
- * based peripheral powerdown requests on the STMicroelectronics
- * STiH407 SoC.
- */
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH407
-#define _DT_BINDINGS_RESET_CONTROLLER_STIH407
-
-/* Powerdown requests control 0 */
-#define STIH407_EMISS_POWERDOWN                0
-#define STIH407_NAND_POWERDOWN         1
-
-/* Synp GMAC PowerDown */
-#define STIH407_ETH1_POWERDOWN         2
-
-/* Powerdown requests control 1 */
-#define STIH407_USB3_POWERDOWN         3
-#define STIH407_USB2_PORT1_POWERDOWN   4
-#define STIH407_USB2_PORT0_POWERDOWN   5
-#define STIH407_PCIE1_POWERDOWN                6
-#define STIH407_PCIE0_POWERDOWN                7
-#define STIH407_SATA1_POWERDOWN                8
-#define STIH407_SATA0_POWERDOWN                9
-
-/* Reset defines */
-#define STIH407_ETH1_SOFTRESET         0
-#define STIH407_MMC1_SOFTRESET         1
-#define STIH407_PICOPHY_SOFTRESET      2
-#define STIH407_IRB_SOFTRESET          3
-#define STIH407_PCIE0_SOFTRESET                4
-#define STIH407_PCIE1_SOFTRESET                5
-#define STIH407_SATA0_SOFTRESET                6
-#define STIH407_SATA1_SOFTRESET                7
-#define STIH407_MIPHY0_SOFTRESET       8
-#define STIH407_MIPHY1_SOFTRESET       9
-#define STIH407_MIPHY2_SOFTRESET       10
-#define STIH407_SATA0_PWR_SOFTRESET    11
-#define STIH407_SATA1_PWR_SOFTRESET    12
-#define STIH407_DELTA_SOFTRESET                13
-#define STIH407_BLITTER_SOFTRESET      14
-#define STIH407_HDTVOUT_SOFTRESET      15
-#define STIH407_HDQVDP_SOFTRESET       16
-#define STIH407_VDP_AUX_SOFTRESET      17
-#define STIH407_COMPO_SOFTRESET                18
-#define STIH407_HDMI_TX_PHY_SOFTRESET  19
-#define STIH407_JPEG_DEC_SOFTRESET     20
-#define STIH407_VP8_DEC_SOFTRESET      21
-#define STIH407_GPU_SOFTRESET          22
-#define STIH407_HVA_SOFTRESET          23
-#define STIH407_ERAM_HVA_SOFTRESET     24
-#define STIH407_LPM_SOFTRESET          25
-#define STIH407_KEYSCAN_SOFTRESET      26
-#define STIH407_USB2_PORT0_SOFTRESET   27
-#define STIH407_USB2_PORT1_SOFTRESET   28
-
-/* Picophy reset defines */
-#define STIH407_PICOPHY0_RESET         0
-#define STIH407_PICOPHY1_RESET         1
-#define STIH407_PICOPHY2_RESET         2
-
-#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH407 */

diff --git a/include/dt-bindings/reset-controller/stih415-resets.h b/include/dt-bindings/reset-controller/stih415-resets.h
deleted file mode 100644 (file)
index c2329fe..0000000
--- a/include/dt-bindings/reset-controller/stih415-resets.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This header provides constants for the reset controller
- * based peripheral powerdown requests on the STMicroelectronics
- * STiH415 SoC.
- */
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH415
-#define _DT_BINDINGS_RESET_CONTROLLER_STIH415
-
-#define STIH415_EMISS_POWERDOWN                0
-#define STIH415_NAND_POWERDOWN         1
-#define STIH415_KEYSCAN_POWERDOWN      2
-#define STIH415_USB0_POWERDOWN         3
-#define STIH415_USB1_POWERDOWN         4
-#define STIH415_USB2_POWERDOWN         5
-#define STIH415_SATA0_POWERDOWN                6
-#define STIH415_SATA1_POWERDOWN                7
-#define STIH415_PCIE_POWERDOWN         8
-
-#define STIH415_ETH0_SOFTRESET         0
-#define STIH415_ETH1_SOFTRESET         1
-#define STIH415_IRB_SOFTRESET          2
-#define STIH415_USB0_SOFTRESET         3
-#define STIH415_USB1_SOFTRESET         4
-#define STIH415_USB2_SOFTRESET         5
-#define STIH415_KEYSCAN_SOFTRESET      6
-
-#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH415 */

diff --git a/include/dt-bindings/reset-controller/stih416-resets.h b/include/dt-bindings/reset-controller/stih416-resets.h
deleted file mode 100644 (file)
index fcf9af1..0000000
--- a/include/dt-bindings/reset-controller/stih416-resets.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This header provides constants for the reset controller
- * based peripheral powerdown requests on the STMicroelectronics
- * STiH416 SoC.
- */
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH416
-#define _DT_BINDINGS_RESET_CONTROLLER_STIH416
-
-#define STIH416_EMISS_POWERDOWN                0
-#define STIH416_NAND_POWERDOWN         1
-#define STIH416_KEYSCAN_POWERDOWN      2
-#define STIH416_USB0_POWERDOWN         3
-#define STIH416_USB1_POWERDOWN         4
-#define STIH416_USB2_POWERDOWN         5
-#define STIH416_USB3_POWERDOWN         6
-#define STIH416_SATA0_POWERDOWN                7
-#define STIH416_SATA1_POWERDOWN                8
-#define STIH416_PCIE0_POWERDOWN                9
-#define STIH416_PCIE1_POWERDOWN                10
-
-#define STIH416_ETH0_SOFTRESET         0
-#define STIH416_ETH1_SOFTRESET         1
-#define STIH416_IRB_SOFTRESET          2
-#define STIH416_USB0_SOFTRESET         3
-#define STIH416_USB1_SOFTRESET         4
-#define STIH416_USB2_SOFTRESET         5
-#define STIH416_USB3_SOFTRESET         6
-#define STIH416_SATA0_SOFTRESET                7
-#define STIH416_SATA1_SOFTRESET                8
-#define STIH416_PCIE0_SOFTRESET                9
-#define STIH416_PCIE1_SOFTRESET                10
-#define STIH416_AUD_DAC_SOFTRESET      11
-#define STIH416_HDTVOUT_SOFTRESET      12
-#define STIH416_VTAC_M_RX_SOFTRESET    13
-#define STIH416_VTAC_A_RX_SOFTRESET    14
-#define STIH416_SYNC_HD_SOFTRESET      15
-#define STIH416_SYNC_SD_SOFTRESET      16
-#define STIH416_BLITTER_SOFTRESET      17
-#define STIH416_GPU_SOFTRESET          18
-#define STIH416_VTAC_M_TX_SOFTRESET    19
-#define STIH416_VTAC_A_TX_SOFTRESET    20
-#define STIH416_VTG_AUX_SOFTRESET      21
-#define STIH416_JPEG_DEC_SOFTRESET     22
-#define STIH416_HVA_SOFTRESET          23
-#define STIH416_COMPO_M_SOFTRESET      24
-#define STIH416_COMPO_A_SOFTRESET      25
-#define STIH416_VP8_DEC_SOFTRESET      26
-#define STIH416_VTG_MAIN_SOFTRESET     27
-#define STIH416_KEYSCAN_SOFTRESET      28
-
-#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH416 */

diff --git a/include/dt-bindings/reset/stih407-resets.h b/include/dt-bindings/reset/stih407-resets.h
new file mode 100644 (file)
index 0000000..02d4328
--- /dev/null
+++ b/include/dt-bindings/reset/stih407-resets.h
@@ -0,0 +1,61 @@
+/*
+ * This header provides constants for the reset controller
+ * based peripheral powerdown requests on the STMicroelectronics
+ * STiH407 SoC.
+ */
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH407
+#define _DT_BINDINGS_RESET_CONTROLLER_STIH407
+
+/* Powerdown requests control 0 */
+#define STIH407_EMISS_POWERDOWN                0
+#define STIH407_NAND_POWERDOWN         1
+
+/* Synp GMAC PowerDown */
+#define STIH407_ETH1_POWERDOWN         2
+
+/* Powerdown requests control 1 */
+#define STIH407_USB3_POWERDOWN         3
+#define STIH407_USB2_PORT1_POWERDOWN   4
+#define STIH407_USB2_PORT0_POWERDOWN   5
+#define STIH407_PCIE1_POWERDOWN                6
+#define STIH407_PCIE0_POWERDOWN                7
+#define STIH407_SATA1_POWERDOWN                8
+#define STIH407_SATA0_POWERDOWN                9
+
+/* Reset defines */
+#define STIH407_ETH1_SOFTRESET         0
+#define STIH407_MMC1_SOFTRESET         1
+#define STIH407_PICOPHY_SOFTRESET      2
+#define STIH407_IRB_SOFTRESET          3
+#define STIH407_PCIE0_SOFTRESET                4
+#define STIH407_PCIE1_SOFTRESET                5
+#define STIH407_SATA0_SOFTRESET                6
+#define STIH407_SATA1_SOFTRESET                7
+#define STIH407_MIPHY0_SOFTRESET       8
+#define STIH407_MIPHY1_SOFTRESET       9
+#define STIH407_MIPHY2_SOFTRESET       10
+#define STIH407_SATA0_PWR_SOFTRESET    11
+#define STIH407_SATA1_PWR_SOFTRESET    12
+#define STIH407_DELTA_SOFTRESET                13
+#define STIH407_BLITTER_SOFTRESET      14
+#define STIH407_HDTVOUT_SOFTRESET      15
+#define STIH407_HDQVDP_SOFTRESET       16
+#define STIH407_VDP_AUX_SOFTRESET      17
+#define STIH407_COMPO_SOFTRESET                18
+#define STIH407_HDMI_TX_PHY_SOFTRESET  19
+#define STIH407_JPEG_DEC_SOFTRESET     20
+#define STIH407_VP8_DEC_SOFTRESET      21
+#define STIH407_GPU_SOFTRESET          22
+#define STIH407_HVA_SOFTRESET          23
+#define STIH407_ERAM_HVA_SOFTRESET     24
+#define STIH407_LPM_SOFTRESET          25
+#define STIH407_KEYSCAN_SOFTRESET      26
+#define STIH407_USB2_PORT0_SOFTRESET   27
+#define STIH407_USB2_PORT1_SOFTRESET   28
+
+/* Picophy reset defines */
+#define STIH407_PICOPHY0_RESET         0
+#define STIH407_PICOPHY1_RESET         1
+#define STIH407_PICOPHY2_RESET         2
+
+#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH407 */

diff --git a/include/dt-bindings/reset/stih415-resets.h b/include/dt-bindings/reset/stih415-resets.h
new file mode 100644 (file)
index 0000000..c2329fe
--- /dev/null
+++ b/include/dt-bindings/reset/stih415-resets.h
@@ -0,0 +1,27 @@
+/*
+ * This header provides constants for the reset controller
+ * based peripheral powerdown requests on the STMicroelectronics
+ * STiH415 SoC.
+ */
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH415
+#define _DT_BINDINGS_RESET_CONTROLLER_STIH415
+
+#define STIH415_EMISS_POWERDOWN                0
+#define STIH415_NAND_POWERDOWN         1
+#define STIH415_KEYSCAN_POWERDOWN      2
+#define STIH415_USB0_POWERDOWN         3
+#define STIH415_USB1_POWERDOWN         4
+#define STIH415_USB2_POWERDOWN         5
+#define STIH415_SATA0_POWERDOWN                6
+#define STIH415_SATA1_POWERDOWN                7
+#define STIH415_PCIE_POWERDOWN         8
+
+#define STIH415_ETH0_SOFTRESET         0
+#define STIH415_ETH1_SOFTRESET         1
+#define STIH415_IRB_SOFTRESET          2
+#define STIH415_USB0_SOFTRESET         3
+#define STIH415_USB1_SOFTRESET         4
+#define STIH415_USB2_SOFTRESET         5
+#define STIH415_KEYSCAN_SOFTRESET      6
+
+#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH415 */

diff --git a/include/dt-bindings/reset/stih416-resets.h b/include/dt-bindings/reset/stih416-resets.h
new file mode 100644 (file)
index 0000000..fcf9af1
--- /dev/null
+++ b/include/dt-bindings/reset/stih416-resets.h
@@ -0,0 +1,51 @@
+/*
+ * This header provides constants for the reset controller
+ * based peripheral powerdown requests on the STMicroelectronics
+ * STiH416 SoC.
+ */
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH416
+#define _DT_BINDINGS_RESET_CONTROLLER_STIH416
+
+#define STIH416_EMISS_POWERDOWN                0
+#define STIH416_NAND_POWERDOWN         1
+#define STIH416_KEYSCAN_POWERDOWN      2
+#define STIH416_USB0_POWERDOWN         3
+#define STIH416_USB1_POWERDOWN         4
+#define STIH416_USB2_POWERDOWN         5
+#define STIH416_USB3_POWERDOWN         6
+#define STIH416_SATA0_POWERDOWN                7
+#define STIH416_SATA1_POWERDOWN                8
+#define STIH416_PCIE0_POWERDOWN                9
+#define STIH416_PCIE1_POWERDOWN                10
+
+#define STIH416_ETH0_SOFTRESET         0
+#define STIH416_ETH1_SOFTRESET         1
+#define STIH416_IRB_SOFTRESET          2
+#define STIH416_USB0_SOFTRESET         3
+#define STIH416_USB1_SOFTRESET         4
+#define STIH416_USB2_SOFTRESET         5
+#define STIH416_USB3_SOFTRESET         6
+#define STIH416_SATA0_SOFTRESET                7
+#define STIH416_SATA1_SOFTRESET                8
+#define STIH416_PCIE0_SOFTRESET                9
+#define STIH416_PCIE1_SOFTRESET                10
+#define STIH416_AUD_DAC_SOFTRESET      11
+#define STIH416_HDTVOUT_SOFTRESET      12
+#define STIH416_VTAC_M_RX_SOFTRESET    13
+#define STIH416_VTAC_A_RX_SOFTRESET    14
+#define STIH416_SYNC_HD_SOFTRESET      15
+#define STIH416_SYNC_SD_SOFTRESET      16
+#define STIH416_BLITTER_SOFTRESET      17
+#define STIH416_GPU_SOFTRESET          18
+#define STIH416_VTAC_M_TX_SOFTRESET    19
+#define STIH416_VTAC_A_TX_SOFTRESET    20
+#define STIH416_VTG_AUX_SOFTRESET      21
+#define STIH416_JPEG_DEC_SOFTRESET     22
+#define STIH416_HVA_SOFTRESET          23
+#define STIH416_COMPO_M_SOFTRESET      24
+#define STIH416_COMPO_A_SOFTRESET      25
+#define STIH416_VP8_DEC_SOFTRESET      26
+#define STIH416_VTG_MAIN_SOFTRESET     27
+#define STIH416_KEYSCAN_SOFTRESET      28
+
+#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH416 */