| Message ID | 1406940750-15880-4-git-send-email-afaerber@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Andreas, On Fri, Aug 1, 2014 at 5:52 PM, Andreas Färber <afaerber@suse.de> wrote: > Allows them to be extended by reference. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v6: Split off from Snow/SMDK cleanups (Doug Anderson) > > arch/arm/boot/dts/exynos5250.dtsi | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) Reviewed-by: Doug Anderson <dianders@chromium.org> -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Andreas, Ehh, one more thing. It looks like my memory is playing tricks on me. Please see inline. On 02.08.2014 02:52, Andreas Färber wrote: > Allows them to be extended by reference. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v6: Split off from Snow/SMDK cleanups (Doug Anderson) [snip] > - serial@12C00000 { > + uart0: serial@12C00000 { > clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; > clock-names = "uart", "clk_uart_baud0"; > }; > > - serial@12C10000 { > + uart1: serial@12C10000 { > clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; > clock-names = "uart", "clk_uart_baud0"; > }; > > - serial@12C20000 { > + uart2: serial@12C20000 { > clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; > clock-names = "uart", "clk_uart_baud0"; > }; > > - serial@12C30000 { > + uart3: serial@12C30000 { > clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; > clock-names = "uart", "clk_uart_baud0"; > }; I forgot about a series [1] that went through tty tree, which is going to conflict with this patch. It already adds labels to uart nodes in serial_X format. I don't really remember why I went with this format for Exynos SoCs and with uartX for older ones... [1] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/boot/dts?id=1e64f48ea7c59fb94acd7551dd9fa68b8a752efc Best regards, Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 02.08.2014 14:19, schrieb Tomasz Figa: > Andreas, > > Ehh, one more thing. It looks like my memory is playing tricks on me. > Please see inline. > > On 02.08.2014 02:52, Andreas Färber wrote: >> Allows them to be extended by reference. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> v6: Split off from Snow/SMDK cleanups (Doug Anderson) > > [snip] > >> - serial@12C00000 { >> + uart0: serial@12C00000 { >> clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; >> clock-names = "uart", "clk_uart_baud0"; >> }; >> >> - serial@12C10000 { >> + uart1: serial@12C10000 { >> clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; >> clock-names = "uart", "clk_uart_baud0"; >> }; >> >> - serial@12C20000 { >> + uart2: serial@12C20000 { >> clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; >> clock-names = "uart", "clk_uart_baud0"; >> }; >> >> - serial@12C30000 { >> + uart3: serial@12C30000 { >> clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; >> clock-names = "uart", "clk_uart_baud0"; >> }; > > I forgot about a series [1] that went through tty tree, which is going > to conflict with this patch. It already adds labels to uart nodes in > serial_X format. I don't really remember why I went with this format for > Exynos SoCs and with uartX for older ones... > > [1] > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/boot/dts?id=1e64f48ea7c59fb94acd7551dd9fa68b8a752efc I doubt that I'll manage to resend another time today, so please just drop those hunks from my patch before applying - I ended up not using them here. Regards, Andreas
Am 02.08.2014 15:00, schrieb Andreas Färber: > Am 02.08.2014 14:19, schrieb Tomasz Figa: >> Andreas, >> >> Ehh, one more thing. It looks like my memory is playing tricks on me. >> Please see inline. >> >> On 02.08.2014 02:52, Andreas Färber wrote: >>> Allows them to be extended by reference. >>> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >>> v6: Split off from Snow/SMDK cleanups (Doug Anderson) >> >> [snip] >> >>> - serial@12C00000 { >>> + uart0: serial@12C00000 { >>> clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; >>> clock-names = "uart", "clk_uart_baud0"; >>> }; >>> >>> - serial@12C10000 { >>> + uart1: serial@12C10000 { >>> clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; >>> clock-names = "uart", "clk_uart_baud0"; >>> }; >>> >>> - serial@12C20000 { >>> + uart2: serial@12C20000 { >>> clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; >>> clock-names = "uart", "clk_uart_baud0"; >>> }; >>> >>> - serial@12C30000 { >>> + uart3: serial@12C30000 { >>> clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; >>> clock-names = "uart", "clk_uart_baud0"; >>> }; >> >> I forgot about a series [1] that went through tty tree, which is going >> to conflict with this patch. It already adds labels to uart nodes in >> serial_X format. I don't really remember why I went with this format for >> Exynos SoCs and with uartX for older ones... >> >> [1] >> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/boot/dts?id=1e64f48ea7c59fb94acd7551dd9fa68b8a752efc > > I doubt that I'll manage to resend another time today, [...] Sorry, forgot about this. Done now. v7 as individual reply. Andreas
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 834fb5a5306f..cf94aeaeaa84 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -215,7 +215,7 @@ clock-names = "fimg2d"; }; - codec@11000000 { + mfc: codec@11000000 { compatible = "samsung,mfc-v6"; reg = <0x11000000 0x10000>; interrupts = <0 96 0>; @@ -224,7 +224,7 @@ clock-names = "mfc"; }; - rtc@101E0000 { + rtc: rtc@101E0000 { clocks = <&clock CLK_RTC>; clock-names = "rtc"; status = "disabled"; @@ -238,27 +238,27 @@ clock-names = "tmu_apbif"; }; - serial@12C00000 { + uart0: serial@12C00000 { clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; clock-names = "uart", "clk_uart_baud0"; }; - serial@12C10000 { + uart1: serial@12C10000 { clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; clock-names = "uart", "clk_uart_baud0"; }; - serial@12C20000 { + uart2: serial@12C20000 { clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; clock-names = "uart", "clk_uart_baud0"; }; - serial@12C30000 { + uart3: serial@12C30000 { clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; clock-names = "uart", "clk_uart_baud0"; }; - sata@122F0000 { + sata: sata@122F0000 { compatible = "snps,dwc-ahci"; samsung,sata-freq = <66>; reg = <0x122F0000 0x1ff>; @@ -570,7 +570,7 @@ #phy-cells = <1>; }; - usb@12110000 { + ehci: usb@12110000 { compatible = "samsung,exynos4210-ehci"; reg = <0x12110000 0x100>; interrupts = <0 71 0>; @@ -585,7 +585,7 @@ }; }; - usb@12120000 { + ohci: usb@12120000 { compatible = "samsung,exynos4210-ohci"; reg = <0x12120000 0x100>; interrupts = <0 71 0>; @@ -722,7 +722,7 @@ clock-names = "gscl"; }; - hdmi { + hdmi: hdmi { compatible = "samsung,exynos4212-hdmi"; reg = <0x14530000 0x70000>; interrupts = <0 95 0>; @@ -748,14 +748,14 @@ #phy-cells = <0>; }; - dp-controller@145B0000 { + dp: dp-controller@145B0000 { clocks = <&clock CLK_DP>; clock-names = "dp"; phys = <&dp_phy>; phy-names = "dp"; }; - fimd@14400000 { + fimd: fimd@14400000 { clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; clock-names = "sclk_fimd", "fimd"; };
Allows them to be extended by reference. Signed-off-by: Andreas Färber <afaerber@suse.de> --- v6: Split off from Snow/SMDK cleanups (Doug Anderson) arch/arm/boot/dts/exynos5250.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)