Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
534d0c92
Commit
534d0c92
authored
Oct 02, 2009
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
Conflicts: MAINTAINERS
parents
610ea6c6
f00f510a
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
439 additions
and
137 deletions
+439
-137
MAINTAINERS
MAINTAINERS
+6
-6
arch/arm/configs/iop33x_defconfig
arch/arm/configs/iop33x_defconfig
+429
-125
arch/arm/include/asm/hardware/iop3xx.h
arch/arm/include/asm/hardware/iop3xx.h
+1
-0
arch/arm/mach-iop32x/include/mach/iop32x.h
arch/arm/mach-iop32x/include/mach/iop32x.h
+0
-2
arch/arm/mach-iop33x/include/mach/iop33x.h
arch/arm/mach-iop33x/include/mach/iop33x.h
+0
-2
arch/arm/plat-iop/pci.c
arch/arm/plat-iop/pci.c
+2
-1
arch/arm/plat-iop/time.c
arch/arm/plat-iop/time.c
+1
-1
No files found.
MAINTAINERS
View file @
534d0c92
...
...
@@ -646,24 +646,24 @@ ARM/INTEL IOP32X ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:
Support
ed
S:
Maintain
ed
ARM/INTEL IOP33X ARM ARCHITECTURE
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:
Support
ed
S:
Maintain
ed
ARM/INTEL IOP13XX ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:
Support
ed
S:
Maintain
ed
ARM/INTEL IQ81342EX MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:
Support
ed
S:
Maintain
ed
ARM/INTEL IXP2000 ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org>
...
...
@@ -691,7 +691,7 @@ ARM/INTEL XSC3 (MANZANO) ARM CORE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:
Support
ed
S:
Maintain
ed
ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
...
...
@@ -2682,7 +2682,7 @@ F: include/linux/intel-iommu.h
INTEL IOP-ADMA DMA DRIVER
M: Dan Williams <dan.j.williams@intel.com>
S:
Support
ed
S:
Maintain
ed
F: drivers/dma/iop-adma.c
INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
...
...
arch/arm/configs/iop33x_defconfig
View file @
534d0c92
This diff is collapsed.
Click to expand it.
arch/arm/include/asm/hardware/iop3xx.h
View file @
534d0c92
...
...
@@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void);
* IOP3XX I/O and Mem space regions for PCI autoconfiguration
*/
#define IOP3XX_PCI_LOWER_MEM_PA 0x80000000
#define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000
#define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000
#define IOP3XX_PCI_LOWER_IO_PA 0x90000000
...
...
arch/arm/mach-iop32x/include/mach/iop32x.h
View file @
534d0c92
...
...
@@ -31,7 +31,5 @@
#define IOP32X_MAX_RAM_SIZE 0x40000000UL
#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE
#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000
#define IOP32X_PCI_MEM_WINDOW_SIZE 0x04000000
#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP32X_PCI_MEM_WINDOW_SIZE
#endif
arch/arm/mach-iop33x/include/mach/iop33x.h
View file @
534d0c92
...
...
@@ -36,8 +36,6 @@
#define IOP33X_MAX_RAM_SIZE 0x80000000UL
#define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE
#define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE)
#define IOP33X_PCI_MEM_WINDOW_SIZE 0x08000000
#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP33X_PCI_MEM_WINDOW_SIZE
#endif
arch/arm/plat-iop/pci.c
View file @
534d0c92
...
...
@@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void)
*
IOP3XX_OUMWTVR0
=
0
;
/* Outbound window 1 */
*
IOP3XX_OMWTVR1
=
IOP3XX_PCI_LOWER_MEM_BA
+
IOP3XX_PCI_MEM_WINDOW_SIZE
;
*
IOP3XX_OMWTVR1
=
IOP3XX_PCI_LOWER_MEM_BA
+
IOP3XX_PCI_MEM_WINDOW_SIZE
/
2
;
*
IOP3XX_OUMWTVR1
=
0
;
/* BAR 3 ( Disabled ) */
...
...
arch/arm/plat-iop/time.c
View file @
534d0c92
...
...
@@ -85,7 +85,7 @@ void __init iop_init_time(unsigned long tick_rate)
{
u32
timer_ctl
;
ticks_per_jiffy
=
(
tick_rate
+
HZ
/
2
)
/
HZ
;
ticks_per_jiffy
=
DIV_ROUND_CLOSEST
(
tick_rate
,
HZ
)
;
ticks_per_usec
=
tick_rate
/
1000000
;
next_jiffy_time
=
0xffffffff
;
iop_tick_rate
=
tick_rate
;
...
...
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