[PATCH] ARM: EXYNOS: Remove build warning without enabling PM
Fixed following build warning with exynos4_defconfig. arch/arm/mach-exynos/clock.c:33: warning: 'exynos4_clock_save' defined but not used arch/arm/mach-exynos/clock-exynos4210.c:35: warning: 'exynos4210_clock_save' defined but not used arch/arm/mach-exynos/clock-exynos4212.c:35: warning: 'exynos4212_clock_save' defined but not used Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/clock-exynos4210.c |2 ++ arch/arm/mach-exynos/clock-exynos4212.c |2 ++ arch/arm/mach-exynos/clock.c|2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/clock-exynos4210.c b/arch/arm/mach-exynos/clock-exynos4210.c index a5823a7..13312cc 100644 --- a/arch/arm/mach-exynos/clock-exynos4210.c +++ b/arch/arm/mach-exynos/clock-exynos4210.c @@ -32,6 +32,7 @@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4210_clock_save[] = { SAVE_ITEM(S5P_CLKSRC_IMAGE), SAVE_ITEM(S5P_CLKSRC_LCD1), @@ -42,6 +43,7 @@ static struct sleep_save exynos4210_clock_save[] = { SAVE_ITEM(S5P_CLKGATE_IP_LCD1), SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210), }; +#endif static struct clksrc_clk *sysclks[] = { /* nothing here yet */ diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c index 26a668b..48af285 100644 --- a/arch/arm/mach-exynos/clock-exynos4212.c +++ b/arch/arm/mach-exynos/clock-exynos4212.c @@ -32,12 +32,14 @@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4212_clock_save[] = { SAVE_ITEM(S5P_CLKSRC_IMAGE), SAVE_ITEM(S5P_CLKDIV_IMAGE), SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212), SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212), }; +#endif static struct clk *clk_src_mpll_user_list[] = { [0] = &clk_fin_mpll, diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index 5a8c42e..187287a 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -30,6 +30,7 @@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4_clock_save[] = { SAVE_ITEM(S5P_CLKDIV_LEFTBUS), SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS), @@ -93,6 +94,7 @@ static struct sleep_save exynos4_clock_save[] = { SAVE_ITEM(S5P_CLKGATE_SCLKCPU), SAVE_ITEM(S5P_CLKGATE_IP_CPU), }; +#endif struct clk clk_sclk_hdmi27m = { .name = "sclk_hdmi27m", -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Add alias name of 'fimd' clock for 'lcd' clock
On 1/19/12, Jingoo Han wrote: > This patch adds alias name of 'fimd' clock for 'lcd' clock. While 'lcd' > clock is used for s3c-fb driver, 'fimd' clock is defined for Exynos fimd > ip. Therefore, 'fimd' clock can be called by using clk_add_alias(). Hi, Doesn't it better to add common.c? Are there any reason to add each board files? Thank you, Kyungmin Park > > Cc: Jonghwan Choi > Signed-off-by: Jingoo Han > --- > arch/arm/mach-exynos/mach-nuri.c |2 ++ > arch/arm/mach-exynos/mach-origen.c |2 ++ > arch/arm/mach-exynos/mach-smdkv310.c |2 ++ > arch/arm/mach-exynos/mach-universal_c210.c |3 +++ > 4 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-exynos/mach-nuri.c > b/arch/arm/mach-exynos/mach-nuri.c > index 3df8bf4..06c22e0 100644 > --- a/arch/arm/mach-exynos/mach-nuri.c > +++ b/arch/arm/mach-exynos/mach-nuri.c > @@ -1310,6 +1310,8 @@ static void __init nuri_machine_init(void) > i2c9_devs[I2C9_MAX17042].irq = gpio_to_irq(EXYNOS4_GPX2(3)); > i2c_register_board_info(9, i2c9_devs, ARRAY_SIZE(i2c9_devs)); > > + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); > + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); > s5p_fimd0_set_platdata(&nuri_fb_pdata); > > nuri_camera_init(); > diff --git a/arch/arm/mach-exynos/mach-origen.c > b/arch/arm/mach-exynos/mach-origen.c > index b453464..7cea0be 100644 > --- a/arch/arm/mach-exynos/mach-origen.c > +++ b/arch/arm/mach-exynos/mach-origen.c > @@ -722,6 +722,8 @@ static void __init origen_machine_init(void) > s5p_tv_setup(); > s5p_i2c_hdmiphy_set_platdata(NULL); > > + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); > + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); > s5p_fimd0_set_platdata(&origen_lcd_pdata); > > platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); > diff --git a/arch/arm/mach-exynos/mach-smdkv310.c > b/arch/arm/mach-exynos/mach-smdkv310.c > index bf2094e..eccd96d 100644 > --- a/arch/arm/mach-exynos/mach-smdkv310.c > +++ b/arch/arm/mach-exynos/mach-smdkv310.c > @@ -370,6 +370,8 @@ static void __init smdkv310_machine_init(void) > samsung_keypad_set_platdata(&smdkv310_keypad_data); > > samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); > + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); > + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); > s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); > > smdkv310_ehci_init(); > diff --git a/arch/arm/mach-exynos/mach-universal_c210.c > b/arch/arm/mach-exynos/mach-universal_c210.c > index c38e18d..fe554f1 100644 > --- a/arch/arm/mach-exynos/mach-universal_c210.c > +++ b/arch/arm/mach-exynos/mach-universal_c210.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1029,6 +1030,8 @@ static void __init universal_machine_init(void) > s5p_i2c_hdmiphy_set_platdata(NULL); > i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs)); > > + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); > + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); > s5p_fimd0_set_platdata(&universal_lcd_pdata); > > universal_touchkey_init(); > -- > 1.7.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS: Add alias name of 'fimd' clock for 'lcd' clock
This patch adds alias name of 'fimd' clock for 'lcd' clock. While 'lcd' clock is used for s3c-fb driver, 'fimd' clock is defined for Exynos fimd ip. Therefore, 'fimd' clock can be called by using clk_add_alias(). Cc: Jonghwan Choi Signed-off-by: Jingoo Han --- arch/arm/mach-exynos/mach-nuri.c |2 ++ arch/arm/mach-exynos/mach-origen.c |2 ++ arch/arm/mach-exynos/mach-smdkv310.c |2 ++ arch/arm/mach-exynos/mach-universal_c210.c |3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 3df8bf4..06c22e0 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -1310,6 +1310,8 @@ static void __init nuri_machine_init(void) i2c9_devs[I2C9_MAX17042].irq = gpio_to_irq(EXYNOS4_GPX2(3)); i2c_register_board_info(9, i2c9_devs, ARRAY_SIZE(i2c9_devs)); + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); s5p_fimd0_set_platdata(&nuri_fb_pdata); nuri_camera_init(); diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index b453464..7cea0be 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -722,6 +722,8 @@ static void __init origen_machine_init(void) s5p_tv_setup(); s5p_i2c_hdmiphy_set_platdata(NULL); + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); s5p_fimd0_set_platdata(&origen_lcd_pdata); platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index bf2094e..eccd96d 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c @@ -370,6 +370,8 @@ static void __init smdkv310_machine_init(void) samsung_keypad_set_platdata(&smdkv310_keypad_data); samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); smdkv310_ehci_init(); diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index c38e18d..fe554f1 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -1029,6 +1030,8 @@ static void __init universal_machine_init(void) s5p_i2c_hdmiphy_set_platdata(NULL); i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs)); + dev_set_name(&s5p_device_fimd0.dev, "exynos4-fb.0"); + clk_add_alias("lcd", "exynos4-fb.0", "fimd", &s5p_device_fimd0.dev); s5p_fimd0_set_platdata(&universal_lcd_pdata); universal_touchkey_init(); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html