]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'at91/at91-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 01:16:03 +0000 (12:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 01:16:03 +0000 (12:16 +1100)
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-cpuat91.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/include/mach/board.h
arch/arm/mach-at91/setup.c
drivers/net/ethernet/cadence/Kconfig

46 files changed:
1  2 
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/board-1arm.c
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-carmeva.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-cpuat91.c
arch/arm/mach-at91/board-csb337.c
arch/arm/mach-at91/board-csb637.c
arch/arm/mach-at91/board-eb9200.c
arch/arm/mach-at91/board-ecbat91.c
arch/arm/mach-at91/board-eco920.c
arch/arm/mach-at91/board-foxg20.c
arch/arm/mach-at91/board-gsia18s.c
arch/arm/mach-at91/board-kafa.c
arch/arm/mach-at91/board-kb9202.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-pcontrol-g20.c
arch/arm/mach-at91/board-picotux200.c
arch/arm/mach-at91/board-qil-a9260.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-rm9200ek.c
arch/arm/mach-at91/board-sam9-l9260.c
arch/arm/mach-at91/board-sam9260ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/board-stamp9g20.c
arch/arm/mach-at91/board-usb-a926x.c
arch/arm/mach-at91/board-yl-9200.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/include/mach/board.h
arch/arm/mach-at91/setup.c

index 20d047049b1b0bdc3bd83125e56e1038a549c378,81a9f38453e542c9918fc9fa51cb2638ed32c3e7..edb879ac04c8e30c3d2b814f24497ae86075e7be
@@@ -335,10 -326,16 +328,16 @@@ static void __init at91cap9_map_io(void
        at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
  }
  
+ static void __init at91cap9_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+ }
  static void __init at91cap9_initialize(void)
  {
 -      at91_arch_reset = at91cap9_reset;
 +      arm_pm_restart = at91cap9_restart;
-       pm_power_off = at91cap9_poweroff;
        at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
        /* Register GPIO subsystem */
Simple merge
index 430a9fdc3dbf5e04662802c17f6cba825d1a16da,9163d7d5f76e5ff2e7a311994b9da52254ce7961..99c3174e24a2262d1ff4e5d2cef8a7e54ecef33b
@@@ -307,9 -308,13 +308,13 @@@ static void __init at91rm9200_map_io(vo
        iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
  }
  
+ static void __init at91rm9200_ioremap_registers(void)
+ {
+ }
  static void __init at91rm9200_initialize(void)
  {
 -      at91_arch_reset = at91rm9200_reset;
 +      arm_pm_restart = at91rm9200_restart;
        at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
                        | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)
                        | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)
index 5aca9068328d0082692b963fb65eb2c7d4292ee5,5e25cef9fa6d779cba8731a5acc7724172b1dff5..50395cb0b1dfda28addfa3f65d7f4a30d1330219
@@@ -327,10 -318,16 +320,16 @@@ static void __init at91sam9260_map_io(v
        }
  }
  
+ static void __init at91sam9260_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+ }
  static void __init at91sam9260_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9260_poweroff;
        at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
                        | (1 << AT91SAM9260_ID_IRQ2);
  
index 19ac7c0729a0bc2d38b1ac9a2dbce81c299f5604,a0538c5c252029f3c30392eeab9e9608740f767b..b85b9ea6017071252a670fdb6e22cb222336055d
@@@ -285,10 -278,16 +278,16 @@@ static void __init at91sam9261_map_io(v
                at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
  }
  
+ static void __init at91sam9261_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+ }
  static void __init at91sam9261_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9261_poweroff;
        at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
                        | (1 << AT91SAM9261_ID_IRQ2);
  
index 565c326275369da802a39d10117f24e170323436,0d90b6a2da1e0e09724e52dd0fb4057adba7f116..79e3669b1117cbdf7ae18fd685647625766da513
@@@ -305,10 -296,17 +298,17 @@@ static void __init at91sam9263_map_io(v
        at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
  }
  
+ static void __init at91sam9263_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+       at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+ }
  static void __init at91sam9263_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9263_poweroff;
        at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
  
        /* Register GPIO subsystem */
index 724fa5deb870fc88f29825eb57d9056f01cfd687,72c3cce075e2625d4d4999c01b85ebf2885bce53..7032dd32cdf0fbc207dc265958e70faeb1e32143
@@@ -340,10 -331,16 +333,16 @@@ static void __init at91sam9g45_map_io(v
        init_consistent_dma_size(SZ_4M);
  }
  
+ static void __init at91sam9g45_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+ }
  static void __init at91sam9g45_initialize(void)
  {
 -      at91_arch_reset = at91sam9g45_reset;
 +      arm_pm_restart = at91sam9g45_restart;
-       pm_power_off = at91sam9g45_poweroff;
        at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
  
        /* Register GPIO subsystem */
index 61cbb46f5b0eed6b8bd5a8269efa657696b1e3c2,96247f68b9d242745645c8a6b1acde694f1078b5..d6bcb1da11dfbc004d0c59890d60fef8d3dde27f
@@@ -290,10 -283,16 +283,16 @@@ static void __init at91sam9rl_map_io(vo
        at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
  }
  
+ static void __init at91sam9rl_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+ }
  static void __init at91sam9rl_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9rl_poweroff;
        at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
  
        /* Register GPIO subsystem */
Simple merge
Simple merge
index af5520c366fe802ce2ce707628b82658cde97bd1,abadf5d77eb57ffe8ed3a5b7ca2d1fdf183ed085..94c406f6e99d2cdffa426aa3e3490d4dd84e82bf
@@@ -153,7 -154,8 +154,8 @@@ static struct at91_mmc_data __initdata 
  /*
   * MACB Ethernet device
   */
 -static struct at91_eth_data __initdata cap9adk_macb_data = {
 +static struct macb_platform_data __initdata cap9adk_macb_data = {
+       .phy_irq_pin    = -EINVAL,
        .is_rmii        = 1,
  };
  
Simple merge
index 04d2b9b5046455b47dbce8f9e19534a2c18eda95,d583805371fe318dce62f3e62d28af53b7ffc469..b926d986802cd5ffc029e53bde560ac02bc46b70
@@@ -99,7 -100,8 +100,8 @@@ static struct at91_udc_data __initdata 
  /*
   * MACB Ethernet device
   */
 -static struct at91_eth_data __initdata cpu9krea_macb_data = {
 +static struct macb_platform_data __initdata cpu9krea_macb_data = {
+       .phy_irq_pin    = -EINVAL,
        .is_rmii        = 1,
  };
  
index 7a4c82e8da51559edfeda6dafeb743a69eaad953,e1991d6e7e52d7a6b1c43688b2f7fd313655fab1..aa7c90c05140839abd2b691f6180ad8a9b75b024
@@@ -82,7 -82,8 +82,8 @@@ static void __init cpuat91_init_early(v
        at91_set_serial_console(0);
  }
  
 -static struct at91_eth_data __initdata cpuat91_eth_data = {
 +static struct macb_platform_data __initdata cpuat91_eth_data = {
+       .phy_irq_pin    = -EINVAL,
        .is_rmii        = 1,
  };
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fbec934a7ce9c80a7077a257decd89d8f6e418c5,752fd05eae0c57a06905447cf1c2699e14f73a06..123333d0fce6b1904d13d18e57443cab2f4f0fba
@@@ -63,9 -64,11 +64,11 @@@ static struct at91_udc_data __initdata 
        .vbus_pin               = SNAPPER9260_IO_EXP_GPIO(5),
        .vbus_active_low        = 1,
        .vbus_polled            = 1,
+       .pullup_pin             = -EINVAL,
  };
  
 -static struct at91_eth_data snapper9260_macb_data = {
 +static struct macb_platform_data snapper9260_macb_data = {
+       .phy_irq_pin    = -EINVAL,
        .is_rmii        = 1,
  };
  
Simple merge
Simple merge
Simple merge
index 7f4503bc4cbb10f89da3b3bf025829ebaa9319b5,40309588f3600a0ce0c779e50b2fba4f1d3b788a..4866b8180d66610d17d6a0576424e19a751995a0
@@@ -57,8 -58,11 +58,11 @@@ extern void at91_irq_suspend(void)
  extern void at91_irq_resume(void);
  
  /* reset */
 -extern void at91sam9_alt_reset(void);
 +extern void at91sam9_alt_restart(char, const char *);
  
+ /* shutdown */
+ extern void at91_ioremap_shdwc(u32 base_addr);
   /* GPIO */
  #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
  #define AT91RM9200_BGA                4       /* AT91RM9200 BGA package has 4 banks */
index cf98a8f94dc5afd19ee1c1471b79483eaa273dcb,3c309dc59e6f137577abb9f80ef23c18cf65ec0d..adfb3622a7457841a3091b910e32418c0e73c236
@@@ -73,9 -75,24 +75,6 @@@ static struct map_desc at91_io_desc __i
        .type           = MT_DEVICE,
  };
  
- #define AT91_DBGU0    0xfffff200
- #define AT91_DBGU1    0xffffee00
 -void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
 -{
 -      if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
 -              return (void __iomem *)AT91_IO_P2V(p);
 -
 -      return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
 -}
 -EXPORT_SYMBOL(at91_ioremap);
 -
 -void at91_iounmap(volatile void __iomem *addr)
 -{
 -      unsigned long virt = (unsigned long)addr;
 -
 -      if (virt >= VMALLOC_START && virt < VMALLOC_END)
 -              __iounmap(addr);
 -}
 -EXPORT_SYMBOL(at91_iounmap);
--
  static void __init soc_detect(u32 dbgu_base)
  {
        u32 cidr, socid;