From 81462901ce3d677ce318150f7027e2ce1cf97c41 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 10 Jan 2017 08:24:43 +0100 Subject: dts: update to v4.9 Signed-off-by: Sascha Hauer --- dts/src/arm/imx7s.dtsi | 5 ++--- dts/src/arm/orion5x-linkstation-lsgl.dts | 4 ++++ dts/src/arm/sun8i-h3.dtsi | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'dts/src/arm') 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 = ; 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 = ; allwinner,pull = ; -- cgit v1.2.3