X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0a75fedac40d4655c38d61740950573c4025d48c..abe312efd5fbeee4423d991b0f690a267f098714:/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c

diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
index f794b4cc5..8ff23f7dd 100644
--- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
+++ b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
@@ -209,7 +209,7 @@ static struct mv643xx_eth_platform_data dt2_eth_data = {
 	.duplex		= DUPLEX_FULL,
 };
 
-static struct dsa_platform_data dt2_switch_data = {
+static struct dsa_chip_data dt2_switch_chip_data = {
 	.port_names[0] = "wan",
 	.port_names[1] = "lan1",
 	.port_names[2] = "lan2",
@@ -218,6 +218,11 @@ static struct dsa_platform_data dt2_switch_data = {
 	.port_names[5] = "lan4",
 };
 
+static struct dsa_platform_data dt2_switch_plat_data = {
+	.nr_chips	= 1,
+	.chip		= &dt2_switch_chip_data,
+};
+
 /*****************************************************************************
  * RTC ISL1208 on I2C bus
  ****************************************************************************/
@@ -289,7 +294,6 @@ static irqreturn_t dt2_power_handler(int irq, void *dev_id)
 
 static void __init dt2_init(void)
 {
-	DECLARE_MAC_BUF(mac_buf);
 	/*
 	 * Setup basic Orion functions. Need to be called early.
 	 */
@@ -300,7 +304,6 @@ static void __init dt2_init(void)
 	/*
 	 * Configure peripherals.
 	 */
-	gpio_display();
 
 	orion5x_uart0_init();
 	orion5x_ehci0_init();
@@ -314,14 +317,14 @@ static void __init dt2_init(void)
 
 	printk(KERN_INFO "Serial: %s\n", dt2_eeprom.fc.dt2_serial_number);
 	printk(KERN_INFO "Revision: %016x\n", dt2_eeprom.fc.dt2_revision);
-	printk(KERN_INFO "DT2: Using MAC address %s for port 0\n",
-	       print_mac(mac_buf, dt2_eeprom.gw.mac_addr[0]));
-	printk(KERN_INFO "DT2: Using MAC address %s for port 1\n",
-	       print_mac(mac_buf, dt2_eeprom.gw.mac_addr[1]));
+	printk(KERN_INFO "DT2: Using MAC address %pM for port 0\n",
+	       dt2_eeprom.gw.mac_addr[0]);
+	printk(KERN_INFO "DT2: Using MAC address %pM for port 1\n",
+	       dt2_eeprom.gw.mac_addr[1]);
 
 	orion5x_eth_init(&dt2_eth_data);
 	memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6);
-	orion5x_eth_switch_init(&dt2_switch_data, NO_IRQ);
+	orion5x_eth_switch_init(&dt2_switch_plat_data, NO_IRQ);
 
 	i2c_register_board_info(0, &dt2_i2c_rtc, 1);