tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: arch-shmobile: only run FSI init on respective boards
ARM: arch-shmobile: only run HDMI init on respective boards
ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL

Linus Torvalds 17445739 26cf4457

+13 -20
+7 -12
arch/arm/mach-shmobile/board-ap4evb.c
··· 947 947 &ap4evb_camera, 948 948 }; 949 949 950 - static int __init hdmi_init_pm_clock(void) 950 + static void __init hdmi_init_pm_clock(void) 951 951 { 952 952 struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick"); 953 953 int ret; ··· 988 988 pr_debug("PLLC2 set frequency %lu\n", rate); 989 989 990 990 ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk); 991 - if (ret < 0) { 991 + if (ret < 0) 992 992 pr_err("Cannot set HDMI parent: %d\n", ret); 993 - goto out; 994 - } 995 993 996 994 out: 997 995 if (!IS_ERR(hdmi_ick)) 998 996 clk_put(hdmi_ick); 999 - return ret; 1000 997 } 1001 998 1002 - device_initcall(hdmi_init_pm_clock); 1003 - 1004 - static int __init fsi_init_pm_clock(void) 999 + static void __init fsi_init_pm_clock(void) 1005 1000 { 1006 1001 struct clk *fsia_ick; 1007 1002 int ret; ··· 1005 1010 if (IS_ERR(fsia_ick)) { 1006 1011 ret = PTR_ERR(fsia_ick); 1007 1012 pr_err("Cannot get FSI ICK: %d\n", ret); 1008 - return ret; 1013 + return; 1009 1014 } 1010 1015 1011 1016 ret = clk_set_parent(fsia_ick, &sh7372_fsiack_clk); ··· 1013 1018 pr_err("Cannot set FSI-A parent: %d\n", ret); 1014 1019 1015 1020 clk_put(fsia_ick); 1016 - 1017 - return ret; 1018 1021 } 1019 - device_initcall(fsi_init_pm_clock); 1020 1022 1021 1023 /* 1022 1024 * FIXME !! ··· 1340 1348 __raw_writel(srcr4 & ~(1 << 13), SRCR4); 1341 1349 1342 1350 platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices)); 1351 + 1352 + hdmi_init_pm_clock(); 1353 + fsi_init_pm_clock(); 1343 1354 } 1344 1355 1345 1356 static void __init ap4evb_timer_init(void)
+4 -6
arch/arm/mach-shmobile/board-mackerel.c
··· 423 423 .name = "sh_fsi2_b_hdmi", 424 424 }; 425 425 426 - static int __init hdmi_init_pm_clock(void) 426 + static void __init hdmi_init_pm_clock(void) 427 427 { 428 428 struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick"); 429 429 int ret; ··· 467 467 pr_debug("PLLC2 set frequency %lu\n", rate); 468 468 469 469 ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk); 470 - if (ret < 0) { 470 + if (ret < 0) 471 471 pr_err("Cannot set HDMI parent: %d\n", ret); 472 - goto out; 473 - } 474 472 475 473 out: 476 474 if (!IS_ERR(hdmi_ick)) 477 475 clk_put(hdmi_ick); 478 - return ret; 479 476 } 480 - device_initcall(hdmi_init_pm_clock); 481 477 482 478 /* USB1 (Host) */ 483 479 static void usb1_host_port_power(int port, int power) ··· 1214 1218 sh7372_add_standard_devices(); 1215 1219 1216 1220 platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices)); 1221 + 1222 + hdmi_init_pm_clock(); 1217 1223 } 1218 1224 1219 1225 static void __init mackerel_timer_init(void)
+1 -1
arch/arm/mach-shmobile/include/mach/mmc.h
··· 9 9 10 10 #ifdef CONFIG_MACH_AP4EVB 11 11 #include "mach/mmc-ap4eb.h" 12 - #elif CONFIG_MACH_MACKEREL 12 + #elif defined(CONFIG_MACH_MACKEREL) 13 13 #include "mach/mmc-mackerel.h" 14 14 #else 15 15 #error "unsupported board."
+1 -1
arch/arm/mach-shmobile/include/mach/zboot.h
··· 13 13 #ifdef CONFIG_MACH_AP4EVB 14 14 #define MACH_TYPE MACH_TYPE_AP4EVB 15 15 #include "mach/head-ap4evb.txt" 16 - #elif CONFIG_MACH_MACKEREL 16 + #elif defined(CONFIG_MACH_MACKEREL) 17 17 #define MACH_TYPE MACH_TYPE_MACKEREL 18 18 #include "mach/head-mackerel.txt" 19 19 #else