4 files changed, 19 insertions, 6 deletions

diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c
index f9b32a8eab9b..b07ae63aa548 100644
--- a/arch/avr32/boards/atngw100/flash.c
+++ b/arch/avr32/boards/atngw100/flash.c
@@ -15,7 +15,7 @@
 
 #include <asm/arch/smc.h>
 
-static struct smc_config flash_config __initdata = {
+static struct smc_timing flash_timing __initdata = {
         .ncs_read_setup         = 0,
         .nrd_setup              = 40,
         .ncs_write_setup        = 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = {
 
         .read_cycle             = 120,
         .write_cycle            = 120,
+};
 
+static struct smc_config flash_config __initdata = {
         .bus_width              = 2,
         .nrd_controlled         = 1,
         .nwe_controlled         = 1,
@@ -82,6 +84,7 @@ static int __init atngw100_flash_init(void)
 {
         int ret;
 
+        smc_set_timing(&flash_config, &flash_timing);
         ret = smc_set_configuration(0, &flash_config);
         if (ret < 0) {
                 printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index ef801563bbf5..52987c81d668 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -125,8 +125,11 @@ static struct platform_device ngw_gpio_leds = {
 };
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
-        .sda_pin        = GPIO_PIN_PA(6),
-        .scl_pin        = GPIO_PIN_PA(7),
+        .sda_pin                = GPIO_PIN_PA(6),
+        .scl_pin                = GPIO_PIN_PA(7),
+        .sda_is_open_drain      = 1,
+        .scl_is_open_drain      = 1,
+        .udelay                 = 2,    /* close to 100 kHz */
 };
 
 static struct platform_device i2c_gpio_device = {
@@ -154,6 +157,7 @@ static int __init atngw100_init(void)
         set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
 
         at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
+        at32_add_device_usba(0, NULL);
 
         for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
                 at32_select_gpio(ngw_leds[i].gpio,
@@ -161,8 +165,10 @@ static int __init atngw100_init(void)
         }
         platform_device_register(&ngw_gpio_leds);
 
-        at32_select_gpio(i2c_gpio_data.sda_pin, 0);
-        at32_select_gpio(i2c_gpio_data.scl_pin, 0);
+        at32_select_gpio(i2c_gpio_data.sda_pin,
+                AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
+        at32_select_gpio(i2c_gpio_data.scl_pin,
+                AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
         platform_device_register(&i2c_gpio_device);
 
         return 0;
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index c9981b731efa..6b9e466104ad 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -241,6 +241,7 @@ static int __init atstk1002_init(void)
         at32_add_device_lcdc(0, &atstk1000_lcdc_data,
                              fbmem_start, fbmem_size);
 #endif
+        at32_add_device_usba(0, NULL);
 #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
         at32_add_device_ssc(0, ATMEL_SSC_TX);
 #endif
diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c
index aac4300cca12..3d0a102ad45e 100644
--- a/arch/avr32/boards/atstk1000/flash.c
+++ b/arch/avr32/boards/atstk1000/flash.c
@@ -15,7 +15,7 @@
 
 #include <asm/arch/smc.h>
 
-static struct smc_config flash_config __initdata = {
+static struct smc_timing flash_timing __initdata = {
         .ncs_read_setup         = 0,
         .nrd_setup              = 40,
         .ncs_write_setup        = 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = {
 
         .read_cycle             = 120,
         .write_cycle            = 120,
+};
 
+static struct smc_config flash_config __initdata = {
         .bus_width              = 2,
         .nrd_controlled         = 1,
         .nwe_controlled         = 1,
@@ -82,6 +84,7 @@ static int __init atstk1000_flash_init(void)
 {
         int ret;
 
+        smc_set_timing(&flash_config, &flash_timing);
         ret = smc_set_configuration(0, &flash_config);
         if (ret < 0) {
                 printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n");