pxa/palm: Introduce Palm27x

Signed-off-by Marek Vasut <[email protected]>

---

?arch/arm/mach-pxa/Kconfig ? ?| ? ?4 +
?arch/arm/mach-pxa/palmld.c ? | ?258 +++----------------------------------
?arch/arm/mach-pxa/palmt5.c ? | ?275 +++------------------------------------
?arch/arm/mach-pxa/palmtreo.c | ?292 +++++-------------------------------------
?arch/arm/mach-pxa/palmtx.c ? | ?270 +++------------------------------------
?arch/arm/mach-pxa/palmz72.c ?| ?261 ++-----------------------------------

?6 files changed, 109 insertions(+), 1251 deletions(-)

arch/arm/mach-pxa/Kconfig +0 -0

index 6f04f21..7aefb90 100644
@@ -374,6 +374,7 @@ config MACH_PALMT5

? ? ? ?depends on ARCH_PXA_PALM
? ? ? ?select PXA27x
? ? ? ?select IWMMXT
+ ? ? ? select MACH_PALM27X

? ? ? ?help
? ? ? ? ?Say Y here if you intend to run this kernel on a Palm Tungsten|T5 ? ? ? ? ?handheld computer.

arch/arm/mach-pxa/Kconfig +0 -0

@@ -384,6 +385,7 @@ config MACH_PALMTX

? ? ? ?depends on ARCH_PXA_PALM
? ? ? ?select PXA27x
? ? ? ?select IWMMXT
+ ? ? ? select MACH_PALM27X
? ? ? ?help
? ? ? ? ?Say Y here if you intend to run this kernel on a Palm T|X ? ? ? ? ?handheld computer.

arch/arm/mach-pxa/Kconfig +0 -0

@@ -394,6 +396,7 @@ config MACH_PALMZ72

? ? ? ?depends on ARCH_PXA_PALM
? ? ? ?select PXA27x
? ? ? ?select IWMMXT
+ ? ? ? select MACH_PALM27X
? ? ? ?help
? ? ? ? ?Say Y here if you intend to run this kernel on Palm Zire 72 ? ? ? ? ?handheld computer.

arch/arm/mach-pxa/Kconfig +0 -0

@@ -404,6 +407,7 @@ config MACH_PALMLD

? ? ? ?depends on ARCH_PXA_PALM
? ? ? ?select PXA27x
? ? ? ?select IWMMXT
+ ? ? ? select MACH_PALM27X
? ? ? ?help
? ? ? ? ?Say Y here if you intend to run this kernel on a Palm LifeDrive ? ? ? ? ?handheld computer.

arch/arm/mach-pxa/palmld.c +0 -0

index 83a1a55..cac66ca 100644
@@ -41,6 +41,7 @@

?#include <mach/irda.h>
?#include <mach/pxa27x_keypad.h>
?#include <mach/palmasoc.h>
+#include <mach/palm27x.h>

?#include "generic.h"
?#include "devices.h"

arch/arm/mach-pxa/palmld.c +0 -0

@@ -161,17 +162,6 @@ static struct platform_device palmld_flash = {
 ?};
 

?/******************************************************************************
- * SD/MMC card controller
- ******************************************************************************/

arch/arm/mach-pxa/palmld.c +0 -9

-static struct pxamci_platform_data palmld_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_PALMLD_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = GPIO_NR_PALMLD_SD_READONLY,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_PALMLD_SD_POWER,
- ? ? ? .detect_delay_ms ? ? ? ?= 200,
-};
-
-/******************************************************************************

?* GPIO keyboard ?******************************************************************************/ ?static unsigned int palmld_matrix_keys[] = {

arch/arm/mach-pxa/palmld.c +0 -0

@@ -223,74 +213,6 @@ static struct platform_device palmld_pxa_keys = {
 ?};
 

?/******************************************************************************
- * Backlight
- ******************************************************************************/

arch/arm/mach-pxa/palmld.c +0 -66

-static int palmld_backlight_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMLD_BL_POWER, "BL POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMLD_BL_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_request(GPIO_NR_PALMLD_LCD_POWER, "LCD POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMLD_LCD_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMLD_LCD_POWER);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMLD_BL_POWER);
-err:
- ? ? ? return ret;
-}
-
-static int palmld_backlight_notify(struct device *dev, int brightness)
-{
- ? ? ? gpio_set_value(GPIO_NR_PALMLD_BL_POWER, brightness);
- ? ? ? gpio_set_value(GPIO_NR_PALMLD_LCD_POWER, brightness);
- ? ? ? return brightness;
-}
-
-static void palmld_backlight_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMLD_BL_POWER);
- ? ? ? gpio_free(GPIO_NR_PALMLD_LCD_POWER);
-}
-
-static struct platform_pwm_backlight_data palmld_backlight_data = {
- ? ? ? .pwm_id ? ? ? ? = 0,
- ? ? ? .max_brightness = PALMLD_MAX_INTENSITY,
- ? ? ? .dft_brightness = PALMLD_MAX_INTENSITY,
- ? ? ? .pwm_period_ns ?= PALMLD_PERIOD_NS,
- ? ? ? .init ? ? ? ? ? = palmld_backlight_init,
- ? ? ? .notify ? ? ? ? = palmld_backlight_notify,
- ? ? ? .exit ? ? ? ? ? = palmld_backlight_exit,
-};
-
-static struct platform_device palmld_backlight = {
- ? ? ? .name ? = "pwm-backlight",
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .parent ? ? ? ? = &pxa27x_device_pwm0.dev,
- ? ? ? ? ? ? ? .platform_data ?= &palmld_backlight_data,
- ? ? ? },
-};
-
-/******************************************************************************
- * IrDA
- ******************************************************************************/
-static struct pxaficp_platform_data palmld_ficp_platform_data = {
- ? ? ? .gpio_pwdown ? ? ? ? ? ?= GPIO_NR_PALMLD_IR_DISABLE,
- ? ? ? .transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
-};
-
-/******************************************************************************

?* LEDs ?******************************************************************************/ ?struct gpio_led gpio_leds[] = {

arch/arm/mach-pxa/palmld.c +0 -0

@@ -319,112 +241,6 @@ static struct platform_device palmld_leds = {
 ?};
 

?/******************************************************************************
- * Power supply
- ******************************************************************************/

arch/arm/mach-pxa/palmld.c +0 -104

-static int power_supply_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMLD_POWER_DETECT, "CABLE_STATE_AC");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err1;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMLD_POWER_DETECT);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMLD_USB_DETECT_N, "CABLE_STATE_USB");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMLD_USB_DETECT_N);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMLD_USB_DETECT_N);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMLD_POWER_DETECT);
-err1:
- ? ? ? return ret;
-}
-
-static int palmld_is_ac_online(void)
-{
- ? ? ? return gpio_get_value(GPIO_NR_PALMLD_POWER_DETECT);
-}
-
-static int palmld_is_usb_online(void)
-{
- ? ? ? return !gpio_get_value(GPIO_NR_PALMLD_USB_DETECT_N);
-}
-
-static void power_supply_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMLD_USB_DETECT_N);
- ? ? ? gpio_free(GPIO_NR_PALMLD_POWER_DETECT);
-}
-
-static char *palmld_supplicants[] = {
- ? ? ? "main-battery",
-};
-
-static struct pda_power_pdata power_supply_info = {
- ? ? ? .init ? ? ? ? ? ?= power_supply_init,
- ? ? ? .is_ac_online ? ?= palmld_is_ac_online,
- ? ? ? .is_usb_online ? = palmld_is_usb_online,
- ? ? ? .exit ? ? ? ? ? ?= power_supply_exit,
- ? ? ? .supplied_to ? ? = palmld_supplicants,
- ? ? ? .num_supplicants = ARRAY_SIZE(palmld_supplicants),
-};
-
-static struct platform_device power_supply = {
- ? ? ? .name = "pda-power",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &power_supply_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * WM97xx audio, battery
- ******************************************************************************/
-static struct wm97xx_batt_pdata palmld_batt_pdata = {
- ? ? ? .batt_aux ? ? ? = WM97XX_AUX_ID3,
- ? ? ? .temp_aux ? ? ? = WM97XX_AUX_ID2,
- ? ? ? .charge_gpio ? ?= -1,
- ? ? ? .max_voltage ? ?= PALMLD_BAT_MAX_VOLTAGE,
- ? ? ? .min_voltage ? ?= PALMLD_BAT_MIN_VOLTAGE,
- ? ? ? .batt_mult ? ? ?= 1000,
- ? ? ? .batt_div ? ? ? = 414,
- ? ? ? .temp_mult ? ? ?= 1,
- ? ? ? .temp_div ? ? ? = 1,
- ? ? ? .batt_tech ? ? ?= POWER_SUPPLY_TECHNOLOGY_LIPO,
- ? ? ? .batt_name ? ? ?= "main-batt",
-};
-
-static struct wm97xx_pdata palmld_wm97xx_pdata = {
- ? ? ? .batt_pdata ? ? = &palmld_batt_pdata,
-};
-
-static pxa2xx_audio_ops_t palmld_ac97_pdata = {
- ? ? ? .reset_gpio ? ? = 95,
- ? ? ? .codec_pdata ? ?= { &palmld_wm97xx_pdata, },
-};
-
-static struct palm27x_asoc_info palmld_asoc_pdata = {
- ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMLD_EARPHONE_DETECT,
-};
-
-static struct platform_device palmld_asoc = {
- ? ? ? .name = "palm27x-asoc",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &palmld_asoc_pdata,
- ? ? ? },
-};
-
-/******************************************************************************

?* HDD ?******************************************************************************/ ?static struct platform_device palmld_hdd = {

arch/arm/mach-pxa/palmld.c +0 -0

@@ -433,57 +249,13 @@ static struct platform_device palmld_hdd = {
 ?};
 

?/******************************************************************************
- * Framebuffer
- ******************************************************************************/

arch/arm/mach-pxa/palmld.c +0 -39

-static struct pxafb_mode_info palmld_lcd_modes[] = {
-{
- ? ? ? .pixclock ? ? ? = 57692,
- ? ? ? .xres ? ? ? ? ? = 320,
- ? ? ? .yres ? ? ? ? ? = 480,
- ? ? ? .bpp ? ? ? ? ? ?= 16,
-
- ? ? ? .left_margin ? ?= 32,
- ? ? ? .right_margin ? = 1,
- ? ? ? .upper_margin ? = 7,
- ? ? ? .lower_margin ? = 1,
-
- ? ? ? .hsync_len ? ? ?= 4,
- ? ? ? .vsync_len ? ? ?= 1,
-},
-};
-
-static struct pxafb_mach_info palmld_lcd_screen = {
- ? ? ? .modes ? ? ? ? ?= palmld_lcd_modes,
- ? ? ? .num_modes ? ? ?= ARRAY_SIZE(palmld_lcd_modes),
- ? ? ? .lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
-};
-
-/******************************************************************************
- * Power management - standby
- ******************************************************************************/
-static void __init palmld_pm_init(void)
-{
- ? ? ? static u32 resume[] = {
- ? ? ? ? ? ? ? 0xe3a00101, ? ? /* mov ?r0, ? ? #0x40000000 */
- ? ? ? ? ? ? ? 0xe380060f, ? ? /* orr ?r0, r0, #0x00f00000 */
- ? ? ? ? ? ? ? 0xe590f008, ? ? /* ldr ?pc, [r0, #0x08] */
- ? ? ? };
-
- ? ? ? /* copy the bootloader */
- ? ? ? memcpy(phys_to_virt(PALMLD_STR_BASE), resume, sizeof(resume));
-}
-
-/******************************************************************************

?* Machine init ?******************************************************************************/ ?static struct platform_device *devices[] __initdata = {
?#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) ? ? ? ?&palmld_pxa_keys,
?#endif
- ? ? ? &palmld_backlight,
? ? ? ?&palmld_leds,
- ? ? ? &power_supply,
- ? ? ? &palmld_asoc,
? ? ? ?&palmld_hdd,
? ? ? ?&palmld_flash,
?};

arch/arm/mach-pxa/palmld.c +17 -11

@@ -509,21 +281,27 @@ static void __init palmld_map_io(void)
 ? ? ? ?iotable_init(palmld_io_desc, ARRAY_SIZE(palmld_io_desc));
 ?}
 
+struct palm27x_handheld palmld = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_PALMLD_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = GPIO_NR_PALMLD_SD_READONLY,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_PALMLD_SD_POWER,
+ ? ? ? .pm_str_base ? ?= PALMLD_STR_BASE,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_PALMLD_IR_DISABLE,
+ ? ? ? .batt_minv ? ? ?= PALMLD_BAT_MIN_VOLTAGE,
+ ? ? ? .batt_maxv ? ? ?= PALMLD_BAT_MAX_VOLTAGE,
+ ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMLD_EARPHONE_DETECT,
+ ? ? ? .bl_bl ? ? ? ? ?= GPIO_NR_PALMLD_BL_POWER,
+ ? ? ? .bl_lcd ? ? ? ? = GPIO_NR_PALMLD_LCD_POWER,
+ ? ? ? .power_ac ? ? ? = GPIO_NR_PALMLD_POWER_DETECT,
+ ? ? ? .power_usb ? ? ?= GPIO_NR_PALMLD_USB_DETECT_N,
+ ? ? ? .lcd_power ? ? ?= -1,
+};
+
 ?static void __init palmld_init(void)
 ?{
 ? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config));
-
- ? ? ? pxa_set_ffuart_info(NULL);
- ? ? ? pxa_set_btuart_info(NULL);
- ? ? ? pxa_set_stuart_info(NULL);
-
- ? ? ? palmld_pm_init();
- ? ? ? set_pxa_fb_info(&palmld_lcd_screen);
- ? ? ? pxa_set_mci_info(&palmld_mci_platform_data);
- ? ? ? pxa_set_ac97_info(&palmld_ac97_pdata);
- ? ? ? pxa_set_ficp_info(&palmld_ficp_platform_data);
+ ? ? ? palm27x_common_init(&palmld);
 ? ? ? ?pxa_set_keypad_info(&palmld_keypad_platform_data);
-
 ? ? ? ?platform_add_devices(devices, ARRAY_SIZE(devices));
 ?}
 

arch/arm/mach-pxa/palmt5.c +0 -0

index 0b36d7d..593f57c 100644
@@ -41,6 +41,7 @@

?#include <mach/pxa27x_keypad.h>
?#include <mach/udc.h>
?#include <mach/palmasoc.h>
+#include <mach/palm27x.h>

?#include "generic.h"
?#include "devices.h"

arch/arm/mach-pxa/palmt5.c +0 -0

@@ -103,17 +104,6 @@ static unsigned long palmt5_pin_config[] __initdata = {
 ?};
 

?/******************************************************************************
- * SD/MMC card controller
- ******************************************************************************/

arch/arm/mach-pxa/palmt5.c +0 -9

-static struct pxamci_platform_data palmt5_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_PALMT5_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = GPIO_NR_PALMT5_SD_READONLY,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_PALMT5_SD_POWER,
- ? ? ? .detect_delay_ms ? ? ? ?= 200,
-};
-
-/******************************************************************************

?* GPIO keyboard ?******************************************************************************/ ?static unsigned int palmt5_matrix_keys[] = {

arch/arm/mach-pxa/palmt5.c +0 -0

@@ -162,259 +152,32 @@ static struct platform_device palmt5_pxa_keys = {
 ?};
 

?/******************************************************************************
- * Backlight
- ******************************************************************************/

arch/arm/mach-pxa/palmt5.c +0 -213

-static int palmt5_backlight_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMT5_BL_POWER, "BL POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMT5_BL_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_request(GPIO_NR_PALMT5_LCD_POWER, "LCD POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMT5_LCD_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMT5_LCD_POWER);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMT5_BL_POWER);
-err:
- ? ? ? return ret;
-}
-
-static int palmt5_backlight_notify(struct device *dev, int brightness)
-{
- ? ? ? gpio_set_value(GPIO_NR_PALMT5_BL_POWER, brightness);
- ? ? ? gpio_set_value(GPIO_NR_PALMT5_LCD_POWER, brightness);
- ? ? ? return brightness;
-}
-
-static void palmt5_backlight_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMT5_BL_POWER);
- ? ? ? gpio_free(GPIO_NR_PALMT5_LCD_POWER);
-}
-
-static struct platform_pwm_backlight_data palmt5_backlight_data = {
- ? ? ? .pwm_id ? ? ? ? = 0,
- ? ? ? .max_brightness = PALMT5_MAX_INTENSITY,
- ? ? ? .dft_brightness = PALMT5_MAX_INTENSITY,
- ? ? ? .pwm_period_ns ?= PALMT5_PERIOD_NS,
- ? ? ? .init ? ? ? ? ? = palmt5_backlight_init,
- ? ? ? .notify ? ? ? ? = palmt5_backlight_notify,
- ? ? ? .exit ? ? ? ? ? = palmt5_backlight_exit,
-};
-
-static struct platform_device palmt5_backlight = {
- ? ? ? .name ? = "pwm-backlight",
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .parent ? ? ? ? = &pxa27x_device_pwm0.dev,
- ? ? ? ? ? ? ? .platform_data ?= &palmt5_backlight_data,
- ? ? ? },
-};
-
-/******************************************************************************
- * IrDA
- ******************************************************************************/
-static struct pxaficp_platform_data palmt5_ficp_platform_data = {
- ? ? ? .gpio_pwdown ? ? ? ? ? ?= GPIO_NR_PALMT5_IR_DISABLE,
- ? ? ? .transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
-};
-
-/******************************************************************************
- * UDC
- ******************************************************************************/
-static struct gpio_vbus_mach_info palmt5_udc_info = {
- ? ? ? .gpio_vbus ? ? ? ? ? ? ?= GPIO_NR_PALMT5_USB_DETECT_N,
- ? ? ? .gpio_vbus_inverted ? ? = 1,
- ? ? ? .gpio_pullup ? ? ? ? ? ?= GPIO_NR_PALMT5_USB_PULLUP,
-};
-
-static struct platform_device palmt5_gpio_vbus = {
- ? ? ? .name ? = "gpio-vbus",
- ? ? ? .id ? ? = -1,
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .platform_data ?= &palmt5_udc_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * Power supply
- ******************************************************************************/
-static int power_supply_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMT5_POWER_DETECT, "CABLE_STATE_AC");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err1;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMT5_POWER_DETECT);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? return 0;
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMT5_POWER_DETECT);
-err1:
- ? ? ? return ret;
-}
-
-static int palmt5_is_ac_online(void)
-{
- ? ? ? return gpio_get_value(GPIO_NR_PALMT5_POWER_DETECT);
-}
-
-static void power_supply_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMT5_POWER_DETECT);
-}
-
-static char *palmt5_supplicants[] = {
- ? ? ? "main-battery",
-};
-
-static struct pda_power_pdata power_supply_info = {
- ? ? ? .init ? ? ? ? ? ?= power_supply_init,
- ? ? ? .is_ac_online ? ?= palmt5_is_ac_online,
- ? ? ? .exit ? ? ? ? ? ?= power_supply_exit,
- ? ? ? .supplied_to ? ? = palmt5_supplicants,
- ? ? ? .num_supplicants = ARRAY_SIZE(palmt5_supplicants),
-};
-
-static struct platform_device power_supply = {
- ? ? ? .name = "pda-power",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &power_supply_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * WM97xx audio, battery
- ******************************************************************************/
-static struct wm97xx_batt_pdata palmt5_batt_pdata = {
- ? ? ? .batt_aux ? ? ? = WM97XX_AUX_ID3,
- ? ? ? .temp_aux ? ? ? = WM97XX_AUX_ID2,
- ? ? ? .charge_gpio ? ?= -1,
- ? ? ? .max_voltage ? ?= PALMT5_BAT_MAX_VOLTAGE,
- ? ? ? .min_voltage ? ?= PALMT5_BAT_MIN_VOLTAGE,
- ? ? ? .batt_mult ? ? ?= 1000,
- ? ? ? .batt_div ? ? ? = 414,
- ? ? ? .temp_mult ? ? ?= 1,
- ? ? ? .temp_div ? ? ? = 1,
- ? ? ? .batt_tech ? ? ?= POWER_SUPPLY_TECHNOLOGY_LIPO,
- ? ? ? .batt_name ? ? ?= "main-batt",
-};
-
-static struct wm97xx_pdata palmt5_wm97xx_pdata = {
- ? ? ? .batt_pdata ? ? = &palmt5_batt_pdata,
-};
-
-static pxa2xx_audio_ops_t palmt5_ac97_pdata = {
- ? ? ? .reset_gpio ? ? = 95,
- ? ? ? .codec_pdata ? ?= { &palmt5_wm97xx_pdata, },
-};
-
-static struct palm27x_asoc_info palmt5_asoc_pdata = {
- ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMT5_EARPHONE_DETECT,
-};
-
-static struct platform_device palmt5_asoc = {
- ? ? ? .name = "palm27x-asoc",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &palmt5_asoc_pdata,
- ? ? ? },
-};
-
-/******************************************************************************
- * Framebuffer
- ******************************************************************************/
-static struct pxafb_mode_info palmt5_lcd_modes[] = {
-{
- ? ? ? .pixclock ? ? ? = 57692,
- ? ? ? .xres ? ? ? ? ? = 320,
- ? ? ? .yres ? ? ? ? ? = 480,
- ? ? ? .bpp ? ? ? ? ? ?= 16,
-
- ? ? ? .left_margin ? ?= 32,
- ? ? ? .right_margin ? = 1,
- ? ? ? .upper_margin ? = 7,
- ? ? ? .lower_margin ? = 1,
-
- ? ? ? .hsync_len ? ? ?= 4,
- ? ? ? .vsync_len ? ? ?= 1,
-},
-};
-
-static struct pxafb_mach_info palmt5_lcd_screen = {
- ? ? ? .modes ? ? ? ? ?= palmt5_lcd_modes,
- ? ? ? .num_modes ? ? ?= ARRAY_SIZE(palmt5_lcd_modes),
- ? ? ? .lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
-};
-
-/******************************************************************************
- * Power management - standby
- ******************************************************************************/
-static void __init palmt5_pm_init(void)
-{
- ? ? ? static u32 resume[] = {
- ? ? ? ? ? ? ? 0xe3a00101, ? ? /* mov ?r0, ? ? #0x40000000 */
- ? ? ? ? ? ? ? 0xe380060f, ? ? /* orr ?r0, r0, #0x00f00000 */
- ? ? ? ? ? ? ? 0xe590f008, ? ? /* ldr ?pc, [r0, #0x08] */
- ? ? ? };
-
- ? ? ? /* copy the bootloader */
- ? ? ? memcpy(phys_to_virt(PALMT5_STR_BASE), resume, sizeof(resume));
-}
-
-/******************************************************************************

?* Machine init ?******************************************************************************/

arch/arm/mach-pxa/palmt5.c +16 -8

-static struct platform_device *devices[] __initdata = {
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
- ? ? ? &palmt5_pxa_keys,
-#endif
- ? ? ? &palmt5_backlight,
- ? ? ? &power_supply,
- ? ? ? &palmt5_asoc,
- ? ? ? &palmt5_gpio_vbus,
+struct palm27x_handheld palmt5 = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_PALMT5_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = GPIO_NR_PALMT5_SD_READONLY,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_PALMT5_SD_POWER,
+ ? ? ? .pm_str_base ? ?= PALMT5_STR_BASE,
+ ? ? ? .udc_detect ? ? = GPIO_NR_PALMT5_USB_DETECT_N,
+ ? ? ? .udc_pullup ? ? = GPIO_NR_PALMT5_USB_PULLUP,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_PALMT5_IR_DISABLE,
+ ? ? ? .batt_minv ? ? ?= PALMT5_BAT_MIN_VOLTAGE,
+ ? ? ? .batt_maxv ? ? ?= PALMT5_BAT_MAX_VOLTAGE,
+ ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMT5_EARPHONE_DETECT,
+ ? ? ? .bl_bl ? ? ? ? ?= GPIO_NR_PALMT5_BL_POWER,
+ ? ? ? .bl_lcd ? ? ? ? = GPIO_NR_PALMT5_LCD_POWER,
+ ? ? ? .power_ac ? ? ? = GPIO_NR_PALMT5_POWER_DETECT,
+ ? ? ? .power_usb ? ? ?= -1,
+ ? ? ? .lcd_power ? ? ?= -1,

?};

arch/arm/mach-pxa/palmt5.c +0 -9

-/* setup udc GPIOs initial state */
-static void __init palmt5_udc_init(void)
-{
- ? ? ? if (!gpio_request(GPIO_NR_PALMT5_USB_PULLUP, "UDC Vbus")) {
- ? ? ? ? ? ? ? gpio_direction_output(GPIO_NR_PALMT5_USB_PULLUP, 1);
- ? ? ? ? ? ? ? gpio_free(GPIO_NR_PALMT5_USB_PULLUP);
- ? ? ? }
-}
-

?static void __init palmt5_init(void)
?{
? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config));

arch/arm/mach-pxa/palmt5.c +1 -11

-
- ? ? ? pxa_set_ffuart_info(NULL);
- ? ? ? pxa_set_btuart_info(NULL);
- ? ? ? pxa_set_stuart_info(NULL);
-
- ? ? ? palmt5_pm_init();
- ? ? ? set_pxa_fb_info(&palmt5_lcd_screen);
- ? ? ? pxa_set_mci_info(&palmt5_mci_platform_data);
- ? ? ? palmt5_udc_init();
- ? ? ? pxa_set_ac97_info(&palmt5_ac97_pdata);
- ? ? ? pxa_set_ficp_info(&palmt5_ficp_platform_data);
+ ? ? ? palm27x_common_init(&palmt5);

? ? ? ?pxa_set_keypad_info(&palmt5_keypad_platform_data); -
- ? ? ? platform_add_devices(devices, ARRAY_SIZE(devices));
+ ? ? ? platform_device_register(&palmt5_pxa_keys); ?}

?MACHINE_START(PALMT5, "Palm Tungsten|T5")

arch/arm/mach-pxa/palmtreo.c +0 -0

index 4eb0258..dcb5f93 100644
@@ -44,6 +44,7 @@

?#include <mach/pxa2xx-regs.h>
?#include <mach/palmasoc.h>
?#include <mach/camera.h>
+#include <mach/palm27x.h>

?#include <sound/pxa2xx-lib.h>

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -158,28 +159,6 @@ static unsigned long centro685_pin_config[] __initdata = {

?#endif /* CONFIG_MACH_CENTRO */

?/******************************************************************************
- * SD/MMC card controller
- ******************************************************************************/

arch/arm/mach-pxa/palmtreo.c +0 -20

-#ifdef CONFIG_MACH_TREO680
-static struct pxamci_platform_data treo680_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_TREO_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = GPIO_NR_TREO680_SD_READONLY,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_TREO680_SD_POWER,
-};
-#endif /* CONFIG_MACH_TREO680 */
-
-#ifdef CONFIG_MACH_CENTRO
-static struct pxamci_platform_data centro_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_TREO_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = -1,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_CENTRO_SD_POWER,
- ? ? ? .gpio_power_invert ? ? ?= 1,
-};
-#endif /* CONFIG_MACH_CENTRO */
-
-/******************************************************************************

?* GPIO keyboard ?******************************************************************************/ ?#ifdef CONFIG_MACH_TREO680

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -327,83 +306,6 @@ static struct pxa27x_keypad_platform_data centro_keypad_platform_data = {

?#endif /* CONFIG_MACH_CENTRO */

?/******************************************************************************
- * aSoC audio
- ******************************************************************************/

arch/arm/mach-pxa/palmtreo.c +0 -75

-
-static pxa2xx_audio_ops_t treo_ac97_pdata = {
- ? ? ? .reset_gpio ? ? = 95,
-};
-
-/******************************************************************************
- * Backlight
- ******************************************************************************/
-static int treo_backlight_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_TREO_BL_POWER, "BL POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err;
- ? ? ? ret = gpio_direction_output(GPIO_NR_TREO_BL_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? return 0;
-
-err2:
- ? ? ? gpio_free(GPIO_NR_TREO_BL_POWER);
-err:
- ? ? ? return ret;
-}
-
-static int treo_backlight_notify(struct device *dev, int brightness)
-{
- ? ? ? gpio_set_value(GPIO_NR_TREO_BL_POWER, brightness);
- ? ? ? return TREO_MAX_INTENSITY - brightness;
-};
-
-static void treo_backlight_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_TREO_BL_POWER);
-}
-
-static struct platform_pwm_backlight_data treo_backlight_data = {
- ? ? ? .pwm_id ? ? ? ? = 0,
- ? ? ? .max_brightness = TREO_MAX_INTENSITY,
- ? ? ? .dft_brightness = TREO_DEFAULT_INTENSITY,
- ? ? ? .pwm_period_ns ?= TREO_PERIOD_NS,
- ? ? ? .init ? ? ? ? ? = treo_backlight_init,
- ? ? ? .notify ? ? ? ? = treo_backlight_notify,
- ? ? ? .exit ? ? ? ? ? = treo_backlight_exit,
-};
-
-static struct platform_device treo_backlight = {
- ? ? ? .name ? = "pwm-backlight",
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .parent ? ? ? ? = &pxa27x_device_pwm0.dev,
- ? ? ? ? ? ? ? .platform_data ?= &treo_backlight_data,
- ? ? ? },
-};
-
-/******************************************************************************
- * IrDA
- ******************************************************************************/
-static struct pxaficp_platform_data treo_ficp_info = {
- ? ? ? .gpio_pwdown ? ? ? ? ? ?= GPIO_NR_TREO_IR_EN,
- ? ? ? .transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
-};
-
-/******************************************************************************
- * UDC
- ******************************************************************************/
-static struct pxa2xx_udc_mach_info treo_udc_info __initdata = {
- ? ? ? .gpio_vbus ? ? ? ? ? ? ?= GPIO_NR_TREO_USB_DETECT,
- ? ? ? .gpio_vbus_inverted ? ? = 1,
- ? ? ? .gpio_pullup ? ? ? ? ? ?= GPIO_NR_TREO_USB_PULLUP,
-};
-
-
-/******************************************************************************

?* USB host ?******************************************************************************/ ?#ifdef CONFIG_MACH_TREO680

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -415,58 +317,6 @@ static struct pxaohci_platform_data treo680_ohci_info = {

?#endif /* CONFIG_MACH_TREO680 */

?/******************************************************************************
- * Power supply
- ******************************************************************************/

arch/arm/mach-pxa/palmtreo.c +0 -50

-static int power_supply_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_TREO_POWER_DETECT, "CABLE_STATE_AC");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err1;
- ? ? ? ret = gpio_direction_input(GPIO_NR_TREO_POWER_DETECT);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? return 0;
-
-err2:
- ? ? ? gpio_free(GPIO_NR_TREO_POWER_DETECT);
-err1:
- ? ? ? return ret;
-}
-
-static int treo_is_ac_online(void)
-{
- ? ? ? return gpio_get_value(GPIO_NR_TREO_POWER_DETECT);
-}
-
-static void power_supply_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_TREO_POWER_DETECT);
-}
-
-static char *treo_supplicants[] = {
- ? ? ? "main-battery",
-};
-
-static struct pda_power_pdata power_supply_info = {
- ? ? ? .init ? ? ? ? ? ?= power_supply_init,
- ? ? ? .is_ac_online ? ?= treo_is_ac_online,
- ? ? ? .exit ? ? ? ? ? ?= power_supply_exit,
- ? ? ? .supplied_to ? ? = treo_supplicants,
- ? ? ? .num_supplicants = ARRAY_SIZE(treo_supplicants),
-};
-
-static struct platform_device power_supply = {
- ? ? ? .name = "pda-power",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &power_supply_info,
- ? ? ? },
-};
-
-/******************************************************************************

?* Vibra and LEDs ?******************************************************************************/ ?#ifdef CONFIG_MACH_TREO680

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -537,60 +387,8 @@ static struct platform_device centro_leds = {

?#endif /* CONFIG_MACH_CENTRO */

?/******************************************************************************
- * Framebuffer
- ******************************************************************************/

arch/arm/mach-pxa/palmtreo.c +0 -45

-/* TODO: add support for 324x324 */
-static struct pxafb_mode_info treo_lcd_modes[] = {
-{
- ? ? ? .pixclock ? ? ? ? ? ? ? = 86538,
- ? ? ? .xres ? ? ? ? ? ? ? ? ? = 320,
- ? ? ? .yres ? ? ? ? ? ? ? ? ? = 320,
- ? ? ? .bpp ? ? ? ? ? ? ? ? ? ?= 16,
-
- ? ? ? .left_margin ? ? ? ? ? ?= 20,
- ? ? ? .right_margin ? ? ? ? ? = 8,
- ? ? ? .upper_margin ? ? ? ? ? = 8,
- ? ? ? .lower_margin ? ? ? ? ? = 5,
-
- ? ? ? .hsync_len ? ? ? ? ? ? ?= 4,
- ? ? ? .vsync_len ? ? ? ? ? ? ?= 1,
-},
-};
-
-static void treo_lcd_power(int on, struct fb_var_screeninfo *info)
-{
- ? ? ? gpio_set_value(GPIO_NR_TREO_BL_POWER, on);
-}
-
-static struct pxafb_mach_info treo_lcd_screen = {
- ? ? ? .modes ? ? ? ? ?= treo_lcd_modes,
- ? ? ? .num_modes ? ? ?= ARRAY_SIZE(treo_lcd_modes),
- ? ? ? .lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
-};
-
-/******************************************************************************
- * Power management - standby
- ******************************************************************************/
-static void __init treo_pm_init(void)
-{
- ? ? ? static u32 resume[] = {
- ? ? ? ? ? ? ? 0xe3a00101, ? ? /* mov ?r0, ? ? #0x40000000 */
- ? ? ? ? ? ? ? 0xe380060f, ? ? /* orr ?r0, r0, #0x00f00000 */
- ? ? ? ? ? ? ? 0xe590f008, ? ? /* ldr ?pc, [r0, #0x08] */
- ? ? ? };
-
- ? ? ? /* this is where the bootloader jumps */
- ? ? ? memcpy(phys_to_virt(TREO_STR_BASE), resume, sizeof(resume));
-}
-
-/******************************************************************************

?* Machine init ?******************************************************************************/

arch/arm/mach-pxa/palmtreo.c +0 -5

-static struct platform_device *treo_devices[] __initdata = {
- ? ? ? &treo_backlight,
- ? ? ? &power_supply,
-};
-

?#ifdef CONFIG_MACH_TREO680
?static struct platform_device *treo680_devices[] __initdata = { ? ? ? ?&treo680_leds,

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -603,62 +401,29 @@ static struct platform_device *centro_devices[] __initdata = {
 ?};

?#endif /* CONFIG_MACH_CENTRO */

arch/arm/mach-pxa/palmtreo.c +0 -47

-/* setup udc GPIOs initial state */
-static void __init treo_udc_init(void)
-{
- ? ? ? if (!gpio_request(GPIO_NR_TREO_USB_PULLUP, "UDC Vbus")) {
- ? ? ? ? ? ? ? gpio_direction_output(GPIO_NR_TREO_USB_PULLUP, 1);
- ? ? ? ? ? ? ? gpio_free(GPIO_NR_TREO_USB_PULLUP);
- ? ? ? }
-}
-
-static void __init treo_lcd_power_init(void)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_TREO_LCD_POWER, "LCD POWER");
- ? ? ? if (ret) {
- ? ? ? ? ? ? ? pr_err("Treo680: LCD power GPIO request failed!\n");
- ? ? ? ? ? ? ? return;
- ? ? ? }
-
- ? ? ? ret = gpio_direction_output(GPIO_NR_TREO_LCD_POWER, 0);
- ? ? ? if (ret) {
- ? ? ? ? ? ? ? pr_err("Treo680: setting LCD power GPIO direction failed!\n");
- ? ? ? ? ? ? ? gpio_free(GPIO_NR_TREO_LCD_POWER);
- ? ? ? ? ? ? ? return;
- ? ? ? }
-
- ? ? ? treo_lcd_screen.pxafb_lcd_power = treo_lcd_power;
-}
-
-static void __init treo_init(void)
-{
- ? ? ? pxa_set_ffuart_info(NULL);
- ? ? ? pxa_set_btuart_info(NULL);
- ? ? ? pxa_set_stuart_info(NULL);
-
- ? ? ? treo_pm_init();
- ? ? ? pxa2xx_mfp_config(ARRAY_AND_SIZE(treo_pin_config));
- ? ? ? treo_lcd_power_init();
- ? ? ? set_pxa_fb_info(&treo_lcd_screen);
- ? ? ? treo_udc_init();
- ? ? ? pxa_set_udc_info(&treo_udc_info);
- ? ? ? pxa_set_ac97_info(&treo_ac97_pdata);
- ? ? ? pxa_set_ficp_info(&treo_ficp_info);
-
- ? ? ? platform_add_devices(ARRAY_AND_SIZE(treo_devices));
-}
-

?#ifdef CONFIG_MACH_TREO680

arch/arm/mach-pxa/palmtreo.c +15 -0

+struct palm27x_handheld palmtreo680 = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_TREO_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = GPIO_NR_TREO680_SD_READONLY,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_TREO680_SD_POWER,
+ ? ? ? .pm_str_base ? ?= TREO_STR_BASE,
+ ? ? ? .udc_detect ? ? = GPIO_NR_TREO_USB_DETECT,
+ ? ? ? .udc_pullup ? ? = GPIO_NR_TREO_USB_PULLUP,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_TREO_IR_EN,
+ ? ? ? .bl_bl ? ? ? ? ?= GPIO_NR_TREO_BL_POWER,
+ ? ? ? .bl_lcd ? ? ? ? = -1,
+ ? ? ? .power_ac ? ? ? = GPIO_NR_TREO_POWER_DETECT,
+ ? ? ? .power_usb ? ? ?= -1,
+ ? ? ? .lcd_power ? ? ?= GPIO_NR_TREO_BL_POWER,
+};
+

?static void __init treo680_init(void)
?{
- ? ? ? treo_init();
+ ? ? ? pxa2xx_mfp_config(ARRAY_AND_SIZE(treo_pin_config)); ? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
- ? ? ? pxa_set_mci_info(&treo680_mci_platform_data);
+ ? ? ? palm27x_common_init(&palmtreo680);
? ? ? ?pxa_set_keypad_info(&treo680_keypad_platform_data); ? ? ? ?pxa_set_ohci_info(&treo680_ohci_info);
-
? ? ? ?platform_add_devices(ARRAY_AND_SIZE(treo680_devices)); ?}

arch/arm/mach-pxa/palmtreo.c +0 -0

@@ -674,14 +439,27 @@ MACHINE_END

?#endif /* CONFIG_MACH_TREO680 */

?#ifdef CONFIG_MACH_CENTRO

arch/arm/mach-pxa/palmtreo.c +15 -0

+struct palm27x_handheld palmcentro = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_TREO_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = -1,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_CENTRO_SD_POWER,
+ ? ? ? .pm_str_base ? ?= TREO_STR_BASE,
+ ? ? ? .udc_detect ? ? = GPIO_NR_TREO_USB_DETECT,
+ ? ? ? .udc_pullup ? ? = GPIO_NR_TREO_USB_PULLUP,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_TREO_IR_EN,
+ ? ? ? .bl_bl ? ? ? ? ?= GPIO_NR_TREO_BL_POWER,
+ ? ? ? .bl_lcd ? ? ? ? = -1,
+ ? ? ? .power_ac ? ? ? = GPIO_NR_TREO_POWER_DETECT,
+ ? ? ? .power_usb ? ? ?= -1,
+ ? ? ? .lcd_power ? ? ?= GPIO_NR_TREO_BL_POWER,
+};
+

?static void __init centro_init(void)
?{
- ? ? ? treo_init();
+ ? ? ? pxa2xx_mfp_config(ARRAY_AND_SIZE(treo_pin_config)); ? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
- ? ? ? pxa_set_mci_info(&centro_mci_platform_data); -
+ ? ? ? palm27x_common_init(&palmcentro);
? ? ? ?pxa_set_keypad_info(&centro_keypad_platform_data); -
? ? ? ?platform_add_devices(ARRAY_AND_SIZE(centro_devices)); ?}

arch/arm/mach-pxa/palmtx.c +0 -0

index a5429cd..f8ddffe 100644
@@ -46,6 +46,7 @@

?#include <mach/pxa27x_keypad.h>
?#include <mach/udc.h>
?#include <mach/palmasoc.h>
+#include <mach/palm27x.h>

?#include "generic.h"
?#include "devices.h"

arch/arm/mach-pxa/palmtx.c +0 -0

@@ -163,17 +164,6 @@ static struct platform_device palmtx_flash = {
 ?};
 

?/******************************************************************************
- * SD/MMC card controller
- ******************************************************************************/

arch/arm/mach-pxa/palmtx.c +0 -9

-static struct pxamci_platform_data palmtx_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_PALMTX_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = GPIO_NR_PALMTX_SD_READONLY,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_PALMTX_SD_POWER,
- ? ? ? .detect_delay_ms ? ? ? ?= 200,
-};
-
-/******************************************************************************

?* GPIO keyboard ?******************************************************************************/ ?static unsigned int palmtx_matrix_keys[] = {

arch/arm/mach-pxa/palmtx.c +0 -0

@@ -222,207 +212,6 @@ static struct platform_device palmtx_pxa_keys = {
 ?};
 

?/******************************************************************************
- * Backlight
- ******************************************************************************/

arch/arm/mach-pxa/palmtx.c +0 -199

-static int palmtx_backlight_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMTX_BL_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMTX_LCD_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMTX_LCD_POWER);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMTX_BL_POWER);
-err:
- ? ? ? return ret;
-}
-
-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);
- ? ? ? return brightness;
-}
-
-static void palmtx_backlight_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMTX_BL_POWER);
- ? ? ? gpio_free(GPIO_NR_PALMTX_LCD_POWER);
-}
-
-static struct platform_pwm_backlight_data palmtx_backlight_data = {
- ? ? ? .pwm_id ? ? ? ? = 0,
- ? ? ? .max_brightness = PALMTX_MAX_INTENSITY,
- ? ? ? .dft_brightness = PALMTX_MAX_INTENSITY,
- ? ? ? .pwm_period_ns ?= PALMTX_PERIOD_NS,
- ? ? ? .init ? ? ? ? ? = palmtx_backlight_init,
- ? ? ? .notify ? ? ? ? = palmtx_backlight_notify,
- ? ? ? .exit ? ? ? ? ? = palmtx_backlight_exit,
-};
-
-static struct platform_device palmtx_backlight = {
- ? ? ? .name ? = "pwm-backlight",
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .parent ? ? ? ? = &pxa27x_device_pwm0.dev,
- ? ? ? ? ? ? ? .platform_data ?= &palmtx_backlight_data,
- ? ? ? },
-};
-
-/******************************************************************************
- * IrDA
- ******************************************************************************/
-static struct pxaficp_platform_data palmtx_ficp_platform_data = {
- ? ? ? .gpio_pwdown ? ? ? ? ? ?= GPIO_NR_PALMTX_IR_DISABLE,
- ? ? ? .transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
-};
-
-/******************************************************************************
- * UDC
- ******************************************************************************/
-static struct gpio_vbus_mach_info palmtx_udc_info = {
- ? ? ? .gpio_vbus ? ? ? ? ? ? ?= GPIO_NR_PALMTX_USB_DETECT_N,
- ? ? ? .gpio_vbus_inverted ? ? = 1,
- ? ? ? .gpio_pullup ? ? ? ? ? ?= GPIO_NR_PALMTX_USB_PULLUP,
-};
-
-static struct platform_device palmtx_gpio_vbus = {
- ? ? ? .name ? = "gpio-vbus",
- ? ? ? .id ? ? = -1,
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .platform_data ?= &palmtx_udc_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * Power supply
- ******************************************************************************/
-static int power_supply_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err1;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMTX_POWER_DETECT);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? return 0;
-
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
-err1:
- ? ? ? return ret;
-}
-
-static int palmtx_is_ac_online(void)
-{
- ? ? ? return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT);
-}
-
-static void power_supply_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
-}
-
-static char *palmtx_supplicants[] = {
- ? ? ? "main-battery",
-};
-
-static struct pda_power_pdata power_supply_info = {
- ? ? ? .init ? ? ? ? ? ?= power_supply_init,
- ? ? ? .is_ac_online ? ?= palmtx_is_ac_online,
- ? ? ? .exit ? ? ? ? ? ?= power_supply_exit,
- ? ? ? .supplied_to ? ? = palmtx_supplicants,
- ? ? ? .num_supplicants = ARRAY_SIZE(palmtx_supplicants),
-};
-
-static struct platform_device power_supply = {
- ? ? ? .name = "pda-power",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &power_supply_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * WM97xx audio, battery
- ******************************************************************************/
-static struct wm97xx_batt_pdata palmtx_batt_pdata = {
- ? ? ? .batt_aux ? ? ? = WM97XX_AUX_ID3,
- ? ? ? .temp_aux ? ? ? = WM97XX_AUX_ID2,
- ? ? ? .charge_gpio ? ?= -1,
- ? ? ? .max_voltage ? ?= PALMTX_BAT_MAX_VOLTAGE,
- ? ? ? .min_voltage ? ?= PALMTX_BAT_MIN_VOLTAGE,
- ? ? ? .batt_mult ? ? ?= 1000,
- ? ? ? .batt_div ? ? ? = 414,
- ? ? ? .temp_mult ? ? ?= 1,
- ? ? ? .temp_div ? ? ? = 1,
- ? ? ? .batt_tech ? ? ?= POWER_SUPPLY_TECHNOLOGY_LIPO,
- ? ? ? .batt_name ? ? ?= "main-batt",
-};
-
-static struct wm97xx_pdata palmtx_wm97xx_pdata = {
- ? ? ? .batt_pdata ? ? = &palmtx_batt_pdata,
-};
-
-static pxa2xx_audio_ops_t palmtx_ac97_pdata = {
- ? ? ? .reset_gpio ? ? = 95,
- ? ? ? .codec_pdata ? ?= { &palmtx_wm97xx_pdata, },
-};
-
-static struct palm27x_asoc_info palmtx_asoc_pdata = {
- ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMTX_EARPHONE_DETECT,
-};
-
-static struct platform_device palmtx_asoc = {
- ? ? ? .name = "palm27x-asoc",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &palmtx_asoc_pdata,
- ? ? ? },
-};
-
-/******************************************************************************
- * Framebuffer
- ******************************************************************************/
-static struct pxafb_mode_info palmtx_lcd_modes[] = {
-{
- ? ? ? .pixclock ? ? ? = 57692,
- ? ? ? .xres ? ? ? ? ? = 320,
- ? ? ? .yres ? ? ? ? ? = 480,
- ? ? ? .bpp ? ? ? ? ? ?= 16,
-
- ? ? ? .left_margin ? ?= 32,
- ? ? ? .right_margin ? = 1,
- ? ? ? .upper_margin ? = 7,
- ? ? ? .lower_margin ? = 1,
-
- ? ? ? .hsync_len ? ? ?= 4,
- ? ? ? .vsync_len ? ? ?= 1,
-},
-};
-
-static struct pxafb_mach_info palmtx_lcd_screen = {
- ? ? ? .modes ? ? ? ? ?= palmtx_lcd_modes,
- ? ? ? .num_modes ? ? ?= ARRAY_SIZE(palmtx_lcd_modes),
- ? ? ? .lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
-};
-
-/******************************************************************************

?* NAND Flash ?******************************************************************************/ ?static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,

arch/arm/mach-pxa/palmtx.c +0 -14

@@ -484,20 +273,6 @@ static struct platform_device palmtx_nand = {
 ? ? ? ?}
 ?};
 
-/******************************************************************************
- * Power management - standby
- ******************************************************************************/
-static void __init palmtx_pm_init(void)
-{
- ? ? ? static u32 resume[] = {
- ? ? ? ? ? ? ? 0xe3a00101, ? ? /* mov ?r0, ? ? #0x40000000 */
- ? ? ? ? ? ? ? 0xe380060f, ? ? /* orr ?r0, r0, #0x00f00000 */
- ? ? ? ? ? ? ? 0xe590f008, ? ? /* ldr ?pc, [r0, #0x08] */
- ? ? ? };
-
- ? ? ? /* copy the bootloader */
- ? ? ? memcpy(phys_to_virt(PALMTX_STR_BASE), resume, sizeof(resume));
-}
 

?/****************************************************************************** ?* Machine init

arch/arm/mach-pxa/palmtx.c +0 -0

@@ -506,10 +281,6 @@ static struct platform_device *devices[] __initdata = {
 ?#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 ? ? ? ?&palmtx_pxa_keys,

?#endif
- ? ? ? &palmtx_backlight,
- ? ? ? &power_supply,
- ? ? ? &palmtx_asoc,
- ? ? ? &palmtx_gpio_vbus,
? ? ? ?&palmtx_flash,
? ? ? ?&palmtx_nand,
?};

arch/arm/mach-pxa/palmtx.c +18 -21

@@ -539,32 +310,29 @@ static void __init palmtx_map_io(void)
 ? ? ? ?iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
 ?}
 
-/* setup udc GPIOs initial state */
-static void __init palmtx_udc_init(void)
-{
- ? ? ? if (!gpio_request(GPIO_NR_PALMTX_USB_PULLUP, "UDC Vbus")) {
- ? ? ? ? ? ? ? gpio_direction_output(GPIO_NR_PALMTX_USB_PULLUP, 1);
- ? ? ? ? ? ? ? gpio_free(GPIO_NR_PALMTX_USB_PULLUP);
- ? ? ? }
-}
-
+struct palm27x_handheld palmtx = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_PALMTX_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = GPIO_NR_PALMTX_SD_READONLY,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_PALMTX_SD_POWER,
+ ? ? ? .pm_str_base ? ?= PALMTX_STR_BASE,
+ ? ? ? .udc_detect ? ? = GPIO_NR_PALMTX_USB_DETECT_N,
+ ? ? ? .udc_pullup ? ? = GPIO_NR_PALMTX_USB_PULLUP,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_PALMTX_IR_DISABLE,
+ ? ? ? .batt_minv ? ? ?= PALMTX_BAT_MIN_VOLTAGE,
+ ? ? ? .batt_maxv ? ? ?= PALMTX_BAT_MAX_VOLTAGE,
+ ? ? ? .jack_gpio ? ? ?= GPIO_NR_PALMTX_EARPHONE_DETECT,
+ ? ? ? .bl_bl ? ? ? ? ?= GPIO_NR_PALMTX_BL_POWER,
+ ? ? ? .bl_lcd ? ? ? ? = GPIO_NR_PALMTX_LCD_POWER,
+ ? ? ? .power_ac ? ? ? = GPIO_NR_PALMTX_POWER_DETECT,
+ ? ? ? .power_usb ? ? ?= -1,
+ ? ? ? .lcd_power ? ? ?= -1,
+};
 
 ?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);
- ? ? ? palmtx_udc_init();
- ? ? ? pxa_set_ac97_info(&palmtx_ac97_pdata);
- ? ? ? pxa_set_ficp_info(&palmtx_ficp_platform_data);
+ ? ? ? palm27x_common_init(&palmtx);
 ? ? ? ?pxa_set_keypad_info(&palmtx_keypad_platform_data);
-
 ? ? ? ?platform_add_devices(devices, ARRAY_SIZE(devices));
 ?}
 

arch/arm/mach-pxa/palmz72.c +0 -0

index b78c6b4..10b06ad 100644
@@ -44,6 +44,7 @@

?#include <mach/pxa27x_keypad.h>
?#include <mach/udc.h>
?#include <mach/palmasoc.h>
+#include <mach/palm27x.h>

?#include <mach/pm.h>

arch/arm/mach-pxa/palmz72.c +0 -0

@@ -109,19 +110,6 @@ static unsigned long palmz72_pin_config[] __initdata = {
 ?};
 

?/******************************************************************************
- * SD/MMC card controller
- ******************************************************************************/

arch/arm/mach-pxa/palmz72.c +0 -11

-/* SD_POWER is not actually power, but it is more like chip
- * select, i.e. it is inverted */
-static struct pxamci_platform_data palmz72_mci_platform_data = {
- ? ? ? .ocr_mask ? ? ? ? ? ? ? = MMC_VDD_32_33 | MMC_VDD_33_34,
- ? ? ? .gpio_card_detect ? ? ? = GPIO_NR_PALMZ72_SD_DETECT_N,
- ? ? ? .gpio_card_ro ? ? ? ? ? = GPIO_NR_PALMZ72_SD_RO,
- ? ? ? .gpio_power ? ? ? ? ? ? = GPIO_NR_PALMZ72_SD_POWER_N,
- ? ? ? .gpio_power_invert ? ? ?= 1,
-};
-
-/******************************************************************************

?* GPIO keyboard ?******************************************************************************/ ?static unsigned int palmz72_matrix_keys[] = {

arch/arm/mach-pxa/palmz72.c +0 -0

@@ -150,74 +138,6 @@ static struct pxa27x_keypad_platform_data palmz72_keypad_platform_data = {
 ?};
 

?/******************************************************************************
- * Backlight
- ******************************************************************************/

arch/arm/mach-pxa/palmz72.c +0 -66

-static int palmz72_backlight_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMZ72_BL_POWER, "BL POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMZ72_BL_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_request(GPIO_NR_PALMZ72_LCD_POWER, "LCD POWER");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_output(GPIO_NR_PALMZ72_LCD_POWER, 0);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMZ72_LCD_POWER);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMZ72_BL_POWER);
-err:
- ? ? ? return ret;
-}
-
-static int palmz72_backlight_notify(struct device *dev, int brightness)
-{
- ? ? ? gpio_set_value(GPIO_NR_PALMZ72_BL_POWER, brightness);
- ? ? ? gpio_set_value(GPIO_NR_PALMZ72_LCD_POWER, brightness);
- ? ? ? return brightness;
-}
-
-static void palmz72_backlight_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMZ72_BL_POWER);
- ? ? ? gpio_free(GPIO_NR_PALMZ72_LCD_POWER);
-}
-
-static struct platform_pwm_backlight_data palmz72_backlight_data = {
- ? ? ? .pwm_id ? ? ? ? = 0,
- ? ? ? .max_brightness = PALMZ72_MAX_INTENSITY,
- ? ? ? .dft_brightness = PALMZ72_MAX_INTENSITY,
- ? ? ? .pwm_period_ns ?= PALMZ72_PERIOD_NS,
- ? ? ? .init ? ? ? ? ? = palmz72_backlight_init,
- ? ? ? .notify ? ? ? ? = palmz72_backlight_notify,
- ? ? ? .exit ? ? ? ? ? = palmz72_backlight_exit,
-};
-
-static struct platform_device palmz72_backlight = {
- ? ? ? .name ? = "pwm-backlight",
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .parent ? ? ? ? = &pxa27x_device_pwm0.dev,
- ? ? ? ? ? ? ? .platform_data ?= &palmz72_backlight_data,
- ? ? ? },
-};
-
-/******************************************************************************
- * IrDA
- ******************************************************************************/
-static struct pxaficp_platform_data palmz72_ficp_platform_data = {
- ? ? ? .gpio_pwdown ? ? ? ? ? ?= GPIO_NR_PALMZ72_IR_DISABLE,
- ? ? ? .transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
-};
-
-/******************************************************************************

?* LEDs ?******************************************************************************/ ?static struct gpio_led gpio_leds[] = {

arch/arm/mach-pxa/palmz72.c +0 -139

@@ -241,145 +161,6 @@ static struct platform_device palmz72_leds = {
 ? ? ? ?}
 ?};
 
-/******************************************************************************
- * UDC
- ******************************************************************************/
-static struct gpio_vbus_mach_info palmz72_udc_info = {
- ? ? ? .gpio_vbus ? ? ? ? ? ? ?= GPIO_NR_PALMZ72_USB_DETECT_N,
- ? ? ? .gpio_pullup ? ? ? ? ? ?= GPIO_NR_PALMZ72_USB_PULLUP,
-};
-
-static struct platform_device palmz72_gpio_vbus = {
- ? ? ? .name ? = "gpio-vbus",
- ? ? ? .id ? ? = -1,
- ? ? ? .dev ? ?= {
- ? ? ? ? ? ? ? .platform_data ?= &palmz72_udc_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * Power supply
- ******************************************************************************/
-static int power_supply_init(struct device *dev)
-{
- ? ? ? int ret;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMZ72_POWER_DETECT, "CABLE_STATE_AC");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err1;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMZ72_POWER_DETECT);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
-
- ? ? ? ret = gpio_request(GPIO_NR_PALMZ72_USB_DETECT_N, "CABLE_STATE_USB");
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err2;
- ? ? ? ret = gpio_direction_input(GPIO_NR_PALMZ72_USB_DETECT_N);
- ? ? ? if (ret)
- ? ? ? ? ? ? ? goto err3;
-
- ? ? ? return 0;
-err3:
- ? ? ? gpio_free(GPIO_NR_PALMZ72_USB_DETECT_N);
-err2:
- ? ? ? gpio_free(GPIO_NR_PALMZ72_POWER_DETECT);
-err1:
- ? ? ? return ret;
-}
-
-static int palmz72_is_ac_online(void)
-{
- ? ? ? return gpio_get_value(GPIO_NR_PALMZ72_POWER_DETECT);
-}
-
-static int palmz72_is_usb_online(void)
-{
- ? ? ? return !gpio_get_value(GPIO_NR_PALMZ72_USB_DETECT_N);
-}
-
-static void power_supply_exit(struct device *dev)
-{
- ? ? ? gpio_free(GPIO_NR_PALMZ72_USB_DETECT_N);
- ? ? ? gpio_free(GPIO_NR_PALMZ72_POWER_DETECT);
-}
-
-static char *palmz72_supplicants[] = {
- ? ? ? "main-battery",
-};
-
-static struct pda_power_pdata power_supply_info = {
- ? ? ? .init ? ? ? ? ? ?= power_supply_init,
- ? ? ? .is_ac_online ? ?= palmz72_is_ac_online,
- ? ? ? .is_usb_online ? = palmz72_is_usb_online,
- ? ? ? .exit ? ? ? ? ? ?= power_supply_exit,
- ? ? ? .supplied_to ? ? = palmz72_supplicants,
- ? ? ? .num_supplicants = ARRAY_SIZE(palmz72_supplicants),
-};
-
-static struct platform_device power_supply = {
- ? ? ? .name = "pda-power",
- ? ? ? .id ? = -1,
- ? ? ? .dev ?= {
- ? ? ? ? ? ? ? .platform_data = &power_supply_info,
- ? ? ? },
-};
-
-/******************************************************************************
- * WM97xx audio, battery
- ******************************************************************************/
-static struct wm97xx_batt_pdata palmz72_batt_pdata = {
- ? ? ? .batt_aux ? ? ? = WM97XX_AUX_ID3,
- ? ? ? .temp_aux ? ? ? = WM97XX_AUX_ID2,
- ? ? ? .charge_gpio ? ?= -1,
- ? ? ? .max_voltage ? ?= PALMZ72_BAT_MAX_VOLTAGE,
- ? ? ? .min_voltage ? ?= PALMZ72_BAT_MIN_VOLTAGE,
- ? ? ? .batt_mult ? ? ?= 1000,
- ? ? ? .batt_div ? ? ? = 414,
- ? ? ? .temp_mult ? ? ?= 1,
- ? ? ? .temp_div ? ? ? = 1,
- ? ? ? .batt_tech ? ? ?= POWER_SUPPLY_TECHNOLOGY_LIPO,
- ? ? ? .batt_name ? ? ?= "main-batt",
-};
-
-static struct wm97xx_pdata palmz72_wm97xx_pdata = {
- ? ? ? .batt_pdata ? ? = &palmz72_batt_pdata,
-};
-
-static pxa2xx_audio_ops_t palmz72_ac97_pdata = {
- ? ? ? .codec_pdata ? ?= { &palmz72_wm97xx_pdata, },
-};
-
-static struct platform_device palmz72_asoc = {
- ? ? ? .name = "palm27x-asoc",
- ? ? ? .id ? = -1,
-};
-
-/******************************************************************************
- * Framebuffer
- ******************************************************************************/
-static struct pxafb_mode_info palmz72_lcd_modes[] = {
-{
- ? ? ? .pixclock ? ? ? = 115384,
- ? ? ? .xres ? ? ? ? ? = 320,
- ? ? ? .yres ? ? ? ? ? = 320,
- ? ? ? .bpp ? ? ? ? ? ?= 16,
-
- ? ? ? .left_margin ? ?= 27,
- ? ? ? .right_margin ? = 7,
- ? ? ? .upper_margin ? = 7,
- ? ? ? .lower_margin ? = 8,
-
- ? ? ? .hsync_len ? ? ?= 6,
- ? ? ? .vsync_len ? ? ?= 1,
-},
-};
-
-static struct pxafb_mach_info palmz72_lcd_screen = {
- ? ? ? .modes ? ? ? ? ?= palmz72_lcd_modes,
- ? ? ? .num_modes ? ? ?= ARRAY_SIZE(palmz72_lcd_modes),
- ? ? ? .lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
-};
-

?#ifdef CONFIG_PM

?/* We have some black magic here

arch/arm/mach-pxa/palmz72.c +0 -0

@@ -457,39 +238,25 @@ device_initcall(palmz72_pm_init);

?/****************************************************************************** ?* Machine init ?******************************************************************************/

arch/arm/mach-pxa/palmz72.c +11 -6

-static struct platform_device *devices[] __initdata = {
- ? ? ? &palmz72_backlight,
- ? ? ? &palmz72_leds,
- ? ? ? &palmz72_asoc,
- ? ? ? &power_supply,
- ? ? ? &palmz72_gpio_vbus,
+struct palm27x_handheld palmz72 = {
+ ? ? ? .mmc_detect ? ? = GPIO_NR_PALMZ72_SD_DETECT_N,
+ ? ? ? .mmc_ro ? ? ? ? = GPIO_NR_PALMZ72_SD_RO,
+ ? ? ? .mmc_power ? ? ?= GPIO_NR_PALMZ72_SD_POWER_N,
+ ? ? ? .pm_str_base ? ?= 0,
+ ? ? ? .udc_detect ? ? = GPIO_NR_PALMZ72_USB_DETECT_N,
+ ? ? ? .udc_pullup ? ? = GPIO_NR_PALMZ72_USB_PULLUP,
+ ? ? ? .irda_pwdn ? ? ?= GPIO_NR_PALMZ72_IR_DISABLE,
+ ? ? ? .batt_minv ? ? ?= PALMZ72_BAT_MIN_VOLTAGE,
+ ? ? ? .batt_maxv ? ? ?= PALMZ72_BAT_MAX_VOLTAGE,
+ ? ? ? .lcd_power ? ? ?= -1,

?};

arch/arm/mach-pxa/palmz72.c +0 -9

-/* setup udc GPIOs initial state */
-static void __init palmz72_udc_init(void)
-{
- ? ? ? if (!gpio_request(GPIO_NR_PALMZ72_USB_PULLUP, "USB Pullup")) {
- ? ? ? ? ? ? ? gpio_direction_output(GPIO_NR_PALMZ72_USB_PULLUP, 0);
- ? ? ? ? ? ? ? gpio_free(GPIO_NR_PALMZ72_USB_PULLUP);
- ? ? ? }
-}
-

?static void __init palmz72_init(void)
?{
? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(palmz72_pin_config));

arch/arm/mach-pxa/palmz72.c +1 -10

-
- ? ? ? pxa_set_ffuart_info(NULL);
- ? ? ? pxa_set_btuart_info(NULL);
- ? ? ? pxa_set_stuart_info(NULL);
-
- ? ? ? set_pxa_fb_info(&palmz72_lcd_screen);
- ? ? ? pxa_set_mci_info(&palmz72_mci_platform_data);
- ? ? ? palmz72_udc_init();
- ? ? ? pxa_set_ac97_info(&palmz72_ac97_pdata);
- ? ? ? pxa_set_ficp_info(&palmz72_ficp_platform_data);
+ ? ? ? palm27x_common_init(&palmz72);

? ? ? ?pxa_set_keypad_info(&palmz72_keypad_platform_data); -
- ? ? ? platform_add_devices(devices, ARRAY_SIZE(devices));
+ ? ? ? platform_device_register(&palmz72_leds); ?}

?MACHINE_START(PALMZ72, "Palm Zire72")
--
1.7.1

Signed-off-by Marek Vasut <[email protected]>

---
 arch/arm/mach-pxa/palm27x.c |   57 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

arch/arm/mach-pxa/palm27x.c +41 -0

index ff5ee8c..a1009ec 100644
@@ -21,6 +21,7 @@
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
+#include <linux/regulator/max1586.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>

@@ -35,6 +36,8 @@
 #include <mach/palmasoc.h>
 #include <mach/palm27x.h>
 
+#include <plat/i2c.h>
+
 #include "generic.h"
 #include "devices.h"
 

@@ -458,6 +461,59 @@ static void __init palm27x_power_init(int ac, int usb)
 static inline void palm27x_power_init(int ac, int usb) {}
 #endif
 
+/******************************************************************************
+ * Core power regulator
+ ******************************************************************************/
+#if defined(CONFIG_REGULATOR_MAX1586) || \
+    defined(CONFIG_REGULATOR_MAX1586_MODULE)
+static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
+	{
+		.supply	= "vcc_core",
+	}
+};
+
+static struct regulator_init_data palm27x_max1587a_v3_info = {
+	.constraints = {
+		.name		= "vcc_core range",
+		.min_uV		= 900000,
+		.max_uV		= 1705000,
+		.always_on	= 1,
+		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE,
+	},
+	.consumer_supplies	= palm27x_max1587a_consumers,
+	.num_consumer_supplies	= ARRAY_SIZE(palm27x_max1587a_consumers),
+};
+
+static struct max1586_subdev_data palm27x_max1587a_subdevs[] = {
+	{
+		.name		= "vcc_core",
+		.id		= MAX1586_V3,
+		.platform_data	= &palm27x_max1587a_v3_info,
+	}
+};
+
+static struct max1586_platform_data palm27x_max1587a_info = {
+	.subdevs     = palm27x_max1587a_subdevs,
+	.num_subdevs = ARRAY_SIZE(palm27x_max1587a_subdevs),
+	.v3_gain     = MAX1586_GAIN_R24_3k32, /* 730..1550 mV */
+};
+
+static struct i2c_board_info __initdata palm27x_pi2c_board_info[] = {

arch/arm/mach-pxa/palm27x.c +6 -0

+}
+#else
+static inline void palm27x_pmic_init(void) {}
+#endif
+
 void __init palm27x_common_init(struct palm27x_handheld *palm)
 {
 	pxa_set_ffuart_info(NULL);

@@ -472,4 +528,5 @@ void __init palm27x_common_init(struct palm27x_handheld *palm)
 	palm27x_ac97_init(palm->batt_minv, palm->batt_maxv, palm->jack_gpio);
 	palm27x_pwm_init(palm->bl_bl, palm->bl_lcd);
 	palm27x_power_init(palm->power_ac, palm->power_usb);
+	palm27x_pmic_init();
 }

Quoted 74 lines · Marek Vasut

Signed-off-by Marek Vasut <[email protected]>

---
?arch/arm/mach-pxa/palm27x.c | ? 57
+++++++++++++++++++++++++++++++++++++++++++
?1 files changed, 57 insertions(+), 0 deletions(-)

arch/arm/mach-pxa/palm27x.c +0 -0

index ff5ee8c..a1009ec 100644
@@ -21,6 +21,7 @@

?#include <linux/wm97xx.h>
?#include <linux/power_supply.h>
?#include <linux/usb/gpio_vbus.h>
+#include <linux/regulator/max1586.h>
?#include <asm/mach-types.h>
?#include <asm/mach/arch.h>

arch/arm/mach-pxa/palm27x.c +0 -0

@@ -35,6 +36,8 @@

?#include <mach/palmasoc.h>
?#include <mach/palm27x.h>
?+#include <plat/i2c.h>
+
?#include "generic.h"
?#include "devices.h"
?@@ -458,6 +461,59 @@ static void __init palm27x_power_init(int ac, int usb)
?static inline void palm27x_power_init(int ac, int usb) {} ?#endif

?+/******************************************************************************
+ * Core power regulator
+ ******************************************************************************/

arch/arm/mach-pxa/palm27x.c +40 -0

+#if defined(CONFIG_REGULATOR_MAX1586) || \
+ ? ?defined(CONFIG_REGULATOR_MAX1586_MODULE)
+static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .supply = "vcc_core",
+ ? ? ? }
+};
+
+static struct regulator_init_data palm27x_max1587a_v3_info = {
+ ? ? ? .constraints = {
+ ? ? ? ? ? ? ? .name ? ? ? ? ? = "vcc_core range",
+ ? ? ? ? ? ? ? .min_uV ? ? ? ? = 900000,
+ ? ? ? ? ? ? ? .max_uV ? ? ? ? = 1705000,
+ ? ? ? ? ? ? ? .always_on ? ? ?= 1,
+ ? ? ? ? ? ? ? .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+ ? ? ? },
+ ? ? ? .consumer_supplies ? ? ?= palm27x_max1587a_consumers,
+ ? ? ? .num_consumer_supplies ?= ARRAY_SIZE(palm27x_max1587a_consumers),
+};
+
+static struct max1586_subdev_data palm27x_max1587a_subdevs[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .name ? ? ? ? ? = "vcc_core",
+ ? ? ? ? ? ? ? .id ? ? ? ? ? ? = MAX1586_V3,
+ ? ? ? ? ? ? ? .platform_data ?= &palm27x_max1587a_v3_info,
+ ? ? ? }
+};
+
+static struct max1586_platform_data palm27x_max1587a_info = {
+ ? ? ? .subdevs ? ? = palm27x_max1587a_subdevs,
+ ? ? ? .num_subdevs = ARRAY_SIZE(palm27x_max1587a_subdevs),
+ ? ? ? .v3_gain ? ? = MAX1586_GAIN_R24_3k32, /* 730..1550 mV */
+};
+
+static struct i2c_board_info __initdata palm27x_pi2c_board_info[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? I2C_BOARD_INFO("max1586", 0x14),
+ ? ? ? ? ? ? ? .platform_data ?= &palm27x_max1587a_info,
+ ? ? ? },
+};

Quoted 6 lines

arch/arm/mach-pxa/palm27x.c +4 -0

+
+static void __init palm27x_pmic_init(void)
+{
+ ? ? ? i2c_register_board_info(1,

ARRAY_AND_SIZE(palm27x_pi2c_board_info));
+ ? ? ? pxa27x_set_i2c_power_info(NULL);

Consider using PIO mode for PMIC communications

Quoted 13 lines

arch/arm/mach-pxa/palm27x.c +5 -0

+}
+#else
+static inline void palm27x_pmic_init(void) {}
+#endif
+

?void __init palm27x_common_init(struct palm27x_handheld *palm) ?{
? ? ? ?pxa_set_ffuart_info(NULL);

arch/arm/mach-pxa/palm27x.c +0 -0

@@ -472,4 +528,5 @@ void __init palm27x_common_init(struct
 palm27x_handheld *palm)
 ? ? ? ?palm27x_ac97_init(palm->batt_minv, palm->batt_maxv,
 palm->jack_gpio);
 ? ? ? ?palm27x_pwm_init(palm->bl_bl, palm->bl_lcd);

Quoted 3 lines

? ? ? ?palm27x_power_init(palm->power_ac, palm->power_usb);
+ ? ? ? palm27x_pmic_init();
?}

--
Sincerely yours,
Mike.

Signed-off-by Marek Vasut <[email protected]>

---

?arch/arm/mach-pxa/palmld.c ? | ? 63 +++++++++++++++----
?arch/arm/mach-pxa/palmt5.c ? | ? 22 ++++++-
?arch/arm/mach-pxa/palmtreo.c | ?141 ++++++++++++++++++++----------------------
?arch/arm/mach-pxa/palmtx.c ? | ? 49 ++++++++++++---
?arch/arm/mach-pxa/palmz72.c ?| ? 22 ++++++-

?5 files changed, 196 insertions(+), 101 deletions(-)

arch/arm/mach-pxa/palmld.c +0 -0

index cac66ca..d59db0b 100644
@@ -128,6 +128,7 @@ static unsigned long palmld_pin_config[] __initdata = {

?/****************************************************************************** ?* NOR Flash ?******************************************************************************/ +#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) ?static struct mtd_partition palmld_partitions[] = {
? ? ? ?{
? ? ? ? ? ? ? ?.name ? ? ? ? ? = "Flash",

arch/arm/mach-pxa/palmld.c +8 -0

@@ -161,9 +162,18 @@ static struct platform_device palmld_flash = {
 ? ? ? ?},
 ?};
 
+static void __init palmld_nor_init(void)
+{
+ ? ? ? platform_device_register(&palmld_flash);
+}
+#else
+static inline void palmld_nor_init(void) {}
+#endif
+

?/****************************************************************************** ?* GPIO keyboard ?******************************************************************************/ +#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE) ?static unsigned int palmld_matrix_keys[] = {
? ? ? ?KEY(0, 1, KEY_F2),
? ? ? ?KEY(0, 2, KEY_UP),

arch/arm/mach-pxa/palmld.c +8 -0

@@ -190,9 +200,18 @@ static struct pxa27x_keypad_platform_data palmld_keypad_platform_data = {
 ? ? ? ?.debounce_interval ? ? ?= 30,
 ?};
 
+static void __init palmld_kpc_init(void)
+{
+ ? ? ? pxa_set_keypad_info(&palmld_keypad_platform_data);
+}
+#else
+static inline void palmld_kpc_init(void) {}
+#endif
+

?/****************************************************************************** ?* GPIO keys ?******************************************************************************/ +#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) ?static struct gpio_keys_button palmld_pxa_buttons[] = {
? ? ? ?{KEY_F8, GPIO_NR_PALMLD_HOTSYNC_BUTTON_N, 1, "HotSync Button" }, ? ? ? ?{KEY_F9, GPIO_NR_PALMLD_LOCK_SWITCH, 0, "Lock Switch" },

arch/arm/mach-pxa/palmld.c +8 -0

@@ -212,9 +231,18 @@ static struct platform_device palmld_pxa_keys = {
 ? ? ? ?},
 ?};
 
+static void __init palmld_keys_init(void)
+{
+ ? ? ? platform_device_register(&palmld_pxa_keys);
+}
+#else
+static inline void palmld_keys_init(void) {}
+#endif
+

?/****************************************************************************** ?* LEDs ?******************************************************************************/ +#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) ?struct gpio_led gpio_leds[] = {
?{
? ? ? ?.name ? ? ? ? ? ? ? ? ? = "palmld:green:led",

arch/arm/mach-pxa/palmld.c +8 -0

@@ -240,26 +268,34 @@ static struct platform_device palmld_leds = {
 ? ? ? ?}
 ?};
 
+static void __init palmld_leds_init(void)
+{
+ ? ? ? platform_device_register(&palmld_leds);
+}
+#else
+static inline void palmld_leds_init(void) {}
+#endif
+

?/****************************************************************************** ?* HDD ?******************************************************************************/

arch/arm/mach-pxa/palmld.c +2 -1

-static struct platform_device palmld_hdd = {
+#if defined(CONFIG_PATA_PALMLD) || defined(CONFIG_PATA_PALMLD_MODULE)
+static struct platform_device palmld_ide_device = {

? ? ? ?.name ? = "pata_palmld",
? ? ? ?.id ? ? = -1,
?};

arch/arm/mach-pxa/palmld.c +8 -0

+static void __init palmld_ide_init(void)
+{
+ ? ? ? platform_device_register(&palmld_ide_device);
+}
+#else
+static inline void palmld_ide_init(void) {}
+#endif
+

?/****************************************************************************** ?* Machine init ?******************************************************************************/

arch/arm/mach-pxa/palmld.c +0 -9

-static struct platform_device *devices[] __initdata = {
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
- ? ? ? &palmld_pxa_keys,
-#endif
- ? ? ? &palmld_leds,
- ? ? ? &palmld_hdd,
- ? ? ? &palmld_flash,
-};
-

?static struct map_desc palmld_io_desc[] __initdata = { ?{
? ? ? ?.virtual ? ? ? ?= PALMLD_IDE_VIRT,

This huge patch mostly shuffles code. The spitz.c file contained terrible mess and needed a cleanup, here it is:

1) Made every part modular, components are not built in if not selected.
2) Removed loads of preprocessor goo, mostly "#ifdef MACH_AKITA .... #endif" and ? similar code. The kernel size will grow by a few kb now, but the file is much ? more readable.
3) Reworked SD/CF power setting function and made it reentrant.
4) Add ISL6271A regulator support
5) Correctly register WM8750

Signed-off-by Marek Vasut <[email protected]>

---
?arch/arm/mach-pxa/include/mach/spitz.h | ? ?6 + ?arch/arm/mach-pxa/spitz.c ? ? ? ? ? ? ?| ?474 ++++++++++++++++++++------------ ?2 files changed, 311 insertions(+), 169 deletions(-)

arch/arm/mach-pxa/include/mach/spitz.h +6 -0

index dc1ff25..685749a 100644
@@ -181,3 +181,9 @@
 ?#define SPITZ_IRQ_GPIO_CF2_IRQ ? ? ? ?IRQ_GPIO(SPITZ_GPIO_CF2_IRQ)
 ?#define SPITZ_IRQ_GPIO_nSD_INT ? ? ? ?IRQ_GPIO(SPITZ_GPIO_nSD_INT)
 ?#define SPITZ_IRQ_GPIO_nSD_DETECT ? ? IRQ_GPIO(SPITZ_GPIO_nSD_DETECT)
+
+/*
+ * Shared data structures
+ */
+extern struct platform_device spitzssp_device;
+extern struct sharpsl_charger_machinfo spitz_pm_machinfo;

arch/arm/mach-pxa/spitz.c +0 -0

index 5153bf3..24c4d27 100644
@@ -18,14 +18,15 @@

?#include <linux/gpio_keys.h>
?#include <linux/gpio.h>
?#include <linux/leds.h>
-#include <linux/mtd/physmap.h>
?#include <linux/i2c.h>
?#include <linux/i2c/pca953x.h>
?#include <linux/spi/spi.h>
?#include <linux/spi/ads7846.h>
?#include <linux/spi/corgi_lcd.h>
+#include <linux/mtd/physmap.h>
?#include <linux/mtd/sharpsl.h>
?#include <linux/input/matrix_keypad.h>
+#include <linux/regulator/machine.h>

?#include <asm/setup.h>
?#include <asm/mach-types.h>

arch/arm/mach-pxa/spitz.c +0 -0

@@ -33,11 +34,9 @@

?#include <asm/mach/sharpsl_param.h>
?#include <asm/hardware/scoop.h>

-
?#include <mach/pxa27x.h>
?#include <mach/pxa27x-udc.h>
?#include <mach/reset.h>
-#include <plat/i2c.h>
?#include <mach/irda.h>
?#include <mach/mmc.h>
?#include <mach/ohci.h>

arch/arm/mach-pxa/spitz.c +0 -0

@@ -46,9 +45,14 @@

?#include <mach/spitz.h>
?#include <mach/sharpsl_pm.h>

arch/arm/mach-pxa/spitz.c +2 -0

+#include <plat/i2c.h>
+

?#include "generic.h"
?#include "devices.h"

+/******************************************************************************
+ * Pin configuration
+ ******************************************************************************/ ?static unsigned long spitz_pin_config[] __initdata = {
? ? ? ?/* Chip Selects */
? ? ? ?GPIO78_nCS_2, ? /* SCOOP #2 */

arch/arm/mach-pxa/spitz.c +0 -0

@@ -124,6 +128,11 @@ static unsigned long spitz_pin_config[] __initdata = {

? ? ? ?GPIO1_GPIO | WAKEUP_ON_EDGE_FALL, ? ? ? /* SPITZ_GPIO_RESET */ ?};

arch/arm/mach-pxa/spitz.c +5 -0

+
+/******************************************************************************
+ * Scoop GPIO expander
+ ******************************************************************************/
+#if defined(CONFIG_SHARP_SCOOP) || defined(CONFIG_SHARP_SCOOP_MODULE)

?/*
?* Spitz SCOOP Device #1
?*/

arch/arm/mach-pxa/spitz.c +8 -2

@@ -182,43 +191,60 @@ struct platform_device spitzscoop2_device = {
 ? ? ? ?.resource ? ? ? = spitz_scoop2_resources,
 ?};
 
-#define SPITZ_PWR_SD 0x01
-#define SPITZ_PWR_CF 0x02
+static void __init spitz_scoop_init(void)
+{
+ ? ? ? platform_device_register(&spitz_scoop1_device);
+
+ ? ? ? /* Akita doesn't have the second SCOOP chip */
+ ? ? ? if (!machine_is_akita())
+ ? ? ? ? ? ? ? platform_device_register(&spitzscoop2_device);
+}
 

?/* Power control is shared with between one of the CF slots and SD */

arch/arm/mach-pxa/spitz.c +1 -1

-static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)
+static void spitz_card_pwr_ctrl(uint8_t enable, uint8_t new_cpr)

?{
- ? ? ? unsigned short cpr = read_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR);
+ ? ? ? unsigned short cpr;
+ ? ? ? unsigned long flags;

- ? ? ? if (new_cpr & 0x0007) {
+ ? ? ? if (new_cpr & 0x7) {
? ? ? ? ? ? ? ?gpio_set_value(SPITZ_GPIO_CF_POWER, 1);
- ? ? ? ? ? ? ? if (!(cpr & 0x0002) && !(cpr & 0x0004))
- ? ? ? ? ? ? ? ? ? ? ? mdelay(5);
- ? ? ? ? ? ? ? if (device == SPITZ_PWR_CF)
- ? ? ? ? ? ? ? ? ? ? ? cpr |= 0x0002;
- ? ? ? ? ? ? ? if (device == SPITZ_PWR_SD)
- ? ? ? ? ? ? ? ? ? ? ? cpr |= 0x0004;
- ? ? ? ? ? ? ? write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);
- ? ? ? } else {
- ? ? ? ? ? ? ? if (device == SPITZ_PWR_CF)
- ? ? ? ? ? ? ? ? ? ? ? cpr &= ~0x0002;
- ? ? ? ? ? ? ? if (device == SPITZ_PWR_SD)
- ? ? ? ? ? ? ? ? ? ? ? cpr &= ~0x0004;
- ? ? ? ? ? ? ? if (!(cpr & 0x0002) && !(cpr & 0x0004)) {
- ? ? ? ? ? ? ? ? ? ? ? write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, 0x0000);
- ? ? ? ? ? ? ? ? ? ? ? mdelay(1);
- ? ? ? ? ? ? ? ? ? ? ? gpio_set_value(SPITZ_GPIO_CF_POWER, 0);
- ? ? ? ? ? ? ? } else {
- ? ? ? ? ? ? ? ? ? ? ? write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);
- ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? ? mdelay(5);
+ ? ? ? }

arch/arm/mach-pxa/spitz.c +17 -0

+
+ ? ? ? local_irq_save(flags);
+
+ ? ? ? cpr = read_scoop_reg(&spitz_scoop_1_device.dev, SCOOP_CPR);
+
+ ? ? ? if (enable & new_cpr)
+ ? ? ? ? ? ? ? cpr |= new_cpr;
+ ? ? ? else
+ ? ? ? ? ? ? ? cpr &= ~enable;
+
+ ? ? ? write_scoop_reg(&spitz_scoop_1_device.dev, SCOOP_CPR, cpr);
+
+ ? ? ? local_irq_restore(flags);
+
+ ? ? ? if (!(cpr & 0x7)) {
+ ? ? ? ? ? ? ? mdelay(1);
+ ? ? ? ? ? ? ? gpio_set_value(SPITZ_GPIO_CF_POWER, 0);

? ? ? ?}
?}

arch/arm/mach-pxa/spitz.c +10 -1

-static void spitz_pcmcia_pwr(struct device *scoop, unsigned short cpr, int nr)
+#else
+static inline void spitz_scoop_init(void) {}
+static inline void spitz_card_pwr_ctrl(uint8_t enable, uint8_t new_cpr) {}
+#endif
+
+/******************************************************************************
+ * PCMCIA
+ ******************************************************************************/
+#if defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
+static void spitz_pcmcia_pwr(struct device *scoop, uint16_t cpr, int nr)

?{
? ? ? ?/* Only need to override behaviour for slot 0 */
? ? ? ?if (nr == 0)
- ? ? ? ? ? ? ? spitz_card_pwr_ctrl(SPITZ_PWR_CF, cpr);
+ ? ? ? ? ? ? ? spitz_card_pwr_ctrl(
+ ? ? ? ? ? ? ? ? ? ? ? cpr & (SCOOP_CPR_CF_3V | SCOOP_CPR_CF_XV), cpr); ? ? ? ?else
? ? ? ? ? ? ? ?write_scoop_reg(scoop, SCOOP_CPR, cpr);
?}

arch/arm/mach-pxa/spitz.c +17 -3

@@ -242,9 +268,23 @@ static struct scoop_pcmcia_config spitz_pcmcia_config = {
 ? ? ? ?.power_ctrl ? = spitz_pcmcia_pwr,
 ?};
 
-/*
- * Spitz Keyboard Device
- */
+static void __init spitz_pcmcia_init(void)
+{
+ ? ? ? /* Akita has only one PCMCIA slot used */
+ ? ? ? if (machine_is_akita())
+ ? ? ? ? ? ? ? spitz_pcmcia_config.num_devs = 1;
+
+ ? ? ? platform_scoop_config = &spitz_pcmcia_config;
+}
+#else
+static inline void spitz_pcmcia_init(void) {}
+#endif
+
+/******************************************************************************
+ * GPIO keyboard
+ ******************************************************************************/
+#if defined(CONFIG_KEYBOARD_MATRIX) || defined(CONFIG_KEYBOARD_MATRIX_MODULE)
+

?#define SPITZ_KEY_CALENDAR ? ? KEY_F1
?#define SPITZ_KEY_ADDRESS ? ? ?KEY_F2
?#define SPITZ_KEY_FN ? ? ? ? ? KEY_F3

arch/arm/mach-pxa/spitz.c +41 -9

@@ -356,7 +396,18 @@ static struct platform_device spitzkbd_device = {
 ? ? ? ?},
 ?};
 
+static void __init spitz_mkp_init(void)
+{
+ ? ? ? platform_device_register(&spitzkbd_device);
+}
+#else
+static inline void spitz_mkp_init(void) {}
+#endif
 
+/******************************************************************************
+ * GPIO keys
+ ******************************************************************************/
+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 ?static struct gpio_keys_button spitz_gpio_keys[] = {
 ? ? ? ?{
 ? ? ? ? ? ? ? ?.type ? = EV_PWR,

@@ -393,10 +444,18 @@ static struct platform_device spitz_gpio_keys_device = {
 ? ? ? ?},
 ?};
 
+static void __init spitz_keys_init(void)
+{
+ ? ? ? platform_device_register(&spitz_gpio_keys_device);
+}
+#else
+static inline void spitz_keys_init(void) {}
+#endif
 
-/*
- * Spitz LEDs
- */
+/******************************************************************************
+ * LEDs
+ ******************************************************************************/
+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
 ?static struct gpio_led spitz_gpio_leds[] = {
 ? ? ? ?{
 ? ? ? ? ? ? ? ?.name ? ? ? ? ? ? ? ? ? = "spitz:amber:charge",

@@ -423,11 +482,18 @@ static struct platform_device spitzled_device = {
 ? ? ? ?},
 ?};
 
-#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
-static struct pxa2xx_spi_master spitz_spi_info = {
- ? ? ? .num_chipselect = 3,
-};
+static void __init spitz_leds_init(void)
+{
+ ? ? ? platform_device_register(&spitzled_device);
+}
+#else
+static inline void spitz_leds_init(void) {}
+#endif
 
+/******************************************************************************
+ * SSP Devices
+ ******************************************************************************/
+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
 ?static void spitz_wait_for_hsync(void)
 ?{
 ? ? ? ?while (gpio_get_value(SPITZ_GPIO_HSYNC))

@@ -505,11 +571,17 @@ static struct spi_board_info spitz_spi_devices[] = {
 ? ? ? ?},
 ?};
 
+static struct pxa2xx_spi_master spitz_spi_info = {
+ ? ? ? .num_chipselect = 3,
+};
+
 ?static void __init spitz_init_spi(void)
 ?{
+ ? ? ? struct corgi_lcd_platform_data *lcd_data = &spitz_lcdcon_info;
+
 ? ? ? ?if (machine_is_akita()) {
- ? ? ? ? ? ? ? spitz_lcdcon_info.gpio_backlight_cont = AKITA_GPIO_BACKLIGHT_CONT;
- ? ? ? ? ? ? ? spitz_lcdcon_info.gpio_backlight_on = AKITA_GPIO_BACKLIGHT_ON;
+ ? ? ? ? ? ? ? lcd_data->gpio_backlight_cont = AKITA_GPIO_BACKLIGHT_CONT;
+ ? ? ? ? ? ? ? lcd_data->gpio_backlight_on = AKITA_GPIO_BACKLIGHT_ON;
 ? ? ? ?}
 
 ? ? ? ?pxa2xx_set_spi_info(2, &spitz_spi_info);

@@ -519,20 +591,22 @@ static void __init spitz_init_spi(void)
 ?static inline void spitz_init_spi(void) {}

?#endif

arch/arm/mach-pxa/spitz.c +4 -0

+/******************************************************************************
+ * SD/MMC card controller
+ ******************************************************************************/
+#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)

?/*
- * MMC/SD Device
- *
- * The card detect interrupt isn't debounced so we delay it by 250ms
- * to give the card a chance to fully insert/eject.
+ * NOTE: The card detect interrupt isn't debounced so we delay it by 250ms to
+ * give the card a chance to fully insert/eject.
?*/
?static void spitz_mci_setpower(struct device *dev, unsigned int vdd) ?{
? ? ? ?struct pxamci_platform_data* p_d = dev->platform_data;

- ? ? ? if (( 1 << vdd) & p_d->ocr_mask)
- ? ? ? ? ? ? ? spitz_card_pwr_ctrl(SPITZ_PWR_SD, 0x0004);
+ ? ? ? if ((1 << vdd) & p_d->ocr_mask)
+ ? ? ? ? ? ? ? spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, SCOOP_CPR_SD_3V); ? ? ? ?else
- ? ? ? ? ? ? ? spitz_card_pwr_ctrl(SPITZ_PWR_SD, 0x0000);
+ ? ? ? ? ? ? ? spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, 0x0); ?}

?static struct pxamci_platform_data spitz_mci_platform_data = {

arch/arm/mach-pxa/spitz.c +52 -16

@@ -544,10 +618,18 @@ static struct pxamci_platform_data spitz_mci_platform_data = {
 ? ? ? ?.gpio_power ? ? ? ? ? ? = -1,
 ?};
 
+static void __init spitz_mmc_init(void)
+{
+ ? ? ? pxa_set_mci_info(&spitz_mci_platform_data);
+}
+#else
+static inline void spitz_mmc_init(void) {}
+#endif
 
-/*
- * USB Host (OHCI)
- */
+/******************************************************************************
+ * USB Host
+ ******************************************************************************/
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 ?static int spitz_ohci_init(struct device *dev)
 ?{
 ? ? ? ?int err;

@@ -556,9 +638,7 @@ static int spitz_ohci_init(struct device *dev)
 ? ? ? ?if (err)
 ? ? ? ? ? ? ? ?return err;
 
- ? ? ? /* Only Port 2 is connected
- ? ? ? ?* Setup USB Port 2 Output Control Register
- ? ? ? ?*/
+ ? ? ? /* Only Port 2 is connected, setup USB Port 2 Output Control Register */
 ? ? ? ?UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;
 
 ? ? ? ?return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);

@@ -577,21 +657,39 @@ static struct pxaohci_platform_data spitz_ohci_platform_data = {
 ? ? ? ?.power_budget ? = 150,
 ?};
 
+static void __init spitz_uhc_init(void)
+{
+ ? ? ? pxa_set_ohci_info(&spitz_ohci_platform_data);
+}
+#else
+static inline void spitz_uhc_init(void) {}
+#endif
 
-/*
- * Irda
- */
-
+/******************************************************************************
+ * IrDA
+ ******************************************************************************/
+#if defined(CONFIG_PXA_FICP) || defined(CONFIG_PXA_FICP_MODULE)
 ?static struct pxaficp_platform_data spitz_ficp_platform_data = {
-/* .gpio_pwdown is set in spitz_init() and akita_init() accordingly */
 ? ? ? ?.transceiver_cap ? ? ? ?= IR_SIRMODE | IR_OFF,
 ?};
 
+static void __init spitz_irda_init(void)
+{
+ ? ? ? if (machine_is_akita())
+ ? ? ? ? ? ? ? spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;
+ ? ? ? else
+ ? ? ? ? ? ? ? spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
 
-/*
- * Spitz PXA Framebuffer
- */
+ ? ? ? pxa_set_ficp_info(&spitz_ficp_platform_data);
+}
+#else
+static inline void spitz_irda_init(void) {}
+#endif
 
+/******************************************************************************
+ * Framebuffer
+ ******************************************************************************/
+#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
 ?static struct pxafb_mode_info spitz_pxafb_modes[] = {
 ?{
 ? ? ? ?.pixclock ? ? ? = 19231,

@@ -621,12 +719,24 @@ static struct pxafb_mode_info spitz_pxafb_modes[] = {
 ?};
 
 ?static struct pxafb_mach_info spitz_pxafb_info = {
- ? ? ? .modes ? ? ? ? ?= &spitz_pxafb_modes[0],
- ? ? ? .num_modes ? ? ?= 2,
+ ? ? ? .modes ? ? ? ? ?= spitz_pxafb_modes,
+ ? ? ? .num_modes ? ? ?= ARRAY_SIZE(spitz_pxafb_modes),
 ? ? ? ?.fixed_modes ? ?= 1,
 ? ? ? ?.lcd_conn ? ? ? = LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,
 ?};
 
+static void __init spitz_lcd_init(void)
+{
+ ? ? ? set_pxa_fb_info(&spitz_pxafb_info);
+}
+#else
+static inline void spitz_lcd_init(void) {}
+#endif
+
+/******************************************************************************
+ * Framebuffer
+ ******************************************************************************/
+#if defined(CONFIG_MTD_NAND_SHARPSL) || defined(CONFIG_MTD_NAND_SHARPSL_MODULE)
 ?static struct mtd_partition sharpsl_nand_partitions[] = {
 ? ? ? ?{
 ? ? ? ? ? ? ? ?.name = "System Area",

@@ -653,6 +763,16 @@ static struct nand_bbt_descr sharpsl_bbt = {

? ? ? ?.pattern = scan_ff_pattern
?};

arch/arm/mach-pxa/spitz.c +10 -0

+static struct nand_ecclayout spitz_akita_oobinfo = {
+ ? ? ? .oobfree ? ? ? ?= { {0x08, 0x09} },
+ ? ? ? .eccbytes ? ? ? = 24,
+ ? ? ? .eccpos ? ? ? ? = {
+ ? ? ? ? ? ? ? ? ? ? ? 0x05, 0x01, 0x02, 0x03, 0x06, 0x07, 0x15, 0x11,
+ ? ? ? ? ? ? ? ? ? ? ? 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+ ? ? ? ? ? ? ? ? ? ? ? 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37,
+ ? ? ? },
+};
+

?static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = { ? ? ? ?.badblock_pattern ? ? ? = &sharpsl_bbt,
? ? ? ?.partitions ? ? ? ? ? ? = sharpsl_nand_partitions,

arch/arm/mach-pxa/spitz.c +106 -13

@@ -661,8 +781,8 @@ static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
 
 ?static struct resource sharpsl_nand_resources[] = {
 ? ? ? ?{
- ? ? ? ? ? ? ? .start ?= 0x0C000000,
- ? ? ? ? ? ? ? .end ? ?= 0x0C000FFF,
+ ? ? ? ? ? ? ? .start ?= PXA_CS3_PHYS,
+ ? ? ? ? ? ? ? .end ? ?= PXA_CS3_PHYS + SZ_4K - 1,
 ? ? ? ? ? ? ? ?.flags ?= IORESOURCE_MEM,
 ? ? ? ?},
 ?};

@@ -672,10 +792,35 @@ static struct platform_device sharpsl_nand_device = {
 ? ? ? ?.id ? ? ? ? ? ? = -1,
 ? ? ? ?.resource ? ? ? = sharpsl_nand_resources,
 ? ? ? ?.num_resources ?= ARRAY_SIZE(sharpsl_nand_resources),
- ? ? ? .dev.platform_data ? ? ?= &sharpsl_nand_platform_data,
+ ? ? ? .dev ? ? ? ? ? ?= {
+ ? ? ? ? ? ? ? .platform_data ?= &sharpsl_nand_platform_data,
+ ? ? ? }
 ?};
 
+static void __init spitz_nand_init(void)
+{
+ ? ? ? if (machine_is_spitz()) {
+ ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;
+ ? ? ? } else if (machine_is_akita()) {
+ ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;
+ ? ? ? ? ? ? ? sharpsl_nand_bbt.len = 1;
+ ? ? ? ? ? ? ? sharpsl_nand_pdata.ecc_layout = &spitz_akita_oobinfo;
+ ? ? ? } else if (machine_is_borzoi()) {
+ ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;
+ ? ? ? ? ? ? ? sharpsl_nand_bbt.len = 1;
+ ? ? ? ? ? ? ? sharpsl_nand_pdata.ecc_layout = &spitz_akita_oobinfo;
+ ? ? ? }
+
+ ? ? ? platform_device_register(&sharpsl_nand_device);
+}
+#else
+static inline void spitz_nand_init(void) {}
+#endif
 
+/******************************************************************************
+ * NOR Flash
+ ******************************************************************************/
+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
 ?static struct mtd_partition sharpsl_rom_parts[] = {
 ? ? ? ?{
 ? ? ? ? ? ? ? ?.name ? ="Boot PROM Filesystem",

@@ -692,8 +837,8 @@ static struct physmap_flash_data sharpsl_rom_data = {
 
 ?static struct resource sharpsl_rom_resources[] = {
 ? ? ? ?{
- ? ? ? ? ? ? ? .start ?= 0x00000000,
- ? ? ? ? ? ? ? .end ? ?= 0x007fffff,
+ ? ? ? ? ? ? ? .start ?= PXA_CS0_PHYS,
+ ? ? ? ? ? ? ? .end ? ?= PXA_CS0_PHYS + SZ_8M - 1,
 ? ? ? ? ? ? ? ?.flags ?= IORESOURCE_MEM,
 ? ? ? ?},
 ?};

@@ -703,18 +848,86 @@ static struct platform_device sharpsl_rom_device = {
 ? ? ? ?.id ? ? = -1,
 ? ? ? ?.resource = sharpsl_rom_resources,
 ? ? ? ?.num_resources = ARRAY_SIZE(sharpsl_rom_resources),
- ? ? ? .dev.platform_data = &sharpsl_rom_data,
+ ? ? ? .dev ? ? ? ? ? ?= {
+ ? ? ? ? ? ? ? .platform_data ?= &sharpsl_rom_data,
+ ? ? ? },
+};
+
+static void __init spitz_nor_init(void)
+{
+ ? ? ? platform_device_register(&sharpsl_rom_device);
+}
+#else
+static inline void spitz_nor_init(void) {}
+#endif
+
+/******************************************************************************
+ * GPIO expander
+ ******************************************************************************/
+#if defined(CONFIG_I2C_PXA) || defined(CONFIG_I2C_PXA_MODULE)
+static struct pca953x_platform_data akita_pca953x_pdata = {
+ ? ? ? .gpio_base ? ? ? ? ? ? ?= AKITA_IOEXP_GPIO_BASE,
+};
+
+static struct i2c_board_info spitz_i2c_devs[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .type ? ? ? ? ? = "wm8750",
+ ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x1b,
+ ? ? ? }, {
+ ? ? ? ? ? ? ? .type ? ? ? ? ? = "max7310",
+ ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x18,
+ ? ? ? ? ? ? ? .platform_data ?= &akita_pca953x_pdata,
+ ? ? ? },
+};
+
+static struct regulator_consumer_supply isl6271a_consumers[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .supply = "vcc_core",
+ ? ? ? }
 ?};
 
-static struct platform_device *devices[] __initdata = {
- ? ? ? &spitzscoop_device,
- ? ? ? &spitzkbd_device,
- ? ? ? &spitz_gpio_keys_device,
- ? ? ? &spitzled_device,
- ? ? ? &sharpsl_nand_device,
- ? ? ? &sharpsl_rom_device,
+static struct regulator_init_data isl6271a_info[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .constraints = {
+ ? ? ? ? ? ? ? ? ? ? ? .name ? ? ? ? ? = "vcc_core range",
+ ? ? ? ? ? ? ? ? ? ? ? .min_uV ? ? ? ? = 850000,
+ ? ? ? ? ? ? ? ? ? ? ? .max_uV ? ? ? ? = 1600000,
+ ? ? ? ? ? ? ? ? ? ? ? .always_on ? ? ?= 1,
+ ? ? ? ? ? ? ? ? ? ? ? .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+ ? ? ? ? ? ? ? },
+ ? ? ? .consumer_supplies ? ? ?= isl6271a_consumers,
+ ? ? ? .num_consumer_supplies ?= ARRAY_SIZE(isl6271a_consumers),
+ ? ? ? }
 ?};
 
+static struct i2c_board_info spitz_pi2c_devs[] = {
+ ? ? ? {
+ ? ? ? ? ? ? ? .type ? ? ? ? ? = "isl6271a",
+ ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x0c,
+ ? ? ? ? ? ? ? .platform_data ?= &isl6271a_info,
+ ? ? ? },
+};
+
+static void __init spitz_i2c_init(void)
+{
+ ? ? ? int size = ARRAY_SIZE(spitz_i2c_devs);
+
+ ? ? ? /* Only Akita has the max7310 chip */
+ ? ? ? if (!machine_is_akita())
+ ? ? ? ? ? ? ? size--;
+
+ ? ? ? pxa_set_i2c_info(NULL);
+ ? ? ? pxa27x_set_i2c_power_info(NULL);
+ ? ? ? i2c_register_board_info(0, spitz_i2c_devs, size);
+ ? ? ? i2c_register_board_info(1, ARRAY_AND_SIZE(spitz_pi2c_devs));
+}
+#else
+static inline void spitz_i2c_init(void) {}
+#endif
+
+/******************************************************************************
+ * Machine init
+ ******************************************************************************/
 ?static void spitz_poweroff(void)
 ?{
 ? ? ? ?arm_machine_restart('g', NULL);

@@ -723,26 +936,18 @@ static void spitz_poweroff(void)
 ?static void spitz_restart(char mode, const char *cmd)
 ?{

? ? ? ?/* Bootloader magic for a reboot */
- ? ? ? if((MSC0 & 0xffff0000) == 0x7ff00000)
+ ? ? ? if ((MSC0 & 0xffff0000) == 0x7ff00000) ? ? ? ? ? ? ? ?MSC0 = (MSC0 & 0xffff) | 0x7ee00000;

? ? ? ?spitz_poweroff();
?}

arch/arm/mach-pxa/spitz.c +1 -1

-static void __init common_init(void)
+static void __init spitz_init(void)

?{
? ? ? ?init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0); ? ? ? ?pm_power_off = spitz_poweroff;
? ? ? ?arm_pm_restart = spitz_restart;

- ? ? ? if (machine_is_spitz()) {
- ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;
- ? ? ? } else if (machine_is_akita()) {
- ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;
- ? ? ? } else if (machine_is_borzoi()) {
- ? ? ? ? ? ? ? sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;
- ? ? ? }
-
? ? ? ?PMCR = 0x00;

? ? ? ?/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */

arch/arm/mach-pxa/spitz.c +13 -82

@@ -755,88 +960,19 @@ static void __init common_init(void)
 ? ? ? ?pxa_set_stuart_info(NULL);
 
 ? ? ? ?spitz_init_spi();
-
- ? ? ? platform_add_devices(devices, ARRAY_SIZE(devices));
- ? ? ? pxa_set_mci_info(&spitz_mci_platform_data);
- ? ? ? pxa_set_ohci_info(&spitz_ohci_platform_data);
- ? ? ? pxa_set_ficp_info(&spitz_ficp_platform_data);
- ? ? ? set_pxa_fb_info(&spitz_pxafb_info);
- ? ? ? pxa_set_i2c_info(NULL);
-}
-
-#if defined(CONFIG_MACH_AKITA) || defined(CONFIG_MACH_BORZOI)
-static struct nand_bbt_descr sharpsl_akita_bbt = {
- ? ? ? .options = 0,
- ? ? ? .offs = 4,
- ? ? ? .len = 1,
- ? ? ? .pattern = scan_ff_pattern
-};
-
-static struct nand_ecclayout akita_oobinfo = {
- ? ? ? .eccbytes = 24,
- ? ? ? .eccpos = {
- ? ? ? ? ? ? ? ? ?0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
- ? ? ? ? ? ? ? ? ?0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
- ? ? ? ? ? ? ? ? ?0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
- ? ? ? .oobfree = {{0x08, 0x09}}
-};
-#endif
-
-#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
-static void __init spitz_init(void)
-{
- ? ? ? spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
-
-#ifdef CONFIG_MACH_BORZOI
- ? ? ? if (machine_is_borzoi()) {
- ? ? ? ? ? ? ? sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
- ? ? ? ? ? ? ? sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
- ? ? ? }
-#endif
-
- ? ? ? platform_scoop_config = &spitz_pcmcia_config;
-
- ? ? ? common_init();
-
- ? ? ? platform_device_register(&spitzscoop2_device);
-}
-#endif
-
-#ifdef CONFIG_MACH_AKITA
-/*
- * Akita IO Expander
- */
-static struct pca953x_platform_data akita_ioexp = {
- ? ? ? .gpio_base ? ? ? ? ? ? ?= AKITA_IOEXP_GPIO_BASE,
-};
-
-static struct i2c_board_info akita_i2c_board_info[] = {
- ? ? ? {
- ? ? ? ? ? ? ? .type ? ? ? ? ? = "max7310",
- ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x18,
- ? ? ? ? ? ? ? .platform_data ?= &akita_ioexp,
- ? ? ? }, {
- ? ? ? ? ? ? ? .type ? ? ? ? ? = "wm8750",
- ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x1b,
- ? ? ? },
-};
-
-static void __init akita_init(void)
-{
- ? ? ? spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;
-
- ? ? ? sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
- ? ? ? sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
-
- ? ? ? /* We just pretend the second element of the array doesn't exist */
- ? ? ? spitz_pcmcia_config.num_devs = 1;
- ? ? ? platform_scoop_config = &spitz_pcmcia_config;
-
- ? ? ? i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info));
-
- ? ? ? common_init();
+ ? ? ? spitz_scoop_init();
+ ? ? ? spitz_mkp_init();
+ ? ? ? spitz_keys_init();
+ ? ? ? spitz_leds_init();
+ ? ? ? spitz_mmc_init();
+ ? ? ? spitz_pcmcia_init();
+ ? ? ? spitz_irda_init();
+ ? ? ? spitz_uhc_init();
+ ? ? ? spitz_lcd_init();
+ ? ? ? spitz_nor_init();
+ ? ? ? spitz_nand_init();
+ ? ? ? spitz_i2c_init();
 ?}
-#endif
 
 ?static void __init fixup_spitz(struct machine_desc *desc,
 ? ? ? ? ? ? ? ?struct tag *tags, char **cmdline, struct meminfo *mi)

@@ -879,7 +1015,7 @@ MACHINE_START(AKITA, "SHARP Akita")
 ? ? ? ?.fixup ? ? ? ? ?= fixup_spitz,
 ? ? ? ?.map_io ? ? ? ? = pxa_map_io,
 ? ? ? ?.init_irq ? ? ? = pxa27x_init_irq,
- ? ? ? .init_machine ? = akita_init,
+ ? ? ? .init_machine ? = spitz_init,
 ? ? ? ?.timer ? ? ? ? ?= &pxa_timer,

?MACHINE_END
?#endif
--
1.7.1

Improve formating so checkpatch passes. Also, change some function and variable names to make the naming consistent.

Signed-off-by Marek Vasut <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

---
?arch/arm/mach-pxa/z2.c | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/z2.c +1 -2

index 07d8bd8..f0d0228 100644
@@ -164,7 +164,7 @@ static struct mtd_partition z2_flash_parts[] = {
 ? ? ? ?}, {
 ? ? ? ? ? ? ? ?.name ? = "U-Boot Environment",
 ? ? ? ? ? ? ? ?.offset = 0x40000,
- ? ? ? ? ? ? ? .size ? = 0x60000,
+ ? ? ? ? ? ? ? .size ? = 0x20000,
 ? ? ? ?}, {
 ? ? ? ? ? ? ? ?.name ? = "Flash",
 ? ? ? ? ? ? ? ?.offset = 0x60000,
--

1.7.1