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

ARM: mediatek: 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 mediatek reset constants in there,
too, to avoid confusion.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

authored by

Philipp Zabel and committed by
Matthias Brugger
967313e2 74d25721

+4 -4
+1 -1
Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt
··· 18 18 Also it uses the common reset controller binding from 19 19 Documentation/devicetree/bindings/reset/reset.txt. 20 20 The available reset outputs are defined in 21 - dt-bindings/reset-controller/mt*-resets.h 21 + dt-bindings/reset/mt*-resets.h 22 22 23 23 Example: 24 24
+1 -1
Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
··· 18 18 Also it uses the common reset controller binding from 19 19 Documentation/devicetree/bindings/reset/reset.txt. 20 20 The available reset outputs are defined in 21 - dt-bindings/reset-controller/mt*-resets.h 21 + dt-bindings/reset/mt*-resets.h 22 22 23 23 Example: 24 24
+1 -1
arch/arm/boot/dts/mt8135.dtsi
··· 15 15 #include <dt-bindings/clock/mt8135-clk.h> 16 16 #include <dt-bindings/interrupt-controller/irq.h> 17 17 #include <dt-bindings/interrupt-controller/arm-gic.h> 18 - #include <dt-bindings/reset-controller/mt8135-resets.h> 18 + #include <dt-bindings/reset/mt8135-resets.h> 19 19 #include "skeleton64.dtsi" 20 20 #include "mt8135-pinfunc.h" 21 21
+1 -1
arch/arm64/boot/dts/mediatek/mt8173.dtsi
··· 15 15 #include <dt-bindings/interrupt-controller/irq.h> 16 16 #include <dt-bindings/interrupt-controller/arm-gic.h> 17 17 #include <dt-bindings/power/mt8173-power.h> 18 - #include <dt-bindings/reset-controller/mt8173-resets.h> 18 + #include <dt-bindings/reset/mt8173-resets.h> 19 19 #include "mt8173-pinfunc.h" 20 20 21 21 / {
include/dt-bindings/reset-controller/mt8135-resets.h include/dt-bindings/reset/mt8135-resets.h
include/dt-bindings/reset-controller/mt8173-resets.h include/dt-bindings/reset/mt8173-resets.h