diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:24:43 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:48:45 +0100 |
commit | 81462901ce3d677ce318150f7027e2ce1cf97c41 (patch) | |
tree | f0a54fd2b6b35cef5e837a25d9c91c5cf0ca60ae /dts/src | |
parent | 4c3f7148178d04d69cf2d4751101b4d57561b7b3 (diff) | |
download | barebox-81462901ce3d677ce318150f7027e2ce1cf97c41.tar.gz barebox-81462901ce3d677ce318150f7027e2ce1cf97c41.tar.xz |
dts: update to v4.9
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
-rw-r--r-- | dts/src/arm/imx7s.dtsi | 5 | ||||
-rw-r--r-- | dts/src/arm/orion5x-linkstation-lsgl.dts | 4 | ||||
-rw-r--r-- | dts/src/arm/sun8i-h3.dtsi | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/dts/src/arm/imx7s.dtsi b/dts/src/arm/imx7s.dtsi index 0d7d5ac625..2b6cb05bc0 100644 --- a/dts/src/arm/imx7s.dtsi +++ b/dts/src/arm/imx7s.dtsi @@ -643,9 +643,8 @@ reg = <0x30730000 0x10000>; interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>, - <&clks IMX7D_CLK_DUMMY>, - <&clks IMX7D_CLK_DUMMY>; - clock-names = "pix", "axi", "disp_axi"; + <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>; + clock-names = "pix", "axi"; status = "disabled"; }; }; diff --git a/dts/src/arm/orion5x-linkstation-lsgl.dts b/dts/src/arm/orion5x-linkstation-lsgl.dts index 1cf644bfd7..51dc734cd5 100644 --- a/dts/src/arm/orion5x-linkstation-lsgl.dts +++ b/dts/src/arm/orion5x-linkstation-lsgl.dts @@ -82,6 +82,10 @@ gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; +&sata { + nr-ports = <2>; +}; + &ehci1 { status = "okay"; }; diff --git a/dts/src/arm/sun8i-h3.dtsi b/dts/src/arm/sun8i-h3.dtsi index 75a865406d..f4ba088b22 100644 --- a/dts/src/arm/sun8i-h3.dtsi +++ b/dts/src/arm/sun8i-h3.dtsi @@ -410,7 +410,7 @@ }; uart3_pins: uart3 { - allwinner,pins = "PG13", "PG14"; + allwinner,pins = "PA13", "PA14"; allwinner,function = "uart3"; allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |