linux.git/arch/unicore32/include, branch v2.6.39 Linux kernel source tree Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 2011-04-07T18:14:49+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-04-07T18:14:49+00:00 42933bac11e811f02200c944d8562a15f8ec4ff0 * 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings 
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings
unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable 2011-04-02T08:17:38+00:00 Guan Xuetao gxt@mprc.pku.edu.cn 2011-04-01T08:38:59+00:00 6b794743b2c5e21825d35b5d5dd57d6fcc388198 1. get videomemory by __get_free_pages() in fb-puv3.c 2. remove resource reservation for old fixed UNIGFX_MMAP & UVC_MMAP space 3. remove unused macros: PKUNTIY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE, PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE and KUSER_UNIGFX_BASE 4. remove unused header linux/vmalloc.h in fb-puv3.h Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de> 
1. get videomemory by __get_free_pages() in fb-puv3.c
2. remove resource reservation for old fixed UNIGFX_MMAP & UVC_MMAP space
3. remove unused macros: PKUNTIY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE,
	PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE and KUSER_UNIGFX_BASE
4. remove unused header linux/vmalloc.h in fb-puv3.h

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>
unicore32 fix: remove arch-specific futex support 2011-04-02T08:16:37+00:00 Guan Xuetao gxt@mprc.pku.edu.cn 2011-03-29T14:17:42+00:00 0bfdc8e121fd61adbc03848af3ca15fcbef2d1d8 The futex functions in unicore32 are not used and verified, so just replaced by asm-generic version. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de> 
The futex functions in unicore32 are not used and verified,
so just replaced by asm-generic version.

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Fix common misspellings 2011-03-31T14:26:23+00:00 Lucas De Marchi lucas.demarchi@profusion.mobi 2011-03-31T01:57:33+00:00 25985edcedea6396277003854657b5f3cb31a628 Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> 
Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
unicore32: rewrite arch-specific tlb.h to use asm-generic version 2011-03-17T01:19:21+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-03-04T12:00:11+00:00 289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> 
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs 2011-03-17T01:19:21+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-03-04T10:07:48+00:00 1cf46c42d7688a2e09de87fc9201b0e9a0961866 1. remove __REG macro 2. add (void __iomem *) to io_p2v macro 3. add (phys_addr_t) to io_v2p macro 4. add PKUNITY_AHB_BASE and PKUNITY_APB_BASE definitions 5. modify all PKUNITY_mmio_BASEs from physical addr to virtual addr 6. adjust prefix macro for all usage of PKUNITY_mmio_BASEs -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de> 
1. remove __REG macro
2. add (void __iomem *) to io_p2v macro
3. add (phys_addr_t) to io_v2p macro
4. add PKUNITY_AHB_BASE and PKUNITY_APB_BASE definitions
5. modify all PKUNITY_mmio_BASEs from physical addr to virtual addr
6. adjust prefix macro for all usage of PKUNITY_mmio_BASEs
  -- by advice with Arnd Bergmann

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
unicore32: replace unicore32-specific iomap functions with generic lib implementation 2011-03-17T01:19:21+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-02-27T04:46:06+00:00 4fde87cb13a29c06e0b4c2cba86445492098fbc2 1. define and enable CONFIG_GENERIC_IOMAP 2. define unicore32-specific PCI_IOBASE for asm-generic/io.h 3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros 4. remove all unicore32-specific iomap functions Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-and-Acked-by: Arnd Bergmann <arnd@arndb.de> 
1. define and enable CONFIG_GENERIC_IOMAP
2. define unicore32-specific PCI_IOBASE for asm-generic/io.h
3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros
4. remove all unicore32-specific iomap functions

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Reviewed-and-Acked-by: Arnd Bergmann <arnd@arndb.de>
unicore32 machine related: add frame buffer driver for pkunity-v3 soc 2011-03-17T01:19:20+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-02-26T13:39:10+00:00 ce443ab5fd536941da1d529ba3963324f941fc29 change from original version -- by advice of Paul Mundt 1. remove videomemorysize definitions 2. remove unifb_enable and unifb_setup 3. use dev_warn instead of printk in fb driver 4. remove judgement for FB_ACCEL_PUV3_UNIGFX 5. adjust clk_get and clk_set_rate calls 6. add resources definitions 7. remove unifb_option 8. adjust register for platform_device 9. adjust unifb_ops position and unifb_regs assignment position Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de> 
change from original version -- by advice of Paul Mundt
1. remove videomemorysize definitions
2. remove unifb_enable and unifb_setup
3. use dev_warn instead of printk in fb driver
4. remove judgement for FB_ACCEL_PUV3_UNIGFX
5. adjust clk_get and clk_set_rate calls
6. add resources definitions
7. remove unifb_option
8. adjust register for platform_device
9. adjust unifb_ops position and unifb_regs assignment position

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>
unicore32 io: redefine __REG(x) and re-use readl/writel funcs 2011-03-17T01:19:19+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-02-26T13:21:18+00:00 e5abf78b57199a417eb01ff922a5ea6ff9e10b61 -- by advice of Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de> 
  -- by advice of Arnd Bergmann

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE 2011-03-17T01:19:17+00:00 GuanXuetao gxt@mprc.pku.edu.cn 2011-02-26T12:49:47+00:00 bd42aa75b4231b5fd3742de4c4b84ad590a7d654 for the term IOSPACE normally refers to the PCI PIO space -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> 
for the term IOSPACE normally refers to the PCI PIO space
  -- by advice with Arnd Bergmann

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>