Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
f4b8b319
Commit
f4b8b319
authored
Jan 14, 2010
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: Realview/Versatile/Integrator: separate out common clock code
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
c5a0adb5
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
33 additions
and
181 deletions
+33
-181
arch/arm/Kconfig
arch/arm/Kconfig
+6
-0
arch/arm/Makefile
arch/arm/Makefile
+1
-0
arch/arm/mach-integrator/Makefile
arch/arm/mach-integrator/Makefile
+1
-1
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/Makefile
+1
-1
arch/arm/mach-realview/clock.c
arch/arm/mach-realview/clock.c
+0
-64
arch/arm/mach-realview/clock.h
arch/arm/mach-realview/clock.h
+0
-20
arch/arm/mach-realview/core.c
arch/arm/mach-realview/core.c
+1
-1
arch/arm/mach-realview/include/mach/clkdev.h
arch/arm/mach-realview/include/mach/clkdev.h
+9
-0
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_eb.c
+0
-1
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb1176.c
+0
-1
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pb11mp.c
+0
-1
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pba8.c
+0
-1
arch/arm/mach-versatile/Makefile
arch/arm/mach-versatile/Makefile
+1
-1
arch/arm/mach-versatile/clock.c
arch/arm/mach-versatile/clock.c
+0
-65
arch/arm/mach-versatile/clock.h
arch/arm/mach-versatile/clock.h
+0
-21
arch/arm/mach-versatile/core.c
arch/arm/mach-versatile/core.c
+1
-1
arch/arm/mach-versatile/include/mach/clkdev.h
arch/arm/mach-versatile/include/mach/clkdev.h
+9
-0
arch/arm/plat-versatile/Makefile
arch/arm/plat-versatile/Makefile
+1
-0
arch/arm/plat-versatile/clock.c
arch/arm/plat-versatile/clock.c
+2
-2
No files found.
arch/arm/Kconfig
View file @
f4b8b319
...
@@ -243,6 +243,7 @@ config ARCH_INTEGRATOR
...
@@ -243,6 +243,7 @@ config ARCH_INTEGRATOR
select ICST
select ICST
select GENERIC_TIME
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select GENERIC_CLOCKEVENTS
select PLAT_VERSATILE
help
help
Support for ARM's Integrator platform.
Support for ARM's Integrator platform.
...
@@ -255,6 +256,7 @@ config ARCH_REALVIEW
...
@@ -255,6 +256,7 @@ config ARCH_REALVIEW
select GENERIC_TIME
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_WANT_OPTIONAL_GPIOLIB
select PLAT_VERSATILE
help
help
This enables support for ARM Ltd RealView boards.
This enables support for ARM Ltd RealView boards.
...
@@ -268,6 +270,7 @@ config ARCH_VERSATILE
...
@@ -268,6 +270,7 @@ config ARCH_VERSATILE
select GENERIC_TIME
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_WANT_OPTIONAL_GPIOLIB
select PLAT_VERSATILE
help
help
This enables support for ARM Ltd Versatile board.
This enables support for ARM Ltd Versatile board.
...
@@ -938,6 +941,9 @@ config PLAT_ORION
...
@@ -938,6 +941,9 @@ config PLAT_ORION
config PLAT_PXA
config PLAT_PXA
bool
bool
config PLAT_VERSATILE
bool
source arch/arm/mm/Kconfig
source arch/arm/mm/Kconfig
config IWMMXT
config IWMMXT
...
...
arch/arm/Makefile
View file @
f4b8b319
...
@@ -192,6 +192,7 @@ plat-$(CONFIG_PLAT_PXA) := pxa
...
@@ -192,6 +192,7 @@ plat-$(CONFIG_PLAT_PXA) := pxa
plat-$(CONFIG_PLAT_S3C24XX)
:=
s3c24xx samsung
plat-$(CONFIG_PLAT_S3C24XX)
:=
s3c24xx samsung
plat-$(CONFIG_PLAT_S5PC1XX)
:=
s5pc1xx samsung
plat-$(CONFIG_PLAT_S5PC1XX)
:=
s5pc1xx samsung
plat-$(CONFIG_PLAT_S5P)
:=
s5p samsung
plat-$(CONFIG_PLAT_S5P)
:=
s5p samsung
plat-$(CONFIG_PLAT_VERSATILE)
:=
versatile
ifeq
($(CONFIG_ARCH_EBSA110),y)
ifeq
($(CONFIG_ARCH_EBSA110),y)
# This is what happens if you forget the IOCS16 line.
# This is what happens if you forget the IOCS16 line.
...
...
arch/arm/mach-integrator/Makefile
View file @
f4b8b319
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
# Object file lists.
# Object file lists.
obj-y
:=
c
lock.o c
ore.o lm.o
obj-y
:=
core.o lm.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP)
+=
integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP)
+=
integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP)
+=
integrator_cp.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP)
+=
integrator_cp.o
...
...
arch/arm/mach-realview/Makefile
View file @
f4b8b319
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
# Makefile for the linux kernel.
#
#
obj-y
:=
core.o
clock.o
obj-y
:=
core.o
obj-$(CONFIG_MACH_REALVIEW_EB)
+=
realview_eb.o
obj-$(CONFIG_MACH_REALVIEW_EB)
+=
realview_eb.o
obj-$(CONFIG_MACH_REALVIEW_PB11MP)
+=
realview_pb11mp.o
obj-$(CONFIG_MACH_REALVIEW_PB11MP)
+=
realview_pb11mp.o
obj-$(CONFIG_MACH_REALVIEW_PB1176)
+=
realview_pb1176.o
obj-$(CONFIG_MACH_REALVIEW_PB1176)
+=
realview_pb1176.o
...
...
arch/arm/mach-realview/clock.c
deleted
100644 → 0
View file @
c5a0adb5
/*
* linux/arch/arm/mach-realview/clock.c
*
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/string.h>
#include <linux/clk.h>
#include <linux/mutex.h>
#include <asm/hardware/icst.h>
#include "clock.h"
int
clk_enable
(
struct
clk
*
clk
)
{
return
0
;
}
EXPORT_SYMBOL
(
clk_enable
);
void
clk_disable
(
struct
clk
*
clk
)
{
}
EXPORT_SYMBOL
(
clk_disable
);
unsigned
long
clk_get_rate
(
struct
clk
*
clk
)
{
return
clk
->
rate
;
}
EXPORT_SYMBOL
(
clk_get_rate
);
long
clk_round_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
struct
icst_vco
vco
;
vco
=
icst_hz_to_vco
(
clk
->
params
,
rate
);
return
icst_hz
(
clk
->
params
,
vco
);
}
EXPORT_SYMBOL
(
clk_round_rate
);
int
clk_set_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
int
ret
=
-
EIO
;
if
(
clk
->
setvco
)
{
struct
icst_vco
vco
;
vco
=
icst_hz_to_vco
(
clk
->
params
,
rate
);
clk
->
rate
=
icst_hz
(
clk
->
params
,
vco
);
clk
->
setvco
(
clk
,
vco
);
ret
=
0
;
}
return
ret
;
}
EXPORT_SYMBOL
(
clk_set_rate
);
arch/arm/mach-realview/clock.h
deleted
100644 → 0
View file @
c5a0adb5
/*
* linux/arch/arm/mach-realview/clock.h
*
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <asm/hardware/icst.h>
struct
module
;
struct
clk
{
unsigned
long
rate
;
const
struct
icst_params
*
params
;
void
*
data
;
void
(
*
setvco
)(
struct
clk
*
,
struct
icst_vco
vco
);
};
arch/arm/mach-realview/core.c
View file @
f4b8b319
...
@@ -48,11 +48,11 @@
...
@@ -48,11 +48,11 @@
#include <asm/hardware/gic.h>
#include <asm/hardware/gic.h>
#include <mach/clkdev.h>
#include <mach/platform.h>
#include <mach/platform.h>
#include <mach/irqs.h>
#include <mach/irqs.h>
#include "core.h"
#include "core.h"
#include "clock.h"
#define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET)
#define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET)
...
...
arch/arm/mach-realview/include/mach/clkdev.h
View file @
f4b8b319
#ifndef __ASM_MACH_CLKDEV_H
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#include <asm/hardware/icst.h>
struct
clk
{
unsigned
long
rate
;
const
struct
icst_params
*
params
;
u32
oscoff
;
void
(
*
setvco
)(
struct
clk
*
,
struct
icst_vco
vco
);
};
#define __clk_get(clk) ({ 1; })
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#define __clk_put(clk) do { } while (0)
...
...
arch/arm/mach-realview/realview_eb.c
View file @
f4b8b319
...
@@ -43,7 +43,6 @@
...
@@ -43,7 +43,6 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include "core.h"
#include "core.h"
#include "clock.h"
static
struct
map_desc
realview_eb_io_desc
[]
__initdata
=
{
static
struct
map_desc
realview_eb_io_desc
[]
__initdata
=
{
{
{
...
...
arch/arm/mach-realview/realview_pb1176.c
View file @
f4b8b319
...
@@ -43,7 +43,6 @@
...
@@ -43,7 +43,6 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include "core.h"
#include "core.h"
#include "clock.h"
static
struct
map_desc
realview_pb1176_io_desc
[]
__initdata
=
{
static
struct
map_desc
realview_pb1176_io_desc
[]
__initdata
=
{
{
{
...
...
arch/arm/mach-realview/realview_pb11mp.c
View file @
f4b8b319
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include "core.h"
#include "core.h"
#include "clock.h"
static
struct
map_desc
realview_pb11mp_io_desc
[]
__initdata
=
{
static
struct
map_desc
realview_pb11mp_io_desc
[]
__initdata
=
{
{
{
...
...
arch/arm/mach-realview/realview_pba8.c
View file @
f4b8b319
...
@@ -41,7 +41,6 @@
...
@@ -41,7 +41,6 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include "core.h"
#include "core.h"
#include "clock.h"
static
struct
map_desc
realview_pba8_io_desc
[]
__initdata
=
{
static
struct
map_desc
realview_pba8_io_desc
[]
__initdata
=
{
{
{
...
...
arch/arm/mach-versatile/Makefile
View file @
f4b8b319
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
# Makefile for the linux kernel.
#
#
obj-y
:=
core.o
clock.o
obj-y
:=
core.o
obj-$(CONFIG_ARCH_VERSATILE_PB)
+=
versatile_pb.o
obj-$(CONFIG_ARCH_VERSATILE_PB)
+=
versatile_pb.o
obj-$(CONFIG_MACH_VERSATILE_AB)
+=
versatile_ab.o
obj-$(CONFIG_MACH_VERSATILE_AB)
+=
versatile_ab.o
obj-$(CONFIG_PCI)
+=
pci.o
obj-$(CONFIG_PCI)
+=
pci.o
arch/arm/mach-versatile/clock.c
deleted
100644 → 0
View file @
c5a0adb5
/*
* linux/arch/arm/mach-versatile/clock.c
*
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/string.h>
#include <linux/clk.h>
#include <linux/mutex.h>
#include <asm/clkdev.h>
#include <asm/hardware/icst.h>
#include "clock.h"
int
clk_enable
(
struct
clk
*
clk
)
{
return
0
;
}
EXPORT_SYMBOL
(
clk_enable
);
void
clk_disable
(
struct
clk
*
clk
)
{
}
EXPORT_SYMBOL
(
clk_disable
);
unsigned
long
clk_get_rate
(
struct
clk
*
clk
)
{
return
clk
->
rate
;
}
EXPORT_SYMBOL
(
clk_get_rate
);
long
clk_round_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
struct
icst_vco
vco
;
vco
=
icst_hz_to_vco
(
clk
->
params
,
rate
);
return
icst_hz
(
clk
->
params
,
vco
);
}
EXPORT_SYMBOL
(
clk_round_rate
);
int
clk_set_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
int
ret
=
-
EIO
;
if
(
clk
->
setvco
)
{
struct
icst_vco
vco
;
vco
=
icst_hz_to_vco
(
clk
->
params
,
rate
);
clk
->
rate
=
icst_hz
(
clk
->
params
,
vco
);
clk
->
setvco
(
clk
,
vco
);
ret
=
0
;
}
return
ret
;
}
EXPORT_SYMBOL
(
clk_set_rate
);
arch/arm/mach-versatile/clock.h
deleted
100644 → 0
View file @
c5a0adb5
/*
* linux/arch/arm/mach-versatile/clock.h
*
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <asm/hardware/icst.h>
struct
module
;
struct
clk
{
unsigned
long
rate
;
const
struct
icst_params
*
params
;
u32
oscoff
;
void
*
data
;
void
(
*
setvco
)(
struct
clk
*
,
struct
icst_vco
vco
);
};
arch/arm/mach-versatile/core.c
View file @
f4b8b319
...
@@ -47,11 +47,11 @@
...
@@ -47,11 +47,11 @@
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <mach/clkdev.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/platform.h>
#include "core.h"
#include "core.h"
#include "clock.h"
/*
/*
* All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
* All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
...
...
arch/arm/mach-versatile/include/mach/clkdev.h
View file @
f4b8b319
#ifndef __ASM_MACH_CLKDEV_H
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#include <asm/hardware/icst.h>
struct
clk
{
unsigned
long
rate
;
const
struct
icst_params
*
params
;
u32
oscoff
;
void
(
*
setvco
)(
struct
clk
*
,
struct
icst_vco
vco
);
};
#define __clk_get(clk) ({ 1; })
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#define __clk_put(clk) do { } while (0)
...
...
arch/arm/plat-versatile/Makefile
0 → 100644
View file @
f4b8b319
obj-y
:=
clock.o
arch/arm/
mach-integrator
/clock.c
→
arch/arm/
plat-versatile
/clock.c
View file @
f4b8b319
/*
/*
* linux/arch/arm/
mach-integrator
/clock.c
* linux/arch/arm/
plat-versatile
/clock.c
*
*
* Copyright (C) 2004 ARM Limited.
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
* Written by Deep Blue Solutions Limited.
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
#include <linux/mutex.h>
#include <linux/mutex.h>
#include <asm/hardware/icst.h>
#include <asm/hardware/icst.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <mach/clkdev.h>
int
clk_enable
(
struct
clk
*
clk
)
int
clk_enable
(
struct
clk
*
clk
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment