Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b47c49 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes 

* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: update mdio bus name
  ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks
parents deb9b4ce f6f97588

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <mach/aemif.h>

#include <mach/spi.h>



#define DA850_EVM_PHY_ID		"0:00"

#define DA850_EVM_PHY_ID		"davinci_mdio-0:00"

#define DA850_LCD_PWR_PIN		GPIO_TO_PIN(2, 8)

#define DA850_LCD_BL_PIN		GPIO_TO_PIN(2, 15)

arch/arm/mach-davinci/board-dm365-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline int have_tvp7002(void) 
	return 0;

}



#define DM365_EVM_PHY_ID		"0:01"

#define DM365_EVM_PHY_ID		"davinci_mdio-0:01"

/*

 * A MAX-II CPLD is used for various board control functions.

 */

arch/arm/mach-davinci/board-dm644x-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <mach/usb.h>

#include <mach/aemif.h>



#define DM644X_EVM_PHY_ID		"0:01"

#define DM644X_EVM_PHY_ID		"davinci_mdio-0:01"

#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_MASK	(0xfffffff0)

arch/arm/mach-davinci/board-dm646x-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static struct davinci_uart_config uart_config __initdata = { 
	.enabled_uarts = (1 << 0),

};



#define DM646X_EVM_PHY_ID		"0:01"

#define DM646X_EVM_PHY_ID		"davinci_mdio-0:01"

/*

 * The following EDMA channels/slots are not being used by drivers (for

 * example: Timer, GPIO, UART events etc) on dm646x, hence they are being

arch/arm/mach-davinci/board-neuros-osd2.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <mach/mmc.h>

#include <mach/usb.h>



#define NEUROS_OSD2_PHY_ID		"0:01"

#define NEUROS_OSD2_PHY_ID		"davinci_mdio-0:01"

#define LXT971_PHY_ID			0x001378e2

#define LXT971_PHY_MASK			0xfffffff0