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

Commit 1237e598 authored by Philippe Begnic's avatar Philippe Begnic Committed by Mike Turquette
Browse files

clk: ux500: Pass clock base adresses in initcall for u8540 and u9540 



Align on u8500 version, pass clock base address in clk_init functions
for u8540 and u9540.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarPhilippe Begnic <philippe.begnic@st.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 88235988

arch/arm/mach-ux500/cpu.c

+4 −2
Original line number Diff line number Diff line
@@ -76,13 +76,15 @@ void __init ux500_init_irq(void) 
	} else if (cpu_is_u9540()) {

		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);

		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);

		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,

		u9540_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,

			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,

			       U8500_CLKRST6_BASE);

	} else if (cpu_is_u8540()) {

		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K + SZ_4K - 1);

		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K + SZ_4K - 1);

		u8540_clk_init();

		u8540_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,

			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,

			       U8500_CLKRST6_BASE);

	}

}

drivers/clk/ux500/u8540_clk.c

+2 −2
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include <linux/clk-provider.h>

#include <linux/mfd/dbx500-prcmu.h>

#include <linux/platform_data/clk-ux500.h>



#include "clk.h"



void u8540_clk_init(void)

void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,

		    u32 clkrst5_base, u32 clkrst6_base)

{

	/* register clocks here */

}

drivers/clk/ux500/u9540_clk.c

+2 −2
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include <linux/clk-provider.h>

#include <linux/mfd/dbx500-prcmu.h>

#include <linux/platform_data/clk-ux500.h>



#include "clk.h"



void u9540_clk_init(void)

void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,

		    u32 clkrst5_base, u32 clkrst6_base)

{

	/* register clocks here */

}

include/linux/platform_data/clk-ux500.h

+4 −2
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ 


void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,

		    u32 clkrst5_base, u32 clkrst6_base);

void u9540_clk_init(void);

void u8540_clk_init(void);

void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,

		    u32 clkrst5_base, u32 clkrst6_base);

void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,

		    u32 clkrst5_base, u32 clkrst6_base);



#endif /* __CLK_UX500_H */