From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> To: Kukjin Kim <kgene@kernel.org>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Marek Szyprowski <m.szyprowski@samsung.com>, Krzysztof Kozlowski <k.kozlowski.k@gmail.com> Subject: [PATCH 5/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5420 Date: Sun, 12 Apr 2015 21:24:52 +0900 [thread overview] Message-ID: <1428841494-20769-6-git-send-email-k.kozlowski.k@gmail.com> (raw) In-Reply-To: <1428841494-20769-1-git-send-email-k.kozlowski.k@gmail.com> The phandle notation reduces possible mistakes when overriding nodes. Additionally remove duplicated serial and uart labels for serial. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> --- arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/boot/dts/exynos5420.dtsi | 80 +++++++++++++++--------------- arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 3f4e2feaa927..9d199ce01314 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -1024,7 +1024,7 @@ }; }; -&uart_3 { +&serial_3 { status = "okay"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index c7a44ee0ce06..25228527294c 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -328,13 +328,6 @@ interrupts = <0 47 0>; }; - rtc: rtc@101E0000 { - clocks = <&clock CLK_RTC>; - clock-names = "rtc"; - interrupt-parent = <&pmu_system_controller>; - status = "disabled"; - }; - amba { #address-cells = <1>; #size-cells = <1>; @@ -496,26 +489,6 @@ status = "disabled"; }; - uart_0: serial@12C00000 { - clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_1: serial@12C10000 { - clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_2: serial@12C20000 { - clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_3: serial@12C30000 { - clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; - clock-names = "uart", "clk_uart_baud0"; - }; - pwm: pwm@12dd0000 { compatible = "samsung,exynos4210-pwm"; reg = <0x12dd0000 0x100>; @@ -531,13 +504,6 @@ #phy-cells = <0>; }; - dp: dp-controller@145B0000 { - clocks = <&clock CLK_DP1>; - clock-names = "dp"; - phys = <&dp_phy>; - phy-names = "dp"; - }; - mipi_phy: video-phy@10040714 { compatible = "samsung,s5pv210-mipi-video-phy"; reg = <0x10040714 12>; @@ -557,12 +523,6 @@ status = "disabled"; }; - fimd: fimd@14400000 { - clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; - clock-names = "sclk_fimd", "fimd"; - power-domains = <&disp_pd>; - }; - adc: adc@12D10000 { compatible = "samsung,exynos-adc-v2"; reg = <0x12D10000 0x100>; @@ -962,3 +922,43 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; }; + +&dp { + clocks = <&clock CLK_DP1>; + clock-names = "dp"; + phys = <&dp_phy>; + phy-names = "dp"; +}; + +&fimd { + clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; + clock-names = "sclk_fimd", "fimd"; + power-domains = <&disp_pd>; +}; + +&rtc { + clocks = <&clock CLK_RTC>; + clock-names = "rtc"; + interrupt-parent = <&pmu_system_controller>; + status = "disabled"; +}; + +&serial_0 { + clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_1 { + clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_2 { + clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_3 { + clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; + clock-names = "uart", "clk_uart_baud0"; +}; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index c833bacf873b..9d26abd88dfd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -986,7 +986,7 @@ }; }; -&uart_3 { +&serial_3 { status = "okay"; }; -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: k.kozlowski.k@gmail.com (Krzysztof Kozlowski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5420 Date: Sun, 12 Apr 2015 21:24:52 +0900 [thread overview] Message-ID: <1428841494-20769-6-git-send-email-k.kozlowski.k@gmail.com> (raw) In-Reply-To: <1428841494-20769-1-git-send-email-k.kozlowski.k@gmail.com> The phandle notation reduces possible mistakes when overriding nodes. Additionally remove duplicated serial and uart labels for serial. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> --- arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/boot/dts/exynos5420.dtsi | 80 +++++++++++++++--------------- arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 3f4e2feaa927..9d199ce01314 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -1024,7 +1024,7 @@ }; }; -&uart_3 { +&serial_3 { status = "okay"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index c7a44ee0ce06..25228527294c 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -328,13 +328,6 @@ interrupts = <0 47 0>; }; - rtc: rtc at 101E0000 { - clocks = <&clock CLK_RTC>; - clock-names = "rtc"; - interrupt-parent = <&pmu_system_controller>; - status = "disabled"; - }; - amba { #address-cells = <1>; #size-cells = <1>; @@ -496,26 +489,6 @@ status = "disabled"; }; - uart_0: serial at 12C00000 { - clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_1: serial at 12C10000 { - clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_2: serial at 12C20000 { - clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; - clock-names = "uart", "clk_uart_baud0"; - }; - - uart_3: serial at 12C30000 { - clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; - clock-names = "uart", "clk_uart_baud0"; - }; - pwm: pwm at 12dd0000 { compatible = "samsung,exynos4210-pwm"; reg = <0x12dd0000 0x100>; @@ -531,13 +504,6 @@ #phy-cells = <0>; }; - dp: dp-controller at 145B0000 { - clocks = <&clock CLK_DP1>; - clock-names = "dp"; - phys = <&dp_phy>; - phy-names = "dp"; - }; - mipi_phy: video-phy at 10040714 { compatible = "samsung,s5pv210-mipi-video-phy"; reg = <0x10040714 12>; @@ -557,12 +523,6 @@ status = "disabled"; }; - fimd: fimd at 14400000 { - clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; - clock-names = "sclk_fimd", "fimd"; - power-domains = <&disp_pd>; - }; - adc: adc at 12D10000 { compatible = "samsung,exynos-adc-v2"; reg = <0x12D10000 0x100>; @@ -962,3 +922,43 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; }; + +&dp { + clocks = <&clock CLK_DP1>; + clock-names = "dp"; + phys = <&dp_phy>; + phy-names = "dp"; +}; + +&fimd { + clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; + clock-names = "sclk_fimd", "fimd"; + power-domains = <&disp_pd>; +}; + +&rtc { + clocks = <&clock CLK_RTC>; + clock-names = "rtc"; + interrupt-parent = <&pmu_system_controller>; + status = "disabled"; +}; + +&serial_0 { + clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_1 { + clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_2 { + clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; + clock-names = "uart", "clk_uart_baud0"; +}; + +&serial_3 { + clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; + clock-names = "uart", "clk_uart_baud0"; +}; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index c833bacf873b..9d26abd88dfd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -986,7 +986,7 @@ }; }; -&uart_3 { +&serial_3 { status = "okay"; }; -- 2.1.0
next prev parent reply other threads:[~2015-04-12 12:25 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-12 12:24 [PATCH 0/7] ARM: dts: Refactor Exynos5 boards for phandle notation Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 1/7] ARM: dts: Add labels to nodes used in Exynos5 based DTS Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 2/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5250 Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 3/7] ARM: dts: Remove duplicated I2C 7 nodes in Snow Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 4/7] ARM: dts: Use phandle notation for overriding nodes in Arndale Octa Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski [this message] 2015-04-12 12:24 ` [PATCH 5/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5420 Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 6/7] ARM: dts: Use phandle notation for overriding nodes in SMDK5420 Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 12:24 ` [PATCH 7/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5440 boards Krzysztof Kozlowski 2015-04-12 12:24 ` Krzysztof Kozlowski 2015-04-12 20:07 ` [PATCH 0/7] ARM: dts: Refactor Exynos5 boards for phandle notation Arnd Bergmann 2015-04-12 20:07 ` Arnd Bergmann 2015-04-13 10:54 ` Krzysztof Kozłowski 2015-04-13 10:54 ` Krzysztof Kozłowski
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=1428841494-20769-6-git-send-email-k.kozlowski.k@gmail.com \ --to=k.kozlowski.k@gmail.com \ --cc=arnd@arndb.de \ --cc=devicetree@vger.kernel.org \ --cc=kgene@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=olof@lixom.net \ /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.