| Message ID | 20120706054818.GF20503@S2101-09.ap.freescale.net |
|---|---|
| State | New |
| Headers | show |
On Friday 06 July 2012, Shawn Guo wrote: > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > are available in the git repository at: > git://git.linaro.org/people/shawnguo/linux-2.6.git imx/dt-for-3.6 Pulled all five new branches. It's very cool that you have been able to add support for the imx23-olinuxino by adding just a dts file. There was one trivial merge conflict in imx6, see the resolution below. Arnd diff --cc arch/arm/mach-imx/clk-imx6q.c index abb42e7,0bb8555..cabbbb7 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@@ -391,6 -392,15 +392,12 @@@ int __init mx6q_clocks_init(void clk_register_clkdev(clk[gpt_ipg], "ipg", "imx-gpt.0"); clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0"); clk_register_clkdev(clk[twd], NULL, "smp_twd"); - clk_register_clkdev(clk[usboh3], NULL, "usboh3"); + clk_register_clkdev(clk[apbh_dma], NULL, "110000.dma-apbh"); + clk_register_clkdev(clk[per1_bch], "per1_bch", "112000.gpmi-nand"); + clk_register_clkdev(clk[gpmi_bch_apb], "gpmi_bch_apb", "112000.gpmi-nand"); + clk_register_clkdev(clk[gpmi_bch], "gpmi_bch", "112000.gpmi-nand"); + clk_register_clkdev(clk[gpmi_apb], "gpmi_apb", "112000.gpmi-nand"); + clk_register_clkdev(clk[gpmi_io], "gpmi_io", "112000.gpmi-nand"); clk_register_clkdev(clk[uart_serial], "per", "2020000.serial"); clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial"); clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
On Fri, Jul 06, 2012 at 07:23:58PM +0000, Arnd Bergmann wrote: > On Friday 06 July 2012, Shawn Guo wrote: > > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > > > are available in the git repository at: > > git://git.linaro.org/people/shawnguo/linux-2.6.git imx/dt-for-3.6 > > Pulled all five new branches. > Thanks, Arnd. > It's very cool that you have been able to add support for the > imx23-olinuxino by adding just a dts file. > > There was one trivial merge conflict in imx6, see the resolution below. > It's all right.
Hi Arnd, Olof, Please pull the following imx6 device tree related changes for 3.6. Regards, Shawn The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git imx/dt-for-3.6 Huang Shijie (4): ARM: imx6q: add DT node for apbh-dma ARM: imx6q: add clock for apbh-dma ARM: imx6q: add DT node for gpmi nand ARM: imx6q: add clocks for gpmi-nand Marc Kleine-Budde (1): ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q arch/arm/boot/dts/imx6q-arm2.dts | 6 +++++ arch/arm/boot/dts/imx6q.dtsi | 41 ++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/Kconfig | 4 +++ arch/arm/mach-imx/clk-imx6q.c | 11 ++++++++- 4 files changed, 60 insertions(+), 2 deletions(-)