Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376249cf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

ARM i.MX fixes for 3.6-rc

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  i.MX27: Fix emma-prp and csi clocks.
  ARM: clk-imx31: Fix the keypad clock name
  ARM: dts: imx27-3ds.dts: Fix serial console node
parents 3b6c9440 9de76b6d

arch/arm/boot/dts/imx27-3ds.dts

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
				status = "okay";

			};



			uart@1000a000 {

			uart1: serial@1000a000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};

arch/arm/mach-imx/clk-imx27.c

+5 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[csi_ahb_gate], NULL, "mx2-camera.0");

	clk_register_clkdev(clk[csi_ahb_gate], "ahb", "mx2-camera.0");

	clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc");
@@ -250,8 +250,10 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1");

	clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0");

	clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad");

	clk_register_clkdev(clk[emma_ahb_gate], "ahb", "imx-emma");

	clk_register_clkdev(clk[emma_ipg_gate], "ipg", "imx-emma");

	clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "mx2-camera.0");

	clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "mx2-camera.0");

	clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0");

	clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0");

	clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL);

	clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL);

	clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL);

arch/arm/mach-imx/clk-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int __init mx31_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");

	clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");

	clk_register_clkdev(clk[kpp_gate], "kpp", NULL);

	clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");

	clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");