diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/arm/mach-iop32x/glantank.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/arm/mach-iop32x/glantank.c')
-rw-r--r-- | arch/arm/mach-iop32x/glantank.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c index 02e20c3912b..ceef5d4dce1 100644 --- a/arch/arm/mach-iop32x/glantank.c +++ b/arch/arm/mach-iop32x/glantank.c | |||
@@ -96,10 +96,11 @@ glantank_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | static struct hw_pci glantank_pci __initdata = { | 98 | static struct hw_pci glantank_pci __initdata = { |
99 | .swizzle = pci_std_swizzle, | ||
99 | .nr_controllers = 1, | 100 | .nr_controllers = 1, |
100 | .ops = &iop3xx_ops, | ||
101 | .setup = iop3xx_pci_setup, | 101 | .setup = iop3xx_pci_setup, |
102 | .preinit = iop3xx_pci_preinit, | 102 | .preinit = iop3xx_pci_preinit, |
103 | .scan = iop3xx_pci_scan_bus, | ||
103 | .map_irq = glantank_pci_map_irq, | 104 | .map_irq = glantank_pci_map_irq, |
104 | }; | 105 | }; |
105 | 106 | ||
@@ -183,7 +184,7 @@ static struct i2c_board_info __initdata glantank_i2c_devices[] = { | |||
183 | 184 | ||
184 | static void glantank_power_off(void) | 185 | static void glantank_power_off(void) |
185 | { | 186 | { |
186 | __raw_writeb(0x01, IOMEM(0xfe8d0004)); | 187 | __raw_writeb(0x01, 0xfe8d0004); |
187 | 188 | ||
188 | while (1) | 189 | while (1) |
189 | ; | 190 | ; |
@@ -206,10 +207,9 @@ static void __init glantank_init_machine(void) | |||
206 | 207 | ||
207 | MACHINE_START(GLANTANK, "GLAN Tank") | 208 | MACHINE_START(GLANTANK, "GLAN Tank") |
208 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 209 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
209 | .atag_offset = 0x100, | 210 | .boot_params = 0xa0000100, |
210 | .map_io = glantank_map_io, | 211 | .map_io = glantank_map_io, |
211 | .init_irq = iop32x_init_irq, | 212 | .init_irq = iop32x_init_irq, |
212 | .timer = &glantank_timer, | 213 | .timer = &glantank_timer, |
213 | .init_machine = glantank_init_machine, | 214 | .init_machine = glantank_init_machine, |
214 | .restart = iop3xx_restart, | ||
215 | MACHINE_END | 215 | MACHINE_END |