1 files changed, 6 insertions, 21 deletions

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 76a2b37eaf30..007b58c11f8d 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -110,26 +110,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
         GPIO105_KP_MKOUT_2,
 
         /* LCD */
-        GPIO58_LCD_LDD_0,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
+        GPIOxx_LCD_TFT_16BPP,
 
         /* FFUART */
         GPIO34_FFUART_RXD,
@@ -269,7 +250,7 @@ err:
         return ret;
 }
 
-static int palmtx_backlight_notify(int brightness)
+static int palmtx_backlight_notify(struct device *dev, int brightness)
 {
         gpio_set_value(GPIO_NR_PALMTX_BL_POWER, brightness);
         gpio_set_value(GPIO_NR_PALMTX_LCD_POWER, brightness);
@@ -570,6 +551,10 @@ static void __init palmtx_init(void)
 {
         pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config));
 
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+
         palmtx_pm_init();
         set_pxa_fb_info(&palmtx_lcd_screen);
         pxa_set_mci_info(&palmtx_mci_platform_data);