From: Maxime Ripard <maxime.ripard@free-electrons.com> To: Chen-Yu Tsai <wens@csie.org>, Maxime Ripard <maxime.ripard@free-electrons.com> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] ARM: sun5i: r8: Merge common controllers into the common DTSI Date: Sun, 5 Feb 2017 19:49:44 +0100 [thread overview] Message-ID: <8008c3ca3c8451e4f961477ef5c0f4769c65538c.1486320544.git-series.maxime.ripard@free-electrons.com> (raw) In-Reply-To: <cover.8519ab0b2252458a322bea5955d191e63f67100b.1486320544.git-series.maxime.ripard@free-electrons.com> In-Reply-To: <cover.8519ab0b2252458a322bea5955d191e63f67100b.1486320544.git-series.maxime.ripard@free-electrons.com> 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. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun5i-r8.dtsi | 40 +---------------------------------- arch/arm/boot/dts/sun5i.dtsi | 23 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi index 4c1141396c99..de35dbcd1191 100644 --- a/arch/arm/boot/dts/sun5i-r8.dtsi +++ b/arch/arm/boot/dts/sun5i-r8.dtsi @@ -45,43 +45,3 @@ #include "sun5i-a13.dtsi" -/ { - chosen { - framebuffer@1 { - compatible = "allwinner,simple-framebuffer", - "simple-framebuffer"; - allwinner,pipeline = "de_be0-lcd0-tve0"; - clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>, - <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>, - <&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>; - status = "disabled"; - }; - }; - - soc@01c00000 { - 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>; - }; - }; - }; - }; -}; - -&tcon0_out { - tcon0_out_tve0: endpoint@1 { - reg = <1>; - remote-endpoint = <&tve0_in_tcon0>; - }; -}; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 9ba0c0302183..c8e2253cac1d 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>; + }; }; }; }; -- git-series 0.8.11
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 8/9] ARM: sun5i: r8: Merge common controllers into the common DTSI Date: Sun, 5 Feb 2017 19:49:44 +0100 [thread overview] Message-ID: <8008c3ca3c8451e4f961477ef5c0f4769c65538c.1486320544.git-series.maxime.ripard@free-electrons.com> (raw) In-Reply-To: <cover.8519ab0b2252458a322bea5955d191e63f67100b.1486320544.git-series.maxime.ripard@free-electrons.com> 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. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun5i-r8.dtsi | 40 +---------------------------------- arch/arm/boot/dts/sun5i.dtsi | 23 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi index 4c1141396c99..de35dbcd1191 100644 --- a/arch/arm/boot/dts/sun5i-r8.dtsi +++ b/arch/arm/boot/dts/sun5i-r8.dtsi @@ -45,43 +45,3 @@ #include "sun5i-a13.dtsi" -/ { - chosen { - framebuffer at 1 { - compatible = "allwinner,simple-framebuffer", - "simple-framebuffer"; - allwinner,pipeline = "de_be0-lcd0-tve0"; - clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>, - <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>, - <&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>; - status = "disabled"; - }; - }; - - soc at 01c00000 { - tve0: tv-encoder at 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 at 0 { - reg = <0>; - remote-endpoint = <&tcon0_out_tve0>; - }; - }; - }; - }; -}; - -&tcon0_out { - tcon0_out_tve0: endpoint at 1 { - reg = <1>; - remote-endpoint = <&tve0_in_tcon0>; - }; -}; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 9ba0c0302183..c8e2253cac1d 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 at 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 at 0 { + reg = <0>; + remote-endpoint = <&tcon0_out_tve0>; + }; + }; + }; + emac: ethernet at 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 at 1 { + reg = <1>; + remote-endpoint = <&tve0_in_tcon0>; + }; }; }; }; -- git-series 0.8.11
next prev parent reply other threads:[~2017-02-06 7:00 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-05 18:49 [PATCH 0/9] ARM: sun5i: Cleanup and reorganisation of the DTSI Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-05 18:49 ` [PATCH 1/9] ARM: sun5i: A10s: Switch the EMAC pins indices Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:10 ` Chen-Yu Tsai 2017-02-06 7:10 ` Chen-Yu Tsai 2017-02-05 18:49 ` [PATCH 2/9] ARM: sun5i: a10s: switch simple framebuffer indices Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:11 ` Chen-Yu Tsai 2017-02-06 7:11 ` Chen-Yu Tsai 2017-02-05 18:49 ` [PATCH 3/9] ARM: sunxi: Rename pwm0_pins to match our usual pattern Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:15 ` Chen-Yu Tsai 2017-02-06 7:15 ` Chen-Yu Tsai 2017-02-06 17:46 ` Maxime Ripard 2017-02-06 17:46 ` Maxime Ripard 2017-02-05 18:49 ` [PATCH 4/9] ARM: sun5i: Add UART2 pin group Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:17 ` Chen-Yu Tsai 2017-02-06 7:17 ` Chen-Yu Tsai 2017-02-06 17:37 ` Maxime Ripard 2017-02-06 17:37 ` Maxime Ripard 2017-02-05 18:49 ` [PATCH 5/9] ARM: sun5i: Rename UART3 flow control pins Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:18 ` Chen-Yu Tsai 2017-02-06 7:18 ` Chen-Yu Tsai 2017-02-05 18:49 ` [PATCH 6/9] ARM: sun5i: a13: Merge common controllers into the common DTSI Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:18 ` Chen-Yu Tsai 2017-02-06 7:18 ` Chen-Yu Tsai 2017-02-05 18:49 ` [PATCH 7/9] ARM: sun5i: a10s: " Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:21 ` Chen-Yu Tsai 2017-02-06 7:21 ` Chen-Yu Tsai 2017-02-05 18:49 ` Maxime Ripard [this message] 2017-02-05 18:49 ` [PATCH 8/9] ARM: sun5i: r8: " Maxime Ripard 2017-02-06 7:22 ` Chen-Yu Tsai 2017-02-06 7:22 ` Chen-Yu Tsai 2017-02-05 18:49 ` [PATCH 9/9] ARM: sun5i: gr8: Use common sun5i DTSI Maxime Ripard 2017-02-05 18:49 ` Maxime Ripard 2017-02-06 7:30 ` Chen-Yu Tsai 2017-02-06 7:30 ` Chen-Yu Tsai 2017-02-06 17:39 ` Maxime Ripard 2017-02-06 17:39 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8008c3ca3c8451e4f961477ef5c0f4769c65538c.1486320544.git-series.maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.