| From 690e74f1c4dd4ebaa442d4d23593a0ebc23a39db Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Sat, 9 Nov 2013 13:23:53 +0100 |
| Subject: ARM: shmobile: Use #include in device tree sources |
| |
| In order to allow usage of the preprocessor in the SoC device tree |
| sources, switch from /include/ to #include. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 31c46cbf5b8bab87e89028977521c84f2d871040) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- |
| arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- |
| arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- |
| arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- |
| arch/arm/boot/dts/r8a7779-marzen-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- |
| arch/arm/boot/dts/r8a7790-lager-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7790-lager.dts | 2 +- |
| arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- |
| arch/arm/boot/dts/sh7372-mackerel.dts | 2 +- |
| arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 +- |
| arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- |
| 16 files changed, 16 insertions(+), 16 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts |
| index 1fb20f2333cc..b1deaf7e2e06 100644 |
| --- a/arch/arm/boot/dts/r7s72100-genmai.dts |
| +++ b/arch/arm/boot/dts/r7s72100-genmai.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r7s72100.dtsi" |
| +#include "r7s72100.dtsi" |
| |
| / { |
| model = "Genmai"; |
| diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| index 25dbc1c0947d..338f0cbfff7a 100644 |
| --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a73a4.dtsi" |
| +#include "r8a73a4.dtsi" |
| #include <dt-bindings/gpio/gpio.h> |
| |
| / { |
| diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts |
| index 91436b58016f..7db8d79fb93c 100644 |
| --- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts |
| +++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a73a4.dtsi" |
| +#include "r8a73a4.dtsi" |
| |
| / { |
| model = "APE6EVM"; |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| index 6a542198985d..c7c5bcb893ca 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7740.dtsi" |
| +#include "r8a7740.dtsi" |
| #include <dt-bindings/gpio/gpio.h> |
| #include <dt-bindings/pwm/pwm.h> |
| |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| index 426cd9c3e1c4..a06a11e1a840 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7740.dtsi" |
| +#include "r8a7740.dtsi" |
| |
| / { |
| model = "armadillo 800 eva"; |
| diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts |
| index f488c48bf69e..be9b75377f3e 100644 |
| --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts |
| @@ -15,7 +15,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7778.dtsi" |
| +#include "r8a7778.dtsi" |
| |
| / { |
| model = "bockw"; |
| diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts |
| index 12bbebc9c955..46a884d45175 100644 |
| --- a/arch/arm/boot/dts/r8a7778-bockw.dts |
| +++ b/arch/arm/boot/dts/r8a7778-bockw.dts |
| @@ -15,7 +15,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7778.dtsi" |
| +#include "r8a7778.dtsi" |
| |
| / { |
| model = "bockw"; |
| diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts |
| index ce3fe9eb1606..08b9ee37ad2f 100644 |
| --- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts |
| @@ -10,7 +10,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7779.dtsi" |
| +#include "r8a7779.dtsi" |
| #include <dt-bindings/gpio/gpio.h> |
| |
| / { |
| diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts |
| index f3f7f7999736..a7af2c2371f2 100644 |
| --- a/arch/arm/boot/dts/r8a7779-marzen.dts |
| +++ b/arch/arm/boot/dts/r8a7779-marzen.dts |
| @@ -10,7 +10,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7779.dtsi" |
| +#include "r8a7779.dtsi" |
| |
| / { |
| model = "marzen"; |
| diff --git a/arch/arm/boot/dts/r8a7790-lager-reference.dts b/arch/arm/boot/dts/r8a7790-lager-reference.dts |
| index ec82674d8033..cce7dbfc1954 100644 |
| --- a/arch/arm/boot/dts/r8a7790-lager-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7790-lager-reference.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7790.dtsi" |
| +#include "r8a7790.dtsi" |
| #include <dt-bindings/gpio/gpio.h> |
| |
| / { |
| diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts |
| index 203bd089af29..8799dfb0068e 100644 |
| --- a/arch/arm/boot/dts/r8a7790-lager.dts |
| +++ b/arch/arm/boot/dts/r8a7790-lager.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7790.dtsi" |
| +#include "r8a7790.dtsi" |
| |
| / { |
| model = "Lager"; |
| diff --git a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts |
| index b8a374a6bf79..1a0f082b21df 100644 |
| --- a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts |
| @@ -10,7 +10,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7791.dtsi" |
| +#include "r8a7791.dtsi" |
| |
| / { |
| model = "Koelsch"; |
| diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts |
| index 1ce5250ec278..c4e8b3a0cd13 100644 |
| --- a/arch/arm/boot/dts/r8a7791-koelsch.dts |
| +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts |
| @@ -10,7 +10,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "r8a7791.dtsi" |
| +#include "r8a7791.dtsi" |
| |
| / { |
| model = "Koelsch"; |
| diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts |
| index 8acf51e0cdae..a759a276c9a9 100644 |
| --- a/arch/arm/boot/dts/sh7372-mackerel.dts |
| +++ b/arch/arm/boot/dts/sh7372-mackerel.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "sh7372.dtsi" |
| +#include "sh7372.dtsi" |
| |
| / { |
| model = "Mackerel (AP4 EVM 2nd)"; |
| diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| index df75aea42a48..d5a6d74cdda0 100644 |
| --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| @@ -12,7 +12,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "sh73a0.dtsi" |
| +#include "sh73a0.dtsi" |
| #include <dt-bindings/gpio/gpio.h> |
| |
| / { |
| diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts |
| index 0f1ca7792c46..27c5f426d172 100644 |
| --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts |
| +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts |
| @@ -9,7 +9,7 @@ |
| */ |
| |
| /dts-v1/; |
| -/include/ "sh73a0.dtsi" |
| +#include "sh73a0.dtsi" |
| |
| / { |
| model = "KZM-A9-GT"; |
| -- |
| 1.8.5.rc3 |
| |