Patched in Tegra support.

4 files changed, 7 insertions, 47 deletions

diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index d8dbd8f0c1d..bb571bcdb8f 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -217,7 +217,7 @@ struct titan_gpio_cfg {
         u32 func;
 };
 
-static const struct titan_gpio_cfg titan_gpio_table[] = {
+static struct titan_gpio_cfg titan_gpio_table[] = {
         /* reg, start bit, mux value */
         {4, 24, 1},
         {4, 26, 1},
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 7477fd2127a..33ffecf6a6d 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -202,11 +202,8 @@ static struct resource physmap_flash_resource = {
         .end    = 0x107fffff,
 };
 
-static const char *ar7_probe_types[] = { "ar7part", NULL };
-
 static struct physmap_flash_data physmap_flash_data = {
         .width  = 2,
-        .part_probe_types = ar7_probe_types,
 };
 
 static struct platform_device physmap_flash = {
@@ -313,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
                                         &dev_addr[4], &dev_addr[5]) != 6) {
                         pr_warning("cannot parse mac address, "
                                         "using random address\n");
-                        eth_random_addr(dev_addr);
+                        random_ether_addr(dev_addr);
                 }
         } else
-                eth_random_addr(dev_addr);
+                random_ether_addr(dev_addr);
 }
 
 /*****************************************************************************
@@ -465,40 +462,6 @@ static struct gpio_led fb_fon_leds[] = {
         },
 };
 
-static struct gpio_led gt701_leds[] = {
-        {
-                .name                   = "inet:green",
-                .gpio                   = 13,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "usb",
-                .gpio                   = 12,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "inet:red",
-                .gpio                   = 9,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "power:red",
-                .gpio                   = 7,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "power:green",
-                .gpio                   = 8,
-                .active_low             = 1,
-                .default_trigger        = "default-on",
-        },
-        {
-                .name                   = "ethernet",
-                .gpio                   = 10,
-                .active_low             = 1,
-        },
-};
-
 static struct gpio_led_platform_data ar7_led_data;
 
 static struct platform_device ar7_gpio_leds = {
@@ -540,9 +503,6 @@ static void __init detect_leds(void)
         } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {
                 ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);
                 ar7_led_data.leds = titan_leds;
-        } else if (strstr(prid, "GT701")) {
-                ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds);
-                ar7_led_data.leds = gt701_leds;
         }
 }
 
@@ -576,7 +536,7 @@ static int __init ar7_register_uarts(void)
 
         bus_clk = clk_get(NULL, "bus");
         if (IS_ERR(bus_clk))
-                panic("unable to get bus clk");
+                panic("unable to get bus clk\n");
 
         uart_port.type          = PORT_AR7;
         uart_port.uartclk       = clk_get_rate(bus_clk) / 2;
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
index a23adc49d50..8088c6fdb83 100644
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
@@ -69,7 +69,7 @@ struct psbl_rec {
         u32     ffs_size;
 };
 
-static const char psp_env_version[] __initconst = "TIENV0.8";
+static __initdata char psp_env_version[] = "TIENV0.8";
 
 struct psp_env_chunk {
         u8      num;
@@ -84,7 +84,7 @@ struct psp_var_map_entry {
         char    *value;
 };
 
-static const struct psp_var_map_entry psp_var_map[] = {
+static struct psp_var_map_entry psp_var_map[] = {
         {  1,   "cpufrequency" },
         {  2,   "memsize" },
         {  3,   "flashsize" },
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index 9a357fffcfb..f20b53e597c 100644
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -96,7 +96,7 @@ void __init plat_mem_setup(void)
 
         io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
         if (!io_base)
-                panic("Can't remap IO base!");
+                panic("Can't remap IO base!\n");
         set_io_port_base(io_base);
 
         prom_meminit();