[ARM] clocklib: Update users of aliases to new API (c1ed406c) · Commits · 戴 / test

arch/arm/mach-pxa/lubbock.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@
		#include <mach/mmc.h>

		#include "generic.h"
		#include "clock.h"
		#include "devices.h"

		static unsigned long lubbock_pin_config[] __initdata = {
		@@ -485,6 +486,7 @@ static void __init lubbock_init(void)

		pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config));

		clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL);
		pxa_set_udc_info(&udc_info);
		set_pxa_fb_info(&sharp_lm8v31);
		pxa_set_mci_info(&lubbock_mci_platform_data);

+1 −9

Original line number	Diff line number	Diff line
		@@ -166,8 +166,7 @@ static struct clk pxa25x_hwuart_clk =
		;

		/*
		* PXA 2xx clock declarations. Order is important (see aliases below)
		* Please be careful not to disrupt the ordering.
		* PXA 2xx clock declarations.
		*/
		static struct clk pxa25x_clks[] = {
		INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev),
		@@ -194,11 +193,6 @@ static struct clk pxa25x_clks[] = {
		INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),
		};

		static struct clk pxa2xx_clk_aliases[] = {
		INIT_CKOTHER("GPIO7_CLK", &pxa25x_clks[4], NULL),
		INIT_CKOTHER("SA1111_CLK", &pxa25x_clks[5], NULL),
		};

		#ifdef CONFIG_PM

		#define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x
		@@ -375,8 +369,6 @@ static int __init pxa25x_init(void)
		if (cpu_is_pxa255())
		ret = platform_device_register(&pxa_device_hwuart);

		clks_register(pxa2xx_clk_aliases, ARRAY_SIZE(pxa2xx_clk_aliases));

		return ret;
		}