From d83da99f31f323d6699aeaf1b730ed93dd92d3d8 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Wed, 21 Dec 2016 21:41:34 +0800 Subject: [PATCH] soc: rockchip: rename rockchip_boot-mode.h to rockchip,boot-mode.h Same as upstream. Change-Id: Ic1887e5cf808ebf214168b51683dec25880f0dac Signed-off-by: Huang, Tao --- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3366.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- .../soc/{rockchip_boot-mode.h => rockchip,boot-mode.h} | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename include/dt-bindings/soc/{rockchip_boot-mode.h => rockchip,boot-mode.h} (100%) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index bb7d5f33a915..b5e2a1757da1 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "skeleton.dtsi" / { diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 98953c440dcc..09c67c9f5d5e 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "skeleton.dtsi" / { diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 66296fd497d9..860d1a31df57 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -43,7 +43,7 @@ #include #include -#include +#include #include "skeleton.dtsi" / { diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 6258e28af508..77c39308aa26 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -45,7 +45,7 @@ #include #include #include -#include +#include / { compatible = "rockchip,rk3328"; diff --git a/arch/arm64/boot/dts/rockchip/rk3366.dtsi b/arch/arm64/boot/dts/rockchip/rk3366.dtsi index 6a7088d4351e..d1672ac6db75 100644 --- a/arch/arm64/boot/dts/rockchip/rk3366.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3366.dtsi @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include / { diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index fd69e074c025..2925233fd105 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -48,7 +48,7 @@ #include #include #include -#include +#include / { compatible = "rockchip,rk3368"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 891a124ce1bf..808c081377fe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include "rk3399-dram-default-timing.dtsi" diff --git a/include/dt-bindings/soc/rockchip_boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h similarity index 100% rename from include/dt-bindings/soc/rockchip_boot-mode.h rename to include/dt-bindings/soc/rockchip,boot-mode.h -- 2.34.1