aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS106
-rw-r--r--arch/arm/common/vic.c1
-rw-r--r--arch/arm/include/asm/cache.h2
-rw-r--r--arch/arm/lib/copy_page.S16
-rw-r--r--arch/arm/mach-pxa/spitz.c1
-rw-r--r--arch/arm/mach-s3c2410/Kconfig5
-rw-r--r--arch/arm/mach-s3c2412/Kconfig3
-rw-r--r--arch/arm/mach-s3c2440/Kconfig6
-rw-r--r--arch/arm/mach-s3c6400/Kconfig1
-rw-r--r--arch/arm/mach-s3c6410/Kconfig1
-rw-r--r--arch/arm/mm/Kconfig5
-rw-r--r--arch/arm/plat-s3c/gpio.c2
-rw-r--r--arch/arm/plat-s3c64xx/dma.c6
-rw-r--r--arch/arm/plat-s3c64xx/include/plat/dma-plat.h2
-rw-r--r--arch/arm/plat-s3c64xx/include/plat/irqs.h10
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c8
-rw-r--r--arch/arm/plat-stmp3xxx/dma.c2
-rw-r--r--arch/arm/tools/mach-types20
18 files changed, 121 insertions, 76 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e613c6dd709f..c7e91b05cf51 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -497,7 +497,7 @@ F: arch/arm/include/asm/floppy.h
497 497
498ARM PORT 498ARM PORT
499M: Russell King <linux@arm.linux.org.uk> 499M: Russell King <linux@arm.linux.org.uk>
500L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 500L: linux-arm-kernel@lists.infradead.org
501W: http://www.arm.linux.org.uk/ 501W: http://www.arm.linux.org.uk/
502S: Maintained 502S: Maintained
503F: arch/arm/ 503F: arch/arm/
@@ -508,36 +508,36 @@ F: drivers/mmc/host/mmci.*
508 508
509ARM/ADI ROADRUNNER MACHINE SUPPORT 509ARM/ADI ROADRUNNER MACHINE SUPPORT
510M: Lennert Buytenhek <kernel@wantstofly.org> 510M: Lennert Buytenhek <kernel@wantstofly.org>
511L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 511L: linux-arm-kernel@lists.infradead.org
512S: Maintained 512S: Maintained
513F: arch/arm/mach-ixp23xx/ 513F: arch/arm/mach-ixp23xx/
514F: arch/arm/mach-ixp23xx/include/mach/ 514F: arch/arm/mach-ixp23xx/include/mach/
515 515
516ARM/ADS SPHERE MACHINE SUPPORT 516ARM/ADS SPHERE MACHINE SUPPORT
517M: Lennert Buytenhek <kernel@wantstofly.org> 517M: Lennert Buytenhek <kernel@wantstofly.org>
518L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 518L: linux-arm-kernel@lists.infradead.org
519S: Maintained 519S: Maintained
520 520
521ARM/AFEB9260 MACHINE SUPPORT 521ARM/AFEB9260 MACHINE SUPPORT
522M: Sergey Lapin <slapin@ossfans.org> 522M: Sergey Lapin <slapin@ossfans.org>
523L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 523L: linux-arm-kernel@lists.infradead.org
524S: Maintained 524S: Maintained
525 525
526ARM/AJECO 1ARM MACHINE SUPPORT 526ARM/AJECO 1ARM MACHINE SUPPORT
527M: Lennert Buytenhek <kernel@wantstofly.org> 527M: Lennert Buytenhek <kernel@wantstofly.org>
528L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 528L: linux-arm-kernel@lists.infradead.org
529S: Maintained 529S: Maintained
530 530
531ARM/ATMEL AT91RM9200 ARM ARCHITECTURE 531ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
532M: Andrew Victor <linux@maxim.org.za> 532M: Andrew Victor <linux@maxim.org.za>
533L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 533L: linux-arm-kernel@lists.infradead.org
534W: http://maxim.org.za/at91_26.html 534W: http://maxim.org.za/at91_26.html
535S: Maintained 535S: Maintained
536 536
537ARM/BCMRING ARM ARCHITECTURE 537ARM/BCMRING ARM ARCHITECTURE
538M: Leo Chen <leochen@broadcom.com> 538M: Leo Chen <leochen@broadcom.com>
539M: Scott Branden <sbranden@broadcom.com> 539M: Scott Branden <sbranden@broadcom.com>
540L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 540L: linux-arm-kernel@lists.infradead.org
541S: Maintained 541S: Maintained
542F: arch/arm/mach-bcmring 542F: arch/arm/mach-bcmring
543 543
@@ -554,25 +554,25 @@ F: drivers/mtd/nand/nand_bcm_umi.h
554ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE 554ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
555M: Hartley Sweeten <hsweeten@visionengravers.com> 555M: Hartley Sweeten <hsweeten@visionengravers.com>
556M: Ryan Mallon <ryan@bluewatersys.com> 556M: Ryan Mallon <ryan@bluewatersys.com>
557L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 557L: linux-arm-kernel@lists.infradead.org
558S: Maintained 558S: Maintained
559F: arch/arm/mach-ep93xx/ 559F: arch/arm/mach-ep93xx/
560F: arch/arm/mach-ep93xx/include/mach/ 560F: arch/arm/mach-ep93xx/include/mach/
561 561
562ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT 562ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
563M: Lennert Buytenhek <kernel@wantstofly.org> 563M: Lennert Buytenhek <kernel@wantstofly.org>
564L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 564L: linux-arm-kernel@lists.infradead.org
565S: Maintained 565S: Maintained
566 566
567ARM/CLKDEV SUPPORT 567ARM/CLKDEV SUPPORT
568M: Russell King <linux@arm.linux.org.uk> 568M: Russell King <linux@arm.linux.org.uk>
569L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 569L: linux-arm-kernel@lists.infradead.org
570F: arch/arm/common/clkdev.c 570F: arch/arm/common/clkdev.c
571F: arch/arm/include/asm/clkdev.h 571F: arch/arm/include/asm/clkdev.h
572 572
573ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT 573ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
574M: Mike Rapoport <mike@compulab.co.il> 574M: Mike Rapoport <mike@compulab.co.il>
575L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 575L: linux-arm-kernel@lists.infradead.org
576S: Maintained 576S: Maintained
577 577
578ARM/CORGI MACHINE SUPPORT 578ARM/CORGI MACHINE SUPPORT
@@ -581,14 +581,14 @@ S: Maintained
581 581
582ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE 582ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
583M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> 583M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
584L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 584L: linux-arm-kernel@lists.infradead.org
585T: git git://gitorious.org/linux-gemini/mainline.git 585T: git git://gitorious.org/linux-gemini/mainline.git
586S: Maintained 586S: Maintained
587F: arch/arm/mach-gemini/ 587F: arch/arm/mach-gemini/
588 588
589ARM/EBSA110 MACHINE SUPPORT 589ARM/EBSA110 MACHINE SUPPORT
590M: Russell King <linux@arm.linux.org.uk> 590M: Russell King <linux@arm.linux.org.uk>
591L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 591L: linux-arm-kernel@lists.infradead.org
592W: http://www.arm.linux.org.uk/ 592W: http://www.arm.linux.org.uk/
593S: Maintained 593S: Maintained
594F: arch/arm/mach-ebsa110/ 594F: arch/arm/mach-ebsa110/
@@ -606,13 +606,13 @@ F: arch/arm/mach-pxa/ezx.c
606 606
607ARM/FARADAY FA526 PORT 607ARM/FARADAY FA526 PORT
608M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> 608M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
609L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 609L: linux-arm-kernel@lists.infradead.org
610S: Maintained 610S: Maintained
611F: arch/arm/mm/*-fa* 611F: arch/arm/mm/*-fa*
612 612
613ARM/FOOTBRIDGE ARCHITECTURE 613ARM/FOOTBRIDGE ARCHITECTURE
614M: Russell King <linux@arm.linux.org.uk> 614M: Russell King <linux@arm.linux.org.uk>
615L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 615L: linux-arm-kernel@lists.infradead.org
616W: http://www.arm.linux.org.uk/ 616W: http://www.arm.linux.org.uk/
617S: Maintained 617S: Maintained
618F: arch/arm/include/asm/hardware/dec21285.h 618F: arch/arm/include/asm/hardware/dec21285.h
@@ -620,17 +620,17 @@ F: arch/arm/mach-footbridge/
620 620
621ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 621ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
622M: Sascha Hauer <kernel@pengutronix.de> 622M: Sascha Hauer <kernel@pengutronix.de>
623L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 623L: linux-arm-kernel@lists.infradead.org
624S: Maintained 624S: Maintained
625 625
626ARM/GLOMATION GESBC9312SX MACHINE SUPPORT 626ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
627M: Lennert Buytenhek <kernel@wantstofly.org> 627M: Lennert Buytenhek <kernel@wantstofly.org>
628L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 628L: linux-arm-kernel@lists.infradead.org
629S: Maintained 629S: Maintained
630 630
631ARM/GUMSTIX MACHINE SUPPORT 631ARM/GUMSTIX MACHINE SUPPORT
632M: Steve Sakoman <sakoman@gmail.com> 632M: Steve Sakoman <sakoman@gmail.com>
633L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 633L: linux-arm-kernel@lists.infradead.org
634S: Maintained 634S: Maintained
635 635
636ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT 636ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
@@ -650,55 +650,55 @@ F: arch/arm/mach-sa1100/include/mach/jornada720.h
650ARM/INTEL IOP32X ARM ARCHITECTURE 650ARM/INTEL IOP32X ARM ARCHITECTURE
651M: Lennert Buytenhek <kernel@wantstofly.org> 651M: Lennert Buytenhek <kernel@wantstofly.org>
652M: Dan Williams <dan.j.williams@intel.com> 652M: Dan Williams <dan.j.williams@intel.com>
653L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 653L: linux-arm-kernel@lists.infradead.org
654S: Supported 654S: Supported
655 655
656ARM/INTEL IOP33X ARM ARCHITECTURE 656ARM/INTEL IOP33X ARM ARCHITECTURE
657M: Dan Williams <dan.j.williams@intel.com> 657M: Dan Williams <dan.j.williams@intel.com>
658L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 658L: linux-arm-kernel@lists.infradead.org
659S: Supported 659S: Supported
660 660
661ARM/INTEL IOP13XX ARM ARCHITECTURE 661ARM/INTEL IOP13XX ARM ARCHITECTURE
662M: Lennert Buytenhek <kernel@wantstofly.org> 662M: Lennert Buytenhek <kernel@wantstofly.org>
663M: Dan Williams <dan.j.williams@intel.com> 663M: Dan Williams <dan.j.williams@intel.com>
664L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 664L: linux-arm-kernel@lists.infradead.org
665S: Supported 665S: Supported
666 666
667ARM/INTEL IQ81342EX MACHINE SUPPORT 667ARM/INTEL IQ81342EX MACHINE SUPPORT
668M: Lennert Buytenhek <kernel@wantstofly.org> 668M: Lennert Buytenhek <kernel@wantstofly.org>
669M: Dan Williams <dan.j.williams@intel.com> 669M: Dan Williams <dan.j.williams@intel.com>
670L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 670L: linux-arm-kernel@lists.infradead.org
671S: Supported 671S: Supported
672 672
673ARM/INTEL IXP2000 ARM ARCHITECTURE 673ARM/INTEL IXP2000 ARM ARCHITECTURE
674M: Lennert Buytenhek <kernel@wantstofly.org> 674M: Lennert Buytenhek <kernel@wantstofly.org>
675L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 675L: linux-arm-kernel@lists.infradead.org
676S: Maintained 676S: Maintained
677 677
678ARM/INTEL IXDP2850 MACHINE SUPPORT 678ARM/INTEL IXDP2850 MACHINE SUPPORT
679M: Lennert Buytenhek <kernel@wantstofly.org> 679M: Lennert Buytenhek <kernel@wantstofly.org>
680L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 680L: linux-arm-kernel@lists.infradead.org
681S: Maintained 681S: Maintained
682 682
683ARM/INTEL IXP23XX ARM ARCHITECTURE 683ARM/INTEL IXP23XX ARM ARCHITECTURE
684M: Lennert Buytenhek <kernel@wantstofly.org> 684M: Lennert Buytenhek <kernel@wantstofly.org>
685L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 685L: linux-arm-kernel@lists.infradead.org
686S: Maintained 686S: Maintained
687 687
688ARM/INTEL XSC3 (MANZANO) ARM CORE 688ARM/INTEL XSC3 (MANZANO) ARM CORE
689M: Lennert Buytenhek <kernel@wantstofly.org> 689M: Lennert Buytenhek <kernel@wantstofly.org>
690M: Dan Williams <dan.j.williams@intel.com> 690M: Dan Williams <dan.j.williams@intel.com>
691L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 691L: linux-arm-kernel@lists.infradead.org
692S: Supported 692S: Supported
693 693
694ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT 694ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
695M: Lennert Buytenhek <kernel@wantstofly.org> 695M: Lennert Buytenhek <kernel@wantstofly.org>
696L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 696L: linux-arm-kernel@lists.infradead.org
697S: Maintained 697S: Maintained
698 698
699ARM/LOGICPD PXA270 MACHINE SUPPORT 699ARM/LOGICPD PXA270 MACHINE SUPPORT
700M: Lennert Buytenhek <kernel@wantstofly.org> 700M: Lennert Buytenhek <kernel@wantstofly.org>
701L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 701L: linux-arm-kernel@lists.infradead.org
702S: Maintained 702S: Maintained
703 703
704ARM/MAGICIAN MACHINE SUPPORT 704ARM/MAGICIAN MACHINE SUPPORT
@@ -708,7 +708,7 @@ S: Maintained
708ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support 708ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
709M: Lennert Buytenhek <buytenh@marvell.com> 709M: Lennert Buytenhek <buytenh@marvell.com>
710M: Nicolas Pitre <nico@marvell.com> 710M: Nicolas Pitre <nico@marvell.com>
711L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 711L: linux-arm-kernel@lists.infradead.org
712T: git git://git.marvell.com/orion 712T: git git://git.marvell.com/orion
713S: Maintained 713S: Maintained
714F: arch/arm/mach-loki/ 714F: arch/arm/mach-loki/
@@ -719,7 +719,7 @@ F: arch/arm/plat-orion/
719 719
720ARM/MIOA701 MACHINE SUPPORT 720ARM/MIOA701 MACHINE SUPPORT
721M: Robert Jarzmik <robert.jarzmik@free.fr> 721M: Robert Jarzmik <robert.jarzmik@free.fr>
722L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 722L: linux-arm-kernel@lists.infradead.org
723F: arch/arm/mach-pxa/mioa701.c 723F: arch/arm/mach-pxa/mioa701.c
724S: Maintained 724S: Maintained
725 725
@@ -760,18 +760,18 @@ S: Maintained
760 760
761ARM/PT DIGITAL BOARD PORT 761ARM/PT DIGITAL BOARD PORT
762M: Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de> 762M: Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
763L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 763L: linux-arm-kernel@lists.infradead.org
764W: http://www.arm.linux.org.uk/ 764W: http://www.arm.linux.org.uk/
765S: Maintained 765S: Maintained
766 766
767ARM/RADISYS ENP2611 MACHINE SUPPORT 767ARM/RADISYS ENP2611 MACHINE SUPPORT
768M: Lennert Buytenhek <kernel@wantstofly.org> 768M: Lennert Buytenhek <kernel@wantstofly.org>
769L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 769L: linux-arm-kernel@lists.infradead.org
770S: Maintained 770S: Maintained
771 771
772ARM/RISCPC ARCHITECTURE 772ARM/RISCPC ARCHITECTURE
773M: Russell King <linux@arm.linux.org.uk> 773M: Russell King <linux@arm.linux.org.uk>
774L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 774L: linux-arm-kernel@lists.infradead.org
775W: http://www.arm.linux.org.uk/ 775W: http://www.arm.linux.org.uk/
776S: Maintained 776S: Maintained
777F: arch/arm/common/time-acorn.c 777F: arch/arm/common/time-acorn.c
@@ -790,7 +790,7 @@ S: Maintained
790 790
791ARM/SAMSUNG ARM ARCHITECTURES 791ARM/SAMSUNG ARM ARCHITECTURES
792M: Ben Dooks <ben-linux@fluff.org> 792M: Ben Dooks <ben-linux@fluff.org>
793L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 793L: linux-arm-kernel@lists.infradead.org
794W: http://www.fluff.org/ben/linux/ 794W: http://www.fluff.org/ben/linux/
795S: Maintained 795S: Maintained
796F: arch/arm/plat-s3c/ 796F: arch/arm/plat-s3c/
@@ -798,65 +798,65 @@ F: arch/arm/plat-s3c24xx/
798 798
799ARM/S3C2410 ARM ARCHITECTURE 799ARM/S3C2410 ARM ARCHITECTURE
800M: Ben Dooks <ben-linux@fluff.org> 800M: Ben Dooks <ben-linux@fluff.org>
801L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 801L: linux-arm-kernel@lists.infradead.org
802W: http://www.fluff.org/ben/linux/ 802W: http://www.fluff.org/ben/linux/
803S: Maintained 803S: Maintained
804F: arch/arm/mach-s3c2410/ 804F: arch/arm/mach-s3c2410/
805 805
806ARM/S3C2440 ARM ARCHITECTURE 806ARM/S3C2440 ARM ARCHITECTURE
807M: Ben Dooks <ben-linux@fluff.org> 807M: Ben Dooks <ben-linux@fluff.org>
808L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 808L: linux-arm-kernel@lists.infradead.org
809W: http://www.fluff.org/ben/linux/ 809W: http://www.fluff.org/ben/linux/
810S: Maintained 810S: Maintained
811F: arch/arm/mach-s3c2440/ 811F: arch/arm/mach-s3c2440/
812 812
813ARM/S3C2442 ARM ARCHITECTURE 813ARM/S3C2442 ARM ARCHITECTURE
814M: Ben Dooks <ben-linux@fluff.org> 814M: Ben Dooks <ben-linux@fluff.org>
815L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 815L: linux-arm-kernel@lists.infradead.org
816W: http://www.fluff.org/ben/linux/ 816W: http://www.fluff.org/ben/linux/
817S: Maintained 817S: Maintained
818F: arch/arm/mach-s3c2442/ 818F: arch/arm/mach-s3c2442/
819 819
820ARM/S3C2443 ARM ARCHITECTURE 820ARM/S3C2443 ARM ARCHITECTURE
821M: Ben Dooks <ben-linux@fluff.org> 821M: Ben Dooks <ben-linux@fluff.org>
822L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 822L: linux-arm-kernel@lists.infradead.org
823W: http://www.fluff.org/ben/linux/ 823W: http://www.fluff.org/ben/linux/
824S: Maintained 824S: Maintained
825F: arch/arm/mach-s3c2443/ 825F: arch/arm/mach-s3c2443/
826 826
827ARM/S3C6400 ARM ARCHITECTURE 827ARM/S3C6400 ARM ARCHITECTURE
828M: Ben Dooks <ben-linux@fluff.org> 828M: Ben Dooks <ben-linux@fluff.org>
829L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 829L: linux-arm-kernel@lists.infradead.org
830W: http://www.fluff.org/ben/linux/ 830W: http://www.fluff.org/ben/linux/
831S: Maintained 831S: Maintained
832F: arch/arm/mach-s3c6400/ 832F: arch/arm/mach-s3c6400/
833 833
834ARM/S3C6410 ARM ARCHITECTURE 834ARM/S3C6410 ARM ARCHITECTURE
835M: Ben Dooks <ben-linux@fluff.org> 835M: Ben Dooks <ben-linux@fluff.org>
836L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 836L: linux-arm-kernel@lists.infradead.org
837W: http://www.fluff.org/ben/linux/ 837W: http://www.fluff.org/ben/linux/
838S: Maintained 838S: Maintained
839F: arch/arm/mach-s3c6410/ 839F: arch/arm/mach-s3c6410/
840 840
841ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT 841ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
842M: Lennert Buytenhek <kernel@wantstofly.org> 842M: Lennert Buytenhek <kernel@wantstofly.org>
843L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 843L: linux-arm-kernel@lists.infradead.org
844S: Maintained 844S: Maintained
845 845
846ARM/THECUS N2100 MACHINE SUPPORT 846ARM/THECUS N2100 MACHINE SUPPORT
847M: Lennert Buytenhek <kernel@wantstofly.org> 847M: Lennert Buytenhek <kernel@wantstofly.org>
848L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 848L: linux-arm-kernel@lists.infradead.org
849S: Maintained 849S: Maintained
850 850
851ARM/NUVOTON W90X900 ARM ARCHITECTURE 851ARM/NUVOTON W90X900 ARM ARCHITECTURE
852M: Wan ZongShun <mcuos.com@gmail.com> 852M: Wan ZongShun <mcuos.com@gmail.com>
853L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 853L: linux-arm-kernel@lists.infradead.org
854W: http://www.mcuos.com 854W: http://www.mcuos.com
855S: Maintained 855S: Maintained
856 856
857ARM/VFP SUPPORT 857ARM/VFP SUPPORT
858M: Russell King <linux@arm.linux.org.uk> 858M: Russell King <linux@arm.linux.org.uk>
859L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 859L: linux-arm-kernel@lists.infradead.org
860W: http://www.arm.linux.org.uk/ 860W: http://www.arm.linux.org.uk/
861S: Maintained 861S: Maintained
862F: arch/arm/vfp/ 862F: arch/arm/vfp/
@@ -963,7 +963,7 @@ F: include/linux/atm*
963 963
964ATMEL AT91 MCI DRIVER 964ATMEL AT91 MCI DRIVER
965M: Nicolas Ferre <nicolas.ferre@atmel.com> 965M: Nicolas Ferre <nicolas.ferre@atmel.com>
966L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 966L: linux-arm-kernel@lists.infradead.org
967W: http://www.atmel.com/products/AT91/ 967W: http://www.atmel.com/products/AT91/
968W: http://www.at91.com/ 968W: http://www.at91.com/
969S: Maintained 969S: Maintained
@@ -1541,7 +1541,7 @@ F: drivers/infiniband/hw/cxgb3/
1541 1541
1542CYBERPRO FB DRIVER 1542CYBERPRO FB DRIVER
1543M: Russell King <linux@arm.linux.org.uk> 1543M: Russell King <linux@arm.linux.org.uk>
1544L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 1544L: linux-arm-kernel@lists.infradead.org
1545W: http://www.arm.linux.org.uk/ 1545W: http://www.arm.linux.org.uk/
1546S: Maintained 1546S: Maintained
1547F: drivers/video/cyber2000fb.* 1547F: drivers/video/cyber2000fb.*
@@ -2086,7 +2086,7 @@ F: drivers/i2c/busses/i2c-cpm.c
2086FREESCALE IMX / MXC FRAMEBUFFER DRIVER 2086FREESCALE IMX / MXC FRAMEBUFFER DRIVER
2087M: Sascha Hauer <kernel@pengutronix.de> 2087M: Sascha Hauer <kernel@pengutronix.de>
2088L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) 2088L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
2089L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 2089L: linux-arm-kernel@lists.infradead.org
2090S: Maintained 2090S: Maintained
2091F: arch/arm/plat-mxc/include/mach/imxfb.h 2091F: arch/arm/plat-mxc/include/mach/imxfb.h
2092F: drivers/video/imxfb.c 2092F: drivers/video/imxfb.c
@@ -3450,7 +3450,7 @@ F: include/linux/meye.h
3450 3450
3451MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER 3451MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
3452M: Pavel Pisa <ppisa@pikron.com> 3452M: Pavel Pisa <ppisa@pikron.com>
3453L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 3453L: linux-arm-kernel@lists.infradead.org
3454S: Maintained 3454S: Maintained
3455F: drivers/mmc/host/imxmmc.* 3455F: drivers/mmc/host/imxmmc.*
3456 3456
@@ -4169,7 +4169,7 @@ F: drivers/media/video/pvrusb2/
4169PXA2xx/PXA3xx SUPPORT 4169PXA2xx/PXA3xx SUPPORT
4170M: Eric Miao <eric.y.miao@gmail.com> 4170M: Eric Miao <eric.y.miao@gmail.com>
4171M: Russell King <linux@arm.linux.org.uk> 4171M: Russell King <linux@arm.linux.org.uk>
4172L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 4172L: linux-arm-kernel@lists.infradead.org
4173S: Maintained 4173S: Maintained
4174F: arch/arm/mach-pxa/ 4174F: arch/arm/mach-pxa/
4175F: drivers/pcmcia/pxa2xx* 4175F: drivers/pcmcia/pxa2xx*
@@ -4182,13 +4182,13 @@ F: sound/soc/pxa
4182PXA168 SUPPORT 4182PXA168 SUPPORT
4183M: Eric Miao <eric.y.miao@gmail.com> 4183M: Eric Miao <eric.y.miao@gmail.com>
4184M: Jason Chagas <jason.chagas@marvell.com> 4184M: Jason Chagas <jason.chagas@marvell.com>
4185L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 4185L: linux-arm-kernel@lists.infradead.org
4186T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git 4186T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
4187S: Maintained 4187S: Maintained
4188 4188
4189PXA910 SUPPORT 4189PXA910 SUPPORT
4190M: Eric Miao <eric.y.miao@gmail.com> 4190M: Eric Miao <eric.y.miao@gmail.com>
4191L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 4191L: linux-arm-kernel@lists.infradead.org
4192T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git 4192T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
4193S: Maintained 4193S: Maintained
4194 4194
@@ -4429,7 +4429,7 @@ F: net/iucv/
4429 4429
4430S3C24XX SD/MMC Driver 4430S3C24XX SD/MMC Driver
4431M: Ben Dooks <ben-linux@fluff.org> 4431M: Ben Dooks <ben-linux@fluff.org>
4432L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 4432L: linux-arm-kernel@lists.infradead.org
4433S: Supported 4433S: Supported
4434F: drivers/mmc/host/s3cmci.* 4434F: drivers/mmc/host/s3cmci.*
4435 4435
@@ -4625,7 +4625,7 @@ F: drivers/misc/sgi-xp/
4625SHARP LH SUPPORT (LH7952X & LH7A40X) 4625SHARP LH SUPPORT (LH7952X & LH7A40X)
4626M: Marc Singer <elf@buici.com> 4626M: Marc Singer <elf@buici.com>
4627W: http://projects.buici.com/arm 4627W: http://projects.buici.com/arm
4628L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 4628L: linux-arm-kernel@lists.infradead.org
4629S: Maintained 4629S: Maintained
4630F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen 4630F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
4631F: arch/arm/mach-lh7a40x/ 4631F: arch/arm/mach-lh7a40x/
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 920ced0b73c5..f232941de8ab 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -22,6 +22,7 @@
22#include <linux/list.h> 22#include <linux/list.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <linux/sysdev.h> 24#include <linux/sysdev.h>
25#include <linux/device.h>
25#include <linux/amba/bus.h> 26#include <linux/amba/bus.h>
26 27
27#include <asm/mach/irq.h> 28#include <asm/mach/irq.h>
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
index feaa75f0013e..66c160b8547f 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -4,7 +4,7 @@
4#ifndef __ASMARM_CACHE_H 4#ifndef __ASMARM_CACHE_H
5#define __ASMARM_CACHE_H 5#define __ASMARM_CACHE_H
6 6
7#define L1_CACHE_SHIFT 5 7#define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
8#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 8#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9 9
10/* 10/*
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 6ae04db1ca4f..6ee2f6706f86 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -12,8 +12,9 @@
12#include <linux/linkage.h> 12#include <linux/linkage.h>
13#include <asm/assembler.h> 13#include <asm/assembler.h>
14#include <asm/asm-offsets.h> 14#include <asm/asm-offsets.h>
15#include <asm/cache.h>
15 16
16#define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) 17#define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 ))
17 18
18 .text 19 .text
19 .align 5 20 .align 5
@@ -26,17 +27,16 @@
26ENTRY(copy_page) 27ENTRY(copy_page)
27 stmfd sp!, {r4, lr} @ 2 28 stmfd sp!, {r4, lr} @ 2
28 PLD( pld [r1, #0] ) 29 PLD( pld [r1, #0] )
29 PLD( pld [r1, #32] ) 30 PLD( pld [r1, #L1_CACHE_BYTES] )
30 mov r2, #COPY_COUNT @ 1 31 mov r2, #COPY_COUNT @ 1
31 ldmia r1!, {r3, r4, ip, lr} @ 4+1 32 ldmia r1!, {r3, r4, ip, lr} @ 4+1
321: PLD( pld [r1, #64] ) 331: PLD( pld [r1, #2 * L1_CACHE_BYTES])
33 PLD( pld [r1, #96] ) 34 PLD( pld [r1, #3 * L1_CACHE_BYTES])
342: stmia r0!, {r3, r4, ip, lr} @ 4 352:
35 ldmia r1!, {r3, r4, ip, lr} @ 4+1 36 .rept (2 * L1_CACHE_BYTES / 16 - 1)
36 stmia r0!, {r3, r4, ip, lr} @ 4
37 ldmia r1!, {r3, r4, ip, lr} @ 4+1
38 stmia r0!, {r3, r4, ip, lr} @ 4 37 stmia r0!, {r3, r4, ip, lr} @ 4
39 ldmia r1!, {r3, r4, ip, lr} @ 4 38 ldmia r1!, {r3, r4, ip, lr} @ 4
39 .endr
40 subs r2, r2, #1 @ 1 40 subs r2, r2, #1 @ 1
41 stmia r0!, {r3, r4, ip, lr} @ 4 41 stmia r0!, {r3, r4, ip, lr} @ 4
42 ldmgtia r1!, {r3, r4, ip, lr} @ 4 42 ldmgtia r1!, {r3, r4, ip, lr} @ 4
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index dda310fe71c8..08d08f4a3836 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -296,6 +296,7 @@ static struct ads7846_platform_data spitz_ads7846_info = {
296 .vref_delay_usecs = 100, 296 .vref_delay_usecs = 100,
297 .x_plate_ohms = 419, 297 .x_plate_ohms = 419,
298 .y_plate_ohms = 486, 298 .y_plate_ohms = 486,
299 .pressure_max = 1024,
299 .gpio_pendown = SPITZ_GPIO_TP_INT, 300 .gpio_pendown = SPITZ_GPIO_TP_INT,
300 .wait_for_sync = spitz_wait_for_hsync, 301 .wait_for_sync = spitz_wait_for_hsync,
301}; 302};
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index d8c023d4df30..3d4e9da3fa52 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -77,6 +77,7 @@ config ARCH_H1940
77 select CPU_S3C2410 77 select CPU_S3C2410
78 select PM_H1940 if PM 78 select PM_H1940 if PM
79 select S3C_DEV_USB_HOST 79 select S3C_DEV_USB_HOST
80 select S3C_DEV_NAND
80 help 81 help
81 Say Y here if you are using the HP IPAQ H1940 82 Say Y here if you are using the HP IPAQ H1940
82 83
@@ -89,6 +90,7 @@ config MACH_N30
89 bool "Acer N30 family" 90 bool "Acer N30 family"
90 select CPU_S3C2410 91 select CPU_S3C2410
91 select S3C_DEV_USB_HOST 92 select S3C_DEV_USB_HOST
93 select S3C_DEV_NAND
92 help 94 help
93 Say Y here if you want suppt for the Acer N30, Acer N35, 95 Say Y here if you want suppt for the Acer N30, Acer N35,
94 Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. 96 Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
@@ -103,6 +105,7 @@ config ARCH_BAST
103 select S3C24XX_DCLK 105 select S3C24XX_DCLK
104 select ISA 106 select ISA
105 select S3C_DEV_USB_HOST 107 select S3C_DEV_USB_HOST
108 select S3C_DEV_NAND
106 help 109 help
107 Say Y here if you are using the Simtec Electronics EB2410ITX 110 Say Y here if you are using the Simtec Electronics EB2410ITX
108 development board (also known as BAST) 111 development board (also known as BAST)
@@ -111,6 +114,7 @@ config MACH_OTOM
111 bool "NexVision OTOM Board" 114 bool "NexVision OTOM Board"
112 select CPU_S3C2410 115 select CPU_S3C2410
113 select S3C_DEV_USB_HOST 116 select S3C_DEV_USB_HOST
117 select S3C_DEV_NAND
114 help 118 help
115 Say Y here if you are using the Nex Vision OTOM board 119 Say Y here if you are using the Nex Vision OTOM board
116 120
@@ -154,6 +158,7 @@ config MACH_QT2410
154 bool "QT2410" 158 bool "QT2410"
155 select CPU_S3C2410 159 select CPU_S3C2410
156 select S3C_DEV_USB_HOST 160 select S3C_DEV_USB_HOST
161 select S3C_DEV_NAND
157 help 162 help
158 Say Y here if you are using the Armzone QT2410 163 Say Y here if you are using the Armzone QT2410
159 164
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
index 35c1bde89cf2..c2bdc4635d12 100644
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
@@ -48,6 +48,7 @@ config MACH_JIVE
48 bool "Logitech Jive" 48 bool "Logitech Jive"
49 select CPU_S3C2412 49 select CPU_S3C2412
50 select S3C_DEV_USB_HOST 50 select S3C_DEV_USB_HOST
51 select S3C_DEV_NAND
51 help 52 help
52 Say Y here if you are using the Logitech Jive. 53 Say Y here if you are using the Logitech Jive.
53 54
@@ -61,6 +62,7 @@ config MACH_SMDK2413
61 select MACH_S3C2413 62 select MACH_S3C2413
62 select MACH_SMDK 63 select MACH_SMDK
63 select S3C_DEV_USB_HOST 64 select S3C_DEV_USB_HOST
65 select S3C_DEV_NAND
64 help 66 help
65 Say Y here if you are using an SMDK2413 67 Say Y here if you are using an SMDK2413
66 68
@@ -84,6 +86,7 @@ config MACH_VSTMS
84 bool "VMSTMS" 86 bool "VMSTMS"
85 select CPU_S3C2412 87 select CPU_S3C2412
86 select S3C_DEV_USB_HOST 88 select S3C_DEV_USB_HOST
89 select S3C_DEV_NAND
87 help 90 help
88 Say Y here if you are using an VSTMS board 91 Say Y here if you are using an VSTMS board
89 92
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 8ae1b288f7fa..d7bba919a77e 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -48,6 +48,7 @@ config MACH_OSIRIS
48 select S3C2440_XTAL_12000000 48 select S3C2440_XTAL_12000000
49 select S3C2410_IOTIMING if S3C2440_CPUFREQ 49 select S3C2410_IOTIMING if S3C2440_CPUFREQ
50 select S3C_DEV_USB_HOST 50 select S3C_DEV_USB_HOST
51 select S3C_DEV_NAND
51 help 52 help
52 Say Y here if you are using the Simtec IM2440D20 module, also 53 Say Y here if you are using the Simtec IM2440D20 module, also
53 known as the Osiris. 54 known as the Osiris.
@@ -57,6 +58,7 @@ config MACH_RX3715
57 select CPU_S3C2440 58 select CPU_S3C2440
58 select S3C2440_XTAL_16934400 59 select S3C2440_XTAL_16934400
59 select PM_H1940 if PM 60 select PM_H1940 if PM
61 select S3C_DEV_NAND
60 help 62 help
61 Say Y here if you are using the HP iPAQ rx3715. 63 Say Y here if you are using the HP iPAQ rx3715.
62 64
@@ -66,6 +68,7 @@ config ARCH_S3C2440
66 select S3C2440_XTAL_16934400 68 select S3C2440_XTAL_16934400
67 select MACH_SMDK 69 select MACH_SMDK
68 select S3C_DEV_USB_HOST 70 select S3C_DEV_USB_HOST
71 select S3C_DEV_NAND
69 help 72 help
70 Say Y here if you are using the SMDK2440. 73 Say Y here if you are using the SMDK2440.
71 74
@@ -74,6 +77,7 @@ config MACH_NEXCODER_2440
74 select CPU_S3C2440 77 select CPU_S3C2440
75 select S3C2440_XTAL_12000000 78 select S3C2440_XTAL_12000000
76 select S3C_DEV_USB_HOST 79 select S3C_DEV_USB_HOST
80 select S3C_DEV_NAND
77 help 81 help
78 Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board 82 Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
79 83
@@ -88,6 +92,7 @@ config MACH_AT2440EVB
88 bool "Avantech AT2440EVB development board" 92 bool "Avantech AT2440EVB development board"
89 select CPU_S3C2440 93 select CPU_S3C2440
90 select S3C_DEV_USB_HOST 94 select S3C_DEV_USB_HOST
95 select S3C_DEV_NAND
91 help 96 help
92 Say Y here if you are using the AT2440EVB development board 97 Say Y here if you are using the AT2440EVB development board
93 98
@@ -97,6 +102,7 @@ config MACH_MINI2440
97 select EEPROM_AT24 102 select EEPROM_AT24
98 select LEDS_TRIGGER_BACKLIGHT 103 select LEDS_TRIGGER_BACKLIGHT
99 select SND_S3C24XX_SOC_S3C24XX_UDA134X 104 select SND_S3C24XX_SOC_S3C24XX_UDA134X
105 select S3C_DEV_NAND
100 help 106 help
101 Say Y here to select support for the MINI2440. Is a 10cm x 10cm board 107 Say Y here to select support for the MINI2440. Is a 10cm x 10cm board
102 available via various sources. It can come with a 3.5" or 7" touch LCD. 108 available via various sources. It can come with a 3.5" or 7" touch LCD.
diff --git a/arch/arm/mach-s3c6400/Kconfig b/arch/arm/mach-s3c6400/Kconfig
index f5af212066c3..770b72067e3d 100644
--- a/arch/arm/mach-s3c6400/Kconfig
+++ b/arch/arm/mach-s3c6400/Kconfig
@@ -26,6 +26,7 @@ config MACH_SMDK6400
26 bool "SMDK6400" 26 bool "SMDK6400"
27 select CPU_S3C6400 27 select CPU_S3C6400
28 select S3C_DEV_HSMMC 28 select S3C_DEV_HSMMC
29 select S3C_DEV_NAND
29 select S3C6400_SETUP_SDHCI 30 select S3C6400_SETUP_SDHCI
30 help 31 help
31 Machine support for the Samsung SMDK6400 32 Machine support for the Samsung SMDK6400
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index f9d0f09f9761..53fc3ff657f7 100644
--- a/arch/arm/mach-s3c6410/Kconfig
+++ b/arch/arm/mach-s3c6410/Kconfig
@@ -102,6 +102,7 @@ config MACH_HMT
102 bool "Airgoo HMT" 102 bool "Airgoo HMT"
103 select CPU_S3C6410 103 select CPU_S3C6410
104 select S3C_DEV_FB 104 select S3C_DEV_FB
105 select S3C_DEV_NAND
105 select S3C_DEV_USB_HOST 106 select S3C_DEV_USB_HOST
106 select S3C64XX_SETUP_FB_24BPP 107 select S3C64XX_SETUP_FB_24BPP
107 select HAVE_PWM 108 select HAVE_PWM
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 5fe595aeba69..8d43e58f9244 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -771,3 +771,8 @@ config CACHE_XSC3L2
771 select OUTER_CACHE 771 select OUTER_CACHE
772 help 772 help
773 This option enables the L2 cache on XScale3. 773 This option enables the L2 cache on XScale3.
774
775config ARM_L1_CACHE_SHIFT
776 int
777 default 6 if ARCH_OMAP3
778 default 5
diff --git a/arch/arm/plat-s3c/gpio.c b/arch/arm/plat-s3c/gpio.c
index 260fdc6ad685..5ff24e0f9f89 100644
--- a/arch/arm/plat-s3c/gpio.c
+++ b/arch/arm/plat-s3c/gpio.c
@@ -28,7 +28,7 @@ static __init void s3c_gpiolib_track(struct s3c_gpio_chip *chip)
28 28
29 gpn = chip->chip.base; 29 gpn = chip->chip.base;
30 for (i = 0; i < chip->chip.ngpio; i++, gpn++) { 30 for (i = 0; i < chip->chip.ngpio; i++, gpn++) {
31 BUG_ON(gpn > ARRAY_SIZE(s3c_gpios)); 31 BUG_ON(gpn >= ARRAY_SIZE(s3c_gpios));
32 s3c_gpios[gpn] = chip; 32 s3c_gpios[gpn] = chip;
33 } 33 }
34} 34}
diff --git a/arch/arm/plat-s3c64xx/dma.c b/arch/arm/plat-s3c64xx/dma.c
index 67aa93dbb69e..266a10745a85 100644
--- a/arch/arm/plat-s3c64xx/dma.c
+++ b/arch/arm/plat-s3c64xx/dma.c
@@ -345,13 +345,13 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
345 if (!chan) 345 if (!chan)
346 return -EINVAL; 346 return -EINVAL;
347 347
348 buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_KERNEL); 348 buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_ATOMIC);
349 if (!buff) { 349 if (!buff) {
350 printk(KERN_ERR "%s: no memory for buffer\n", __func__); 350 printk(KERN_ERR "%s: no memory for buffer\n", __func__);
351 return -ENOMEM; 351 return -ENOMEM;
352 } 352 }
353 353
354 lli = dma_pool_alloc(dma_pool, GFP_KERNEL, &buff->lli_dma); 354 lli = dma_pool_alloc(dma_pool, GFP_ATOMIC, &buff->lli_dma);
355 if (!lli) { 355 if (!lli) {
356 printk(KERN_ERR "%s: no memory for lli\n", __func__); 356 printk(KERN_ERR "%s: no memory for lli\n", __func__);
357 ret = -ENOMEM; 357 ret = -ENOMEM;
@@ -697,7 +697,7 @@ static int __init s3c64xx_dma_init(void)
697 697
698 printk(KERN_INFO "%s: Registering DMA channels\n", __func__); 698 printk(KERN_INFO "%s: Registering DMA channels\n", __func__);
699 699
700 dma_pool = dma_pool_create("DMA-LLI", NULL, 32, 16, 0); 700 dma_pool = dma_pool_create("DMA-LLI", NULL, sizeof(struct pl080s_lli), 16, 0);
701 if (!dma_pool) { 701 if (!dma_pool) {
702 printk(KERN_ERR "%s: failed to create pool\n", __func__); 702 printk(KERN_ERR "%s: failed to create pool\n", __func__);
703 return -ENOMEM; 703 return -ENOMEM;
diff --git a/arch/arm/plat-s3c64xx/include/plat/dma-plat.h b/arch/arm/plat-s3c64xx/include/plat/dma-plat.h
index 0c30dd986725..8f76a1e474d6 100644
--- a/arch/arm/plat-s3c64xx/include/plat/dma-plat.h
+++ b/arch/arm/plat-s3c64xx/include/plat/dma-plat.h
@@ -26,7 +26,7 @@ struct s3c64xx_dma_buff {
26 struct s3c64xx_dma_buff *next; 26 struct s3c64xx_dma_buff *next;
27 27
28 void *pw; 28 void *pw;
29 struct pl080_lli *lli; 29 struct pl080s_lli *lli;
30 dma_addr_t lli_dma; 30 dma_addr_t lli_dma;
31}; 31};
32 32
diff --git a/arch/arm/plat-s3c64xx/include/plat/irqs.h b/arch/arm/plat-s3c64xx/include/plat/irqs.h
index 743a70094d04..7956fd3bb194 100644
--- a/arch/arm/plat-s3c64xx/include/plat/irqs.h
+++ b/arch/arm/plat-s3c64xx/include/plat/irqs.h
@@ -194,9 +194,17 @@
194 194
195#define IRQ_EINT_GROUP(group, no) (IRQ_EINT_GROUP##group##_BASE + (no)) 195#define IRQ_EINT_GROUP(group, no) (IRQ_EINT_GROUP##group##_BASE + (no))
196 196
197/* Define a group of interrupts for board-specific use (eg, for MFD
198 * interrupt controllers). */
199#define IRQ_BOARD_START (IRQ_EINT_GROUP9_BASE + IRQ_EINT_GROUP9_NR + 1)
200
201#define IRQ_BOARD_NR 16
202
203#define IRQ_BOARD_END (IRQ_BOARD_START + IRQ_BOARD_NR)
204
197/* Set the default NR_IRQS */ 205/* Set the default NR_IRQS */
198 206
199#define NR_IRQS (IRQ_EINT_GROUP9_BASE + IRQ_EINT_GROUP9_NR + 1) 207#define NR_IRQS (IRQ_BOARD_END + 1)
200 208
201#endif /* __ASM_PLAT_S3C64XX_IRQS_H */ 209#endif /* __ASM_PLAT_S3C64XX_IRQS_H */
202 210
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index febac1950d8e..9745852261e0 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -302,8 +302,8 @@ static int s3c64xx_setrate_clksrc(struct clk *clk, unsigned long rate)
302 return -EINVAL; 302 return -EINVAL;
303 303
304 val = __raw_readl(reg); 304 val = __raw_readl(reg);
305 val &= ~(0xf << sclk->shift); 305 val &= ~(0xf << sclk->divider_shift);
306 val |= (div - 1) << sclk->shift; 306 val |= (div - 1) << sclk->divider_shift;
307 __raw_writel(val, reg); 307 __raw_writel(val, reg);
308 308
309 return 0; 309 return 0;
@@ -328,6 +328,8 @@ static int s3c64xx_setparent_clksrc(struct clk *clk, struct clk *parent)
328 clksrc |= src_nr << sclk->shift; 328 clksrc |= src_nr << sclk->shift;
329 329
330 __raw_writel(clksrc, S3C_CLK_SRC); 330 __raw_writel(clksrc, S3C_CLK_SRC);
331
332 clk->parent = parent;
331 return 0; 333 return 0;
332 } 334 }
333 335
@@ -343,7 +345,7 @@ static unsigned long s3c64xx_roundrate_clksrc(struct clk *clk,
343 if (rate > parent_rate) 345 if (rate > parent_rate)
344 rate = parent_rate; 346 rate = parent_rate;
345 else { 347 else {
346 div = rate / parent_rate; 348 div = parent_rate / rate;
347 349
348 if (div == 0) 350 if (div == 0)
349 div = 1; 351 div = 1;
diff --git a/arch/arm/plat-stmp3xxx/dma.c b/arch/arm/plat-stmp3xxx/dma.c
index d2f497764dce..ef88f25fb870 100644
--- a/arch/arm/plat-stmp3xxx/dma.c
+++ b/arch/arm/plat-stmp3xxx/dma.c
@@ -264,7 +264,7 @@ int stmp3xxx_dma_make_chain(int ch, struct stmp37xx_circ_dma_chain *chain,
264 stmp3xxx_dma_free_command(ch, 264 stmp3xxx_dma_free_command(ch,
265 &descriptors 265 &descriptors
266 [i]); 266 [i]);
267 } while (i-- >= 0); 267 } while (i-- > 0);
268 } 268 }
269 return err; 269 return err;
270 } 270 }
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index c8c55b469342..94be7bb6cb9a 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
12# 12#
13# http://www.arm.linux.org.uk/developer/machines/?action=new 13# http://www.arm.linux.org.uk/developer/machines/?action=new
14# 14#
15# Last update: Sat Sep 12 12:00:16 2009 15# Last update: Fri Sep 18 21:42:00 2009
16# 16#
17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number 17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
18# 18#
@@ -1638,7 +1638,7 @@ mx35evb MACH_MX35EVB MX35EVB 1643
1638aml_m8050 MACH_AML_M8050 AML_M8050 1644 1638aml_m8050 MACH_AML_M8050 AML_M8050 1644
1639mx35_3ds MACH_MX35_3DS MX35_3DS 1645 1639mx35_3ds MACH_MX35_3DS MX35_3DS 1645
1640mars MACH_MARS MARS 1646 1640mars MACH_MARS MARS 1646
1641ntosd_644xa MACH_NTOSD_644XA NTOSD_644XA 1647 1641neuros_osd2 MACH_NEUROS_OSD2 NEUROS_OSD2 1647
1642badger MACH_BADGER BADGER 1648 1642badger MACH_BADGER BADGER 1648
1643trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649 1643trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649
1644trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650 1644trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650
@@ -1654,7 +1654,7 @@ vf10xx MACH_VF10XX VF10XX 1659
1654zoran43xx MACH_ZORAN43XX ZORAN43XX 1660 1654zoran43xx MACH_ZORAN43XX ZORAN43XX 1660
1655sonix926 MACH_SONIX926 SONIX926 1661 1655sonix926 MACH_SONIX926 SONIX926 1661
1656celestialsemi MACH_CELESTIALSEMI CELESTIALSEMI 1662 1656celestialsemi MACH_CELESTIALSEMI CELESTIALSEMI 1662
1657cc9m2443 MACH_CC9M2443 CC9M2443 1663 1657cc9m2443js MACH_CC9M2443JS CC9M2443JS 1663
1658tw5334 MACH_TW5334 TW5334 1664 1658tw5334 MACH_TW5334 TW5334 1664
1659omap_htcartemis MACH_HTCARTEMIS HTCARTEMIS 1665 1659omap_htcartemis MACH_HTCARTEMIS HTCARTEMIS 1665
1660nal_hlite MACH_NAL_HLITE NAL_HLITE 1666 1660nal_hlite MACH_NAL_HLITE NAL_HLITE 1666
@@ -1802,7 +1802,7 @@ ccw9p9215js MACH_CCW9P9215JS CCW9P9215JS 1811
1802rd88f5181l_ge MACH_RD88F5181L_GE RD88F5181L_GE 1812 1802rd88f5181l_ge MACH_RD88F5181L_GE RD88F5181L_GE 1812
1803sifmain MACH_SIFMAIN SIFMAIN 1813 1803sifmain MACH_SIFMAIN SIFMAIN 1813
1804sam9_l9261 MACH_SAM9_L9261 SAM9_L9261 1814 1804sam9_l9261 MACH_SAM9_L9261 SAM9_L9261 1814
1805cc9m2443js MACH_CC9M2443JS CC9M2443JS 1815 1805cc9m2443 MACH_CC9M2443 CC9M2443 1815
1806xaria300 MACH_XARIA300 XARIA300 1816 1806xaria300 MACH_XARIA300 XARIA300 1816
1807it9200 MACH_IT9200 IT9200 1817 1807it9200 MACH_IT9200 IT9200 1817
1808rd88f5181l_fxo MACH_RD88F5181L_FXO RD88F5181L_FXO 1818 1808rd88f5181l_fxo MACH_RD88F5181L_FXO RD88F5181L_FXO 1818
@@ -2409,3 +2409,15 @@ platypus MACH_PLATYPUS PLATYPUS 2422
2409pss2 MACH_PSS2 PSS2 2423 2409pss2 MACH_PSS2 PSS2 2423
2410davinci_apm150 MACH_DAVINCI_APM150 DAVINCI_APM150 2424 2410davinci_apm150 MACH_DAVINCI_APM150 DAVINCI_APM150 2424
2411str9100 MACH_STR9100 STR9100 2425 2411str9100 MACH_STR9100 STR9100 2425
2412net5big MACH_NET5BIG NET5BIG 2426
2413seabed9263 MACH_SEABED9263 SEABED9263 2427
2414mx51_m2id MACH_MX51_M2ID MX51_M2ID 2428
2415octvocplus_eb MACH_OCTVOCPLUS_EB OCTVOCPLUS_EB 2429
2416klk_firefox MACH_KLK_FIREFOX KLK_FIREFOX 2430
2417klk_wirma_module MACH_KLK_WIRMA_MODULE KLK_WIRMA_MODULE 2431
2418klk_wirma_mmi MACH_KLK_WIRMA_MMI KLK_WIRMA_MMI 2432
2419supersonic MACH_SUPERSONIC SUPERSONIC 2433
2420liberty MACH_LIBERTY LIBERTY 2434
2421mh355 MACH_MH355 MH355 2435
2422pc7802 MACH_PC7802 PC7802 2436
2423gnet_sgc MACH_GNET_SGC GNET_SGC 2437
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-13 19:35:10 -0500