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

Commit 0c831317 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: remove inclusions of platform headers 



With the cleanup done before, we now can simply define base address and
irq as needed in clock driver, to get those platform header inclusions
removed.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 3bec5f81

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

+5 −2
Original line number Diff line number Diff line
@@ -23,10 +23,13 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <dt-bindings/clock/imx1-clock.h>

#include <asm/irq.h>



#include "clk.h"

#include "common.h"

#include "hardware.h"



#define MX1_CCM_BASE_ADDR	0x0021b000

#define MX1_TIM1_BASE_ADDR	0x00220000

#define MX1_TIM1_INT		(NR_IRQS_LEGACY + 59)



static const char *prem_sel_clks[] = { "clk32_premult", "clk16m", };

static const char *clko_sel_clks[] = { "per1", "hclk", "clk48m", "clk16m",

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

+5 −2
Original line number Diff line number Diff line
@@ -15,10 +15,13 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <dt-bindings/clock/imx21-clock.h>

#include <asm/irq.h>



#include "clk.h"

#include "common.h"

#include "hardware.h"



#define MX21_CCM_BASE_ADDR	0x10027000

#define MX21_GPT1_BASE_ADDR	0x10003000

#define MX21_INT_GPT1		(NR_IRQS_LEGACY + 26)



static void __iomem *ccm __initdata;

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

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <linux/of_irq.h>



#include "clk.h"

#include "common.h"

#include "hardware.h"



#define CCM_MPCTL	0x00

#define CCM_UPCTL	0x04

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

+6 −2
Original line number Diff line number Diff line
@@ -5,10 +5,14 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <dt-bindings/clock/imx27-clock.h>

#include <soc/imx/revision.h>

#include <asm/irq.h>



#include "clk.h"

#include "common.h"

#include "hardware.h"



#define MX27_CCM_BASE_ADDR	0x10027000

#define MX27_GPT1_BASE_ADDR	0x10003000

#define MX27_INT_GPT1		(NR_IRQS_LEGACY + 26)



static void __iomem *ccm __initdata;

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

+17 −4
Original line number Diff line number Diff line
@@ -21,12 +21,25 @@ 
#include <linux/io.h>

#include <linux/err.h>

#include <linux/of.h>

#include <soc/imx/revision.h>

#include <asm/irq.h>



#include "clk.h"

#include "common.h"

#include "crmregs-imx3.h"

#include "hardware.h"

#include "mx31.h"



#define MX31_CCM_BASE_ADDR	0x53f80000

#define MX31_GPT1_BASE_ADDR	0x53f90000

#define MX31_INT_GPT		(NR_IRQS_LEGACY + 29)



#define MXC_CCM_CCMR		0x00

#define MXC_CCM_PDR0		0x04

#define MXC_CCM_PDR1		0x08

#define MXC_CCM_MPCTL		0x10

#define MXC_CCM_UPCTL		0x14

#define MXC_CCM_SRPCTL		0x18

#define MXC_CCM_CGR0		0x20

#define MXC_CCM_CGR1		0x24

#define MXC_CCM_CGR2		0x28

#define MXC_CCM_PMCR0		0x5c



static const char *mcu_main_sel[] = { "spll", "mpll", };

static const char *per_sel[] = { "per_div", "ipg", };