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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Arnd Bergmann 13 years ago 376249cf 3b6c9440

+7 -5

3 changed files

expand all

arch

arm

boot

dts

imx27-3ds.dts

mach-imx

clk-imx27.c

clk-imx31.c

+1 -1

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

··· 27 27 status = "okay"; 28 28 }; 29 29 30 - uart@1000a000 { 30 + uart1: serial@1000a000 { 31 31 fsl,uart-has-rtscts; 32 32 status = "okay"; 33 33 };

+5 -3

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

··· 223 223 clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0"); 224 224 clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0"); 225 225 clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0"); 226 - clk_register_clkdev(clk[csi_ahb_gate], NULL, "mx2-camera.0"); 226 + clk_register_clkdev(clk[csi_ahb_gate], "ahb", "mx2-camera.0"); 227 227 clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); 228 228 clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); 229 229 clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); ··· 250 250 clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1"); 251 251 clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0"); 252 252 clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad"); 253 - clk_register_clkdev(clk[emma_ahb_gate], "ahb", "imx-emma"); 254 - clk_register_clkdev(clk[emma_ipg_gate], "ipg", "imx-emma"); 253 + clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "mx2-camera.0"); 254 + clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "mx2-camera.0"); 255 + clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0"); 256 + clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0"); 255 257 clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL); 256 258 clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL); 257 259 clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL);

+1 -1

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

··· 130 130 clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0"); 131 131 clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core"); 132 132 clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb"); 133 - clk_register_clkdev(clk[kpp_gate], "kpp", NULL); 133 + clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad"); 134 134 clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0"); 135 135 clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0"); 136 136 clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");