mach-ux500: Align ux500 platform files with previous 2.6.35 ones

Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Change-Id: I5093ab34d9931b44843ddde8a998daacf14ff9a8
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26611
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Tested-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>

4 files changed, 44 insertions, 23 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index e705dc34f4a..52da47b6331 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -48,20 +48,6 @@ static pin_cfg_t mop500_pins_common[] = {
 	/* STMPE1601/tc35893 keypad  IRQ */
 	GPIO218_GPIO	| PIN_INPUT_PULLUP,
 
-	/* USB */
-	GPIO256_USB_NXT,
-	GPIO257_USB_STP	| PIN_OUTPUT_HIGH,
-	GPIO258_USB_XCLK,
-	GPIO259_USB_DIR,
-	GPIO260_USB_DAT7,
-	GPIO261_USB_DAT6,
-	GPIO262_USB_DAT5,
-	GPIO263_USB_DAT4,
-	GPIO264_USB_DAT3,
-	GPIO265_USB_DAT2,
-	GPIO266_USB_DAT1,
-	GPIO267_USB_DAT0,
-
 	/* UART */
 	/* uart-0 pins gpio configuration should be
 	 * kept intact to prevent glitch in tx line
@@ -183,7 +169,7 @@ static pin_cfg_t mop500_pins_hrefv60[] = {
 	GPIO145_GPIO	| PIN_INPUT_PULLDOWN,/* HAL_SW */
 
 	/* Audio Amplifier Interface */
-	GPIO149_GPIO	| PIN_OUTPUT_LOW, /* VAUDIO_HF_EN */
+	GPIO149_GPIO	| PIN_OUTPUT_HIGH, /* VAUDIO_HF_EN, enable MAX8968 */
 
 	/* GBF INTERFACE */
 	GPIO171_GPIO	| PIN_OUTPUT_LOW, /* GBF_ENA_RESET */
@@ -390,6 +376,22 @@ static UX500_PINS(mop500_pins_sdi4,
 	GPIO207_MC4_DAT4	| PIN_INPUT_PULLUP,
 );
 
+/* USB */
+static UX500_PINS(mop500_pins_usb,
+	GPIO256_USB_NXT,
+	GPIO257_USB_STP		| PIN_OUTPUT_HIGH,
+	GPIO258_USB_XCLK,
+	GPIO259_USB_DIR,
+	GPIO260_USB_DAT7,
+	GPIO261_USB_DAT6,
+	GPIO262_USB_DAT5,
+	GPIO263_USB_DAT4,
+	GPIO264_USB_DAT3,
+	GPIO265_USB_DAT2,
+	GPIO266_USB_DAT1,
+	GPIO267_USB_DAT0,
+);
+
 static struct ux500_pin_lookup mop500_pins[] = {
 	PIN_LOOKUP("mcde-dpi", &mop500_pins_mcde_dpi),
 	PIN_LOOKUP("mcde-tvout", &mop500_pins_mcde_tvout),
@@ -402,6 +404,7 @@ static struct ux500_pin_lookup mop500_pins[] = {
 	PIN_LOOKUP("sdi1", &mop500_pins_sdi1),
 	PIN_LOOKUP("sdi2", &mop500_pins_sdi2),
 	PIN_LOOKUP("sdi4", &mop500_pins_sdi4),
+	PIN_LOOKUP("ab8500-usb.0", &mop500_pins_usb),
 };
 
 /*
@@ -763,6 +766,17 @@ static pin_cfg_t mop500_pins_common_power_save_bank7[] = {
 	GPIO230_GPIO | PIN_SLPM_DIR_INPUT | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
 };
 
+static pin_cfg_t mop500_pins_common_power_save_bank7_href60[] = {
+	GPIO224_GPIO | PIN_SLPM_DIR_INPUT | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+	GPIO225_GPIO | PIN_SLPM_DIR_INPUT | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+	GPIO226_GPIO | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+	GPIO227_GPIO | PIN_SLPM_OUTPUT_LOW | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+
+	GPIO228_GPIO | PIN_SLPM_OUTPUT_LOW | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+	GPIO229_GPIO | PIN_SLPM_DIR_INPUT | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+	GPIO230_GPIO | PIN_SLPM_DIR_INPUT | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
+};
+
 static pin_cfg_t mop500_pins_common_power_save_bank8[] = {
 	GPIO256_GPIO | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_ENABLED,
 	GPIO257_GPIO | PIN_SLPM_OUTPUT_HIGH | PIN_SLPM_WAKEUP_ENABLE | PIN_SLPM_PDIS_DISABLED,
@@ -819,6 +833,10 @@ void mop500_pins_suspend_force(void)
 		sleep_pins_config_pm(mop500_pins_common_power_save_bank6,
 			ARRAY_SIZE(mop500_pins_common_power_save_bank6));
 
+	if (machine_is_hrefv60())
+		sleep_pins_config_pm(mop500_pins_common_power_save_bank7_href60,
+			ARRAY_SIZE(mop500_pins_common_power_save_bank7_href60));
+	else
 	sleep_pins_config_pm(mop500_pins_common_power_save_bank7,
 		ARRAY_SIZE(mop500_pins_common_power_save_bank7));
 
diff --git a/arch/arm/mach-ux500/board-mop500-uib.c b/arch/arm/mach-ux500/board-mop500-uib.c
index 5af36aa56c0..f4dfd52541c 100644
--- a/arch/arm/mach-ux500/board-mop500-uib.c
+++ b/arch/arm/mach-ux500/board-mop500-uib.c
@@ -38,7 +38,7 @@ static struct uib __initdata mop500_uibs[] = {
 	},
 };
 
-static struct uib *mop500_uib;
+static struct uib __initdata *mop500_uib;
 
 static int __init mop500_uib_setup(char *str)
 {
@@ -64,7 +64,7 @@ __setup("uib=", mop500_uib_setup);
  * The UIBs are detected after the I2C host controllers are registered, so
  * i2c_register_board_info() can't be used.
  */
-void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
+void mop500_uib_i2c_add(int busnum, struct i2c_board_info const *info,
 		unsigned n)
 {
 	struct i2c_adapter *adap;
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 08869354bcf..143ce365643 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -78,7 +78,7 @@ void __init mop500_stuib_init(void);
 void __init mop500_msp_init(void);
 void __init mop500_pins_init(void);
 
-void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
+void mop500_uib_i2c_add(int busnum, struct i2c_board_info const *info,
 		unsigned n);
 
 int msp13_i2s_init(void);
diff --git a/arch/arm/mach-ux500/board-u5500-pins.c b/arch/arm/mach-ux500/board-u5500-pins.c
index 713b2d739ec..5fe41d78901 100644
--- a/arch/arm/mach-ux500/board-u5500-pins.c
+++ b/arch/arm/mach-ux500/board-u5500-pins.c
@@ -53,11 +53,11 @@ static pin_cfg_t u5500_pins_default[] = {
 	GPIO13_MC0_CMD		| PIN_INPUT_PULLUP,
 	GPIO14_MC0_CLK		| PIN_OUTPUT_LOW,
 
-	/* SPI */
-	GPIO167_SPI1_CS0n	| PIN_OUTPUT_HIGH,
-	GPIO168_SPI1_RXD	| PIN_INPUT_PULLDOWN,
-	GPIO169_SPI1_TXD	| PIN_OUTPUT_LOW,
-	GPIO170_SPI1_CLK	| PIN_OUTPUT_LOW,
+	/* UART3 */
+	GPIO165_U3_RXD		| PIN_INPUT_PULLUP,
+	GPIO166_U3_TXD		| PIN_OUTPUT_HIGH,
+	GPIO167_U3_RTSn		| PIN_OUTPUT_HIGH,
+	GPIO168_U3_CTSn		| PIN_INPUT_PULLUP,
 
 	/* AB5500 */
 	GPIO78_IRQn             | PIN_SLPM_NOCHANGE,
@@ -97,6 +97,9 @@ static pin_cfg_t u5500_pins_default[] = {
 	GPIO1_GPIO		| PIN_OUTPUT_LOW,
 	GPIO2_GPIO		| PIN_OUTPUT_LOW,
 
+	/* USB chip select */
+	GPIO76_GPIO		| PIN_OUTPUT_LOW,
+
 	GPIO202_ACCU0_RXD	| PIN_INPUT_PULLUP,
 	GPIO203_ACCU0_TXD	| PIN_OUTPUT_HIGH,
 };