c101f142da151a595b421b9ede7765b89aa63dd3
[openwrt.git] / target / linux / orion / patches-3.3 / a01-dt2-fixes-for-3.3.patch
1 --- a/arch/arm/mach-orion5x/dt2-setup.c
2 +++ b/arch/arm/mach-orion5x/dt2-setup.c
3 @@ -146,7 +146,7 @@ void __init dt2_pci_preinit(void)
4         }
5  }
6  
7 -static int __init dt2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
8 +static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
9  {
10         int irq;
11  
12 @@ -383,8 +383,7 @@ __tagtable(ATAG_MV_UBOOT, parse_tag_dt2_
13   *
14   * Vanilla kernel should use "tag_fixup_mem32" function.
15   */
16 -void __init openwrt_fixup(struct machine_desc *mdesc, struct tag *t,
17 -                           char **from, struct meminfo *meminfo)
18 +void __init openwrt_fixup(struct tag *t, char **from, struct meminfo *meminfo)
19  {
20         char *p = NULL;
21         static char openwrt_init_tag[] __initdata = " init=/etc/preinit";
22 @@ -437,10 +436,11 @@ void __init openwrt_fixup(struct machine
23  /* Warning: Freecom uses their own custom bootloader with mach-type (=1500) */
24  MACHINE_START(DT2, "Freecom DataTank Gateway")
25         /* Maintainer: Zintis Petersons <Zintis.Petersons@abcsolutions.lv> */
26 -       .boot_params    = 0x00000100,
27 +       .atag_offset    = 0x100,
28         .init_machine   = dt2_init,
29         .map_io         = orion5x_map_io,
30         .init_irq       = orion5x_init_irq,
31         .timer          = &orion5x_timer,
32         .fixup          = openwrt_fixup, //tag_fixup_mem32,
33 +       .restart        = orion5x_restart,
34  MACHINE_END