diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-02-03 16:01:27 +0100 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-03-06 07:40:36 +0100 |
commit | bea13693b2bb7ed4d2364d3c6f8ee268fe8f98ec (patch) | |
tree | 6a1e40c359ea8fc01f9e33f049de89767ed51ef6 /arch/arm/boot/dts/sun5i.dtsi | |
parent | 78f6d98278353d28388b70b2785566177f957b5f (diff) | |
download | op-kernel-dev-bea13693b2bb7ed4d2364d3c6f8ee268fe8f98ec.zip op-kernel-dev-bea13693b2bb7ed4d2364d3c6f8ee268fe8f98ec.tar.gz |
ARM: sun5i: r8: Merge common controllers into the common DTSI
Some controllers found in the R8 DTSI actually apply to all of the sun5i
family. Move those into the common DTSI so that all SoCs can benefit from
it.
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun5i.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sun5i.dtsi | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index a2096bf..5e0a416 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -187,6 +187,24 @@ #size-cells = <0>; }; + tve0: tv-encoder@01c0a000 { + compatible = "allwinner,sun4i-a10-tv-encoder"; + reg = <0x01c0a000 0x1000>; + clocks = <&ccu CLK_AHB_TVE>; + resets = <&ccu RST_TVE>; + status = "disabled"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + tve0_in_tcon0: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon0_out_tve0>; + }; + }; + }; + emac: ethernet@01c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; @@ -238,6 +256,11 @@ #address-cells = <1>; #size-cells = <0>; reg = <1>; + + tcon0_out_tve0: endpoint@1 { + reg = <1>; + remote-endpoint = <&tve0_in_tcon0>; + }; }; }; }; |