diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-04 21:23:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-04 21:23:05 +0200 |
| commit | e8ee06fe59e468dcd7404b8eed75d78af9c02593 (patch) | |
| tree | 9fa40833523239ccb546a82cc9e530d511ed5fa2 /dts/src | |
| parent | 9f0942c873dc7bf20a74062fd1a0c903eeacbb5f (diff) | |
| download | barebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.gz barebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.xz | |
dts: update to v3.16
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
| -rw-r--r-- | dts/src/arm/hi3620.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm/omap3-n900.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/r8a7791.dtsi | 4 | ||||
| -rw-r--r-- | dts/src/arm/ste-nomadik-s8815.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/ste-nomadik-stn8815.dtsi | 7 |
5 files changed, 9 insertions, 8 deletions
diff --git a/dts/src/arm/hi3620.dtsi b/dts/src/arm/hi3620.dtsi index ab1116d086..83a5b8685b 100644 --- a/dts/src/arm/hi3620.dtsi +++ b/dts/src/arm/hi3620.dtsi @@ -73,7 +73,7 @@ L2: l2-cache { compatible = "arm,pl310-cache"; - reg = <0xfc10000 0x100000>; + reg = <0x100000 0x100000>; interrupts = <0 15 4>; cache-unified; cache-level = <2>; diff --git a/dts/src/arm/omap3-n900.dts b/dts/src/arm/omap3-n900.dts index 1fe45d1f75..b15f1a77d6 100644 --- a/dts/src/arm/omap3-n900.dts +++ b/dts/src/arm/omap3-n900.dts @@ -353,7 +353,7 @@ }; twl_power: power { - compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; + compatible = "ti,twl4030-power-n900"; ti,use_poweroff; }; }; diff --git a/dts/src/arm/r8a7791.dtsi b/dts/src/arm/r8a7791.dtsi index 8d7ffaeff6..79f68acfd5 100644 --- a/dts/src/arm/r8a7791.dtsi +++ b/dts/src/arm/r8a7791.dtsi @@ -540,9 +540,9 @@ #clock-cells = <0>; clock-output-names = "sd1"; }; - sd2_clk: sd3_clk@e615007c { + sd2_clk: sd3_clk@e615026c { compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; - reg = <0 0xe615007c 0 4>; + reg = <0 0xe615026c 0 4>; clocks = <&pll1_div2_clk>; #clock-cells = <0>; clock-output-names = "sd2"; diff --git a/dts/src/arm/ste-nomadik-s8815.dts b/dts/src/arm/ste-nomadik-s8815.dts index f557feb997..90d8b6c7a2 100644 --- a/dts/src/arm/ste-nomadik-s8815.dts +++ b/dts/src/arm/ste-nomadik-s8815.dts @@ -4,7 +4,7 @@ */ /dts-v1/; -/include/ "ste-nomadik-stn8815.dtsi" +#include "ste-nomadik-stn8815.dtsi" / { model = "Calao Systems USB-S8815"; diff --git a/dts/src/arm/ste-nomadik-stn8815.dtsi b/dts/src/arm/ste-nomadik-stn8815.dtsi index d316c955bd..dbcf521b01 100644 --- a/dts/src/arm/ste-nomadik-stn8815.dtsi +++ b/dts/src/arm/ste-nomadik-stn8815.dtsi @@ -1,7 +1,9 @@ /* * Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC */ -/include/ "skeleton.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include "skeleton.dtsi" / { #address-cells = <1>; @@ -842,8 +844,7 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio3 15 0x1>; - cd-inverted; + cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; vmmc-supply = <&vmmc_regulator>; |