tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Philipp Zabel efdf5aa8 b2f6dd7b

+11 -11
+1 -1
Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
··· 39 39 }; 40 40 41 41 Macro definitions for the supported reset channels can be found in: 42 - include/dt-bindings/reset-controller/stih407-resets.h 42 + include/dt-bindings/reset/stih407-resets.h
+2 -2
Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
··· 43 43 44 44 Macro definitions for the supported reset channels can be found in: 45 45 46 - include/dt-bindings/reset-controller/stih415-resets.h 47 - include/dt-bindings/reset-controller/stih416-resets.h 46 + include/dt-bindings/reset/stih415-resets.h 47 + include/dt-bindings/reset/stih416-resets.h
+2 -2
Documentation/devicetree/bindings/reset/st,sti-softreset.txt
··· 42 42 43 43 Macro definitions for the supported reset channels can be found in: 44 44 45 - include/dt-bindings/reset-controller/stih415-resets.h 46 - include/dt-bindings/reset-controller/stih416-resets.h 45 + include/dt-bindings/reset/stih415-resets.h 46 + include/dt-bindings/reset/stih416-resets.h
+1 -1
arch/arm/boot/dts/stih407-family.dtsi
··· 9 9 #include "stih407-pinctrl.dtsi" 10 10 #include <dt-bindings/mfd/st-lpc.h> 11 11 #include <dt-bindings/phy/phy.h> 12 - #include <dt-bindings/reset-controller/stih407-resets.h> 12 + #include <dt-bindings/reset/stih407-resets.h> 13 13 #include <dt-bindings/interrupt-controller/irq-st.h> 14 14 / { 15 15 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/stih415.dtsi
··· 10 10 #include "stih415-clock.dtsi" 11 11 #include "stih415-pinctrl.dtsi" 12 12 #include <dt-bindings/interrupt-controller/arm-gic.h> 13 - #include <dt-bindings/reset-controller/stih415-resets.h> 13 + #include <dt-bindings/reset/stih415-resets.h> 14 14 / { 15 15 16 16 L2: cache-controller {
+1 -1
arch/arm/boot/dts/stih416.dtsi
··· 12 12 13 13 #include <dt-bindings/phy/phy.h> 14 14 #include <dt-bindings/interrupt-controller/arm-gic.h> 15 - #include <dt-bindings/reset-controller/stih416-resets.h> 15 + #include <dt-bindings/reset/stih416-resets.h> 16 16 #include <dt-bindings/interrupt-controller/irq-st.h> 17 17 / { 18 18 L2: cache-controller {
+1 -1
drivers/reset/sti/reset-stih407.c
··· 11 11 #include <linux/of.h> 12 12 #include <linux/of_platform.h> 13 13 #include <linux/platform_device.h> 14 - #include <dt-bindings/reset-controller/stih407-resets.h> 14 + #include <dt-bindings/reset/stih407-resets.h> 15 15 #include "reset-syscfg.h" 16 16 17 17 /* STiH407 Peripheral powerdown definitions. */
+1 -1
drivers/reset/sti/reset-stih415.c
··· 13 13 #include <linux/of_platform.h> 14 14 #include <linux/platform_device.h> 15 15 16 - #include <dt-bindings/reset-controller/stih415-resets.h> 16 + #include <dt-bindings/reset/stih415-resets.h> 17 17 18 18 #include "reset-syscfg.h" 19 19
+1 -1
drivers/reset/sti/reset-stih416.c
··· 13 13 #include <linux/of_platform.h> 14 14 #include <linux/platform_device.h> 15 15 16 - #include <dt-bindings/reset-controller/stih416-resets.h> 16 + #include <dt-bindings/reset/stih416-resets.h> 17 17 18 18 #include "reset-syscfg.h" 19 19
include/dt-bindings/reset-controller/stih407-resets.h include/dt-bindings/reset/stih407-resets.h
include/dt-bindings/reset-controller/stih415-resets.h include/dt-bindings/reset/stih415-resets.h
include/dt-bindings/reset-controller/stih416-resets.h include/dt-bindings/reset/stih416-resets.h