Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 88999ceb55bf959e63df0c911915166b005977fc

Authored by Stephen Rothwell
Committed by Paul Mackerras
1 parent 45e2a6e4e5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] Move the identical files from include/asm-ppc{,64} 

Move the identical files from include/asm-ppc{,64}/ to
include/asm-powerpc/.  Remove hdreg.h completely as it is unused in
the tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 23 changed files with 38 additions and 98 deletions Side-by-side Diff

include/asm-powerpc/8253pit.h
Diff comments   View file @ 88999ce
  1 +/*
  2 + * 8253/8254 Programmable Interval Timer
  3 + */
  4 +
  5 +#ifndef _8253PIT_H
  6 +#define _8253PIT_H
  7 +
  8 +#define PIT_TICK_RATE 1193182UL
  9 +
  10 +#endif
include/asm-powerpc/agp.h
Diff comments   View file @ 88999ce
  1 +#ifndef AGP_H
  2 +#define AGP_H 1
  3 +
  4 +#include <asm/io.h>
  5 +
  6 +/* nothing much needed here */
  7 +
  8 +#define map_page_into_agp(page)
  9 +#define unmap_page_from_agp(page)
  10 +#define flush_agp_mappings()
  11 +#define flush_agp_cache() mb()
  12 +
  13 +/* Convert a physical address to an address suitable for the GART. */
  14 +#define phys_to_gart(x) (x)
  15 +#define gart_to_phys(x) (x)
  16 +
  17 +/* GATT allocation. Returns/accepts GATT kernel virtual address. */
  18 +#define alloc_gatt_pages(order) \
  19 + ((char *)__get_free_pages(GFP_KERNEL, (order)))
  20 +#define free_gatt_pages(table, order) \
  21 + free_pages((unsigned long)(table), (order))
  22 +
  23 +#endif
include/asm-powerpc/cputime.h
Diff comments   View file @ 88999ce
  1 +#include <asm-generic/cputime.h>
include/asm-powerpc/div64.h
Diff comments   View file @ 88999ce
  1 +#include <asm-generic/div64.h>
include/asm-powerpc/emergency-restart.h
Diff comments   View file @ 88999ce
  1 +#include <asm-generic/emergency-restart.h>
include/asm-powerpc/ipc.h
Diff comments   View file @ 88999ce
  1 +#include <asm-generic/ipc.h>
include/asm-powerpc/xor.h
Diff comments   View file @ 88999ce
  1 +#include <asm-generic/xor.h>
include/asm-ppc/8253pit.h
View file @ 88999ce
1   -/*
2   - * 8253/8254 Programmable Interval Timer
3   - */
4   -
5   -#ifndef _8253PIT_H
6   -#define _8253PIT_H
7   -
8   -#define PIT_TICK_RATE 1193182UL
9   -
10   -#endif
include/asm-ppc/agp.h
View file @ 88999ce
1   -#ifndef AGP_H
2   -#define AGP_H 1
3   -
4   -#include <asm/io.h>
5   -
6   -/* nothing much needed here */
7   -
8   -#define map_page_into_agp(page)
9   -#define unmap_page_from_agp(page)
10   -#define flush_agp_mappings()
11   -#define flush_agp_cache() mb()
12   -
13   -/* Convert a physical address to an address suitable for the GART. */
14   -#define phys_to_gart(x) (x)
15   -#define gart_to_phys(x) (x)
16   -
17   -/* GATT allocation. Returns/accepts GATT kernel virtual address. */
18   -#define alloc_gatt_pages(order) \
19   - ((char *)__get_free_pages(GFP_KERNEL, (order)))
20   -#define free_gatt_pages(table, order) \
21   - free_pages((unsigned long)(table), (order))
22   -
23   -#endif
include/asm-ppc/cputime.h
View file @ 88999ce
1   -#ifndef __PPC_CPUTIME_H
2   -#define __PPC_CPUTIME_H
3   -
4   -#include <asm-generic/cputime.h>
5   -
6   -#endif /* __PPC_CPUTIME_H */
include/asm-ppc/div64.h
View file @ 88999ce
1   -#include <asm-generic/div64.h>
include/asm-ppc/emergency-restart.h
View file @ 88999ce
1   -#ifndef _ASM_EMERGENCY_RESTART_H
2   -#define _ASM_EMERGENCY_RESTART_H
3   -
4   -#include <asm-generic/emergency-restart.h>
5   -
6   -#endif /* _ASM_EMERGENCY_RESTART_H */
include/asm-ppc/hdreg.h
View file @ 88999ce
1   -#include <asm-generic/hdreg.h>
include/asm-ppc/ipc.h
View file @ 88999ce
1   -#include <asm-generic/ipc.h>
include/asm-ppc/xor.h
View file @ 88999ce
1   -#include <asm-generic/xor.h>
include/asm-ppc64/8253pit.h
View file @ 88999ce
1   -/*
2   - * 8253/8254 Programmable Interval Timer
3   - */
4   -
5   -#ifndef _8253PIT_H
6   -#define _8253PIT_H
7   -
8   -#define PIT_TICK_RATE 1193182UL
9   -
10   -#endif
include/asm-ppc64/agp.h
View file @ 88999ce
1   -#ifndef AGP_H
2   -#define AGP_H 1
3   -
4   -#include <asm/io.h>
5   -
6   -/* nothing much needed here */
7   -
8   -#define map_page_into_agp(page)
9   -#define unmap_page_from_agp(page)
10   -#define flush_agp_mappings()
11   -#define flush_agp_cache() mb()
12   -
13   -/* Convert a physical address to an address suitable for the GART. */
14   -#define phys_to_gart(x) (x)
15   -#define gart_to_phys(x) (x)
16   -
17   -/* GATT allocation. Returns/accepts GATT kernel virtual address. */
18   -#define alloc_gatt_pages(order) \
19   - ((char *)__get_free_pages(GFP_KERNEL, (order)))
20   -#define free_gatt_pages(table, order) \
21   - free_pages((unsigned long)(table), (order))
22   -
23   -#endif
include/asm-ppc64/cputime.h
View file @ 88999ce
1   -#ifndef __PPC_CPUTIME_H
2   -#define __PPC_CPUTIME_H
3   -
4   -#include <asm-generic/cputime.h>
5   -
6   -#endif /* __PPC_CPUTIME_H */
include/asm-ppc64/div64.h
View file @ 88999ce
1   -#include <asm-generic/div64.h>
include/asm-ppc64/emergency-restart.h
View file @ 88999ce
1   -#ifndef _ASM_EMERGENCY_RESTART_H
2   -#define _ASM_EMERGENCY_RESTART_H
3   -
4   -#include <asm-generic/emergency-restart.h>
5   -
6   -#endif /* _ASM_EMERGENCY_RESTART_H */
include/asm-ppc64/hdreg.h
View file @ 88999ce
1   -#include <asm-generic/hdreg.h>
include/asm-ppc64/ipc.h
View file @ 88999ce
1   -#include <asm-generic/ipc.h>
include/asm-ppc64/xor.h
View file @ 88999ce
1   -#include <asm-generic/xor.h>