diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-17 13:52:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-17 13:52:52 +0200 |
| commit | 28e3f6f958e72d8e373ca1a70305c29b657c77f7 (patch) | |
| tree | 86a2d857c197cbb71f7110261941193dfcd82709 /dts/src/arm | |
| parent | 0743b12b70e9567f36c2de6a5d480e4df234aa88 (diff) | |
| download | barebox-28e3f6f958e72d8e373ca1a70305c29b657c77f7.tar.gz barebox-28e3f6f958e72d8e373ca1a70305c29b657c77f7.tar.xz | |
dts: update to v4.1-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm')
| -rw-r--r-- | dts/src/arm/am335x-boneblack.dts | 4 | ||||
| -rw-r--r-- | dts/src/arm/am335x-evmsk.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/exynos4412-trats2.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/imx27.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm/omap3-devkit8000.dts | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/dts/src/arm/am335x-boneblack.dts b/dts/src/arm/am335x-boneblack.dts index 5c42d259fa..901739fcb8 100644 --- a/dts/src/arm/am335x-boneblack.dts +++ b/dts/src/arm/am335x-boneblack.dts @@ -80,7 +80,3 @@ status = "okay"; }; }; - -&rtc { - system-power-controller; -}; diff --git a/dts/src/arm/am335x-evmsk.dts b/dts/src/arm/am335x-evmsk.dts index 87fc7a35e8..156d05efcb 100644 --- a/dts/src/arm/am335x-evmsk.dts +++ b/dts/src/arm/am335x-evmsk.dts @@ -654,7 +654,7 @@ wlcore: wlcore@2 { compatible = "ti,wl1271"; reg = <2>; - interrupt-parent = <&gpio1>; + interrupt-parent = <&gpio0>; interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ ref-clock-frequency = <38400000>; }; diff --git a/dts/src/arm/exynos4412-trats2.dts b/dts/src/arm/exynos4412-trats2.dts index 173ffa479a..792394dd0f 100644 --- a/dts/src/arm/exynos4412-trats2.dts +++ b/dts/src/arm/exynos4412-trats2.dts @@ -736,7 +736,7 @@ display-timings { timing-0 { - clock-frequency = <0>; + clock-frequency = <57153600>; hactive = <720>; vactive = <1280>; hfront-porch = <5>; diff --git a/dts/src/arm/imx27.dtsi b/dts/src/arm/imx27.dtsi index 6951b66d1a..bc215e4b75 100644 --- a/dts/src/arm/imx27.dtsi +++ b/dts/src/arm/imx27.dtsi @@ -533,7 +533,7 @@ fec: ethernet@1002b000 { compatible = "fsl,imx27-fec"; - reg = <0x1002b000 0x4000>; + reg = <0x1002b000 0x1000>; interrupts = <50>; clocks = <&clks IMX27_CLK_FEC_IPG_GATE>, <&clks IMX27_CLK_FEC_AHB_GATE>; diff --git a/dts/src/arm/omap3-devkit8000.dts b/dts/src/arm/omap3-devkit8000.dts index 134d3f27a8..921de6605f 100644 --- a/dts/src/arm/omap3-devkit8000.dts +++ b/dts/src/arm/omap3-devkit8000.dts @@ -110,6 +110,8 @@ nand@0,0 { reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ nand-bus-width = <16>; + gpmc,device-width = <2>; + ti,nand-ecc-opt = "sw"; gpmc,sync-clk-ps = <0>; gpmc,cs-on-ns = <0>; |