diff --git a/debian/changelog b/debian/changelog index ceb5b1438..f3623fc0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ linux-2.6 (2.6.32-16) UNRELEASED; urgency=low * ARM: update mach types. * Add support for OpenRD-Ultimate. * QNAP TS-11x/TS-21x: Add MPP36 (RAM) and MPP44 (board ID). + * Add support for the HP t5325 Thin Client. -- dann frazier Tue, 01 Jun 2010 09:23:57 -0600 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 4d3a86674..eb135b8c6 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -66,6 +66,7 @@ CONFIG_MACH_OPENRD=y CONFIG_MACH_OPENRD_BASE=y CONFIG_MACH_OPENRD_CLIENT=y CONFIG_MACH_OPENRD_ULTIMATE=y +CONFIG_MACH_T5325=y ## ## file: arch/arm/mm/Kconfig diff --git a/debian/patches/features/arm/hp-t5325.patch b/debian/patches/features/arm/hp-t5325.patch new file mode 100644 index 000000000..f0501de8e --- /dev/null +++ b/debian/patches/features/arm/hp-t5325.patch @@ -0,0 +1,233 @@ +Subject: [PATCH] Kirkwood: Add support for HP t5325 Thin Client + +Add support for the HP t5325 Thin Client. This thin client is based +on a Marvell Kirkwood chip at 1.2 GHz and features 512 MB RAM, 512 MB +SATA-attached flash and an XGI Volari Z11 GPU. + +Signed-off-by: Martin Michlmayr + +diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig +index 29b2163..4278271 100644 +--- a/arch/arm/mach-kirkwood/Kconfig ++++ b/arch/arm/mach-kirkwood/Kconfig +@@ -81,6 +81,12 @@ + Say 'Y' here if you want your kernel to support the + Marvell OpenRD Ultimate Board. + ++config MACH_T5325 ++ bool "HP t5325 Thin Client" ++ help ++ Say 'Y' here if you want your kernel to support the ++ HP t5325 Thin Client. ++ + endmenu + + endif +diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +index c0cd5d3..b7c5d5e 100644 +--- a/arch/arm/mach-kirkwood/Makefile ++++ b/arch/arm/mach-kirkwood/Makefile +@@ -10,5 +10,6 @@ + obj-$(CONFIG_MACH_TS219) += ts219-setup.o + obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o + obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o ++obj-$(CONFIG_MACH_T5325) += t5325-setup.o + + obj-$(CONFIG_CPU_IDLE) += cpuidle.o +--- /dev/null 2010-05-25 13:42:08.579681378 +0000 ++++ b/arch/arm/mach-kirkwood/t5325-setup.c 2010-05-24 14:48:44.000000000 +0000 +@@ -0,0 +1,194 @@ ++/* ++ * ++ * HP t5325 Thin Client setup ++ * ++ * Copyright (C) 2010 Martin Michlmayr ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++struct mtd_partition hp_t5325_partitions[] = { ++ { ++ .name = "u-boot env", ++ .size = SZ_64K, ++ .offset = SZ_512K + SZ_256K, ++ }, ++ { ++ .name = "permanent u-boot env", ++ .size = SZ_64K, ++ .offset = MTDPART_OFS_APPEND, ++ .mask_flags = MTD_WRITEABLE, ++ }, ++ { ++ .name = "HP env", ++ .size = SZ_64K, ++ .offset = MTDPART_OFS_APPEND, ++ }, ++ { ++ .name = "u-boot", ++ .size = SZ_512K, ++ .offset = 0, ++ .mask_flags = MTD_WRITEABLE, ++ }, ++ { ++ .name = "SSD firmware", ++ .size = SZ_256K, ++ .offset = SZ_512K, ++ }, ++}; ++ ++const struct flash_platform_data hp_t5325_flash = { ++ .type = "mx25l8005", ++ .name = "spi_flash", ++ .parts = hp_t5325_partitions, ++ .nr_parts = ARRAY_SIZE(hp_t5325_partitions), ++}; ++ ++struct spi_board_info __initdata hp_t5325_spi_slave_info[] = { ++ { ++ .modalias = "m25p80", ++ .platform_data = &hp_t5325_flash, ++ .irq = -1, ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data hp_t5325_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(8), ++}; ++ ++static struct mv_sata_platform_data hp_t5325_sata_data = { ++ .n_ports = 2, ++}; ++ ++static struct gpio_keys_button hp_t5325_buttons[] = { ++ { ++ .code = KEY_POWER, ++ .gpio = 45, ++ .desc = "Power", ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_keys_platform_data hp_t5325_button_data = { ++ .buttons = hp_t5325_buttons, ++ .nbuttons = ARRAY_SIZE(hp_t5325_buttons), ++}; ++ ++static struct platform_device hp_t5325_button_device = { ++ .name = "gpio-keys", ++ .id = -1, ++ .num_resources = 0, ++ .dev = { ++ .platform_data = &hp_t5325_button_data, ++ } ++}; ++ ++static unsigned int hp_t5325_mpp_config[] __initdata = { ++ MPP0_NF_IO2, ++ MPP1_SPI_MOSI, ++ MPP2_SPI_SCK, ++ MPP3_SPI_MISO, ++ MPP4_NF_IO6, ++ MPP5_NF_IO7, ++ MPP6_SYSRST_OUTn, ++ MPP7_SPI_SCn, ++ MPP8_TW_SDA, ++ MPP9_TW_SCK, ++ MPP10_UART0_TXD, ++ MPP11_UART0_RXD, ++ MPP12_SD_CLK, ++ MPP13_GPIO, ++ MPP14_GPIO, ++ MPP15_GPIO, ++ MPP16_GPIO, ++ MPP17_GPIO, ++ MPP18_NF_IO0, ++ MPP19_NF_IO1, ++ MPP20_GPIO, ++ MPP21_GPIO, ++ MPP22_GPIO, ++ MPP23_GPIO, ++ MPP32_GPIO, ++ MPP33_GE1_13, ++ MPP39_AUDIO_I2SBCLK, ++ MPP40_AUDIO_I2SDO, ++ MPP41_AUDIO_I2SLRC, ++ MPP42_AUDIO_I2SMCLK, ++ MPP45_GPIO, /* Power button */ ++ MPP48_GPIO, /* Board power off */ ++ 0 ++}; ++ ++#define HP_T5325_GPIO_POWER_OFF 48 ++ ++static void hp_t5325_power_off(void) ++{ ++ gpio_set_value(HP_T5325_GPIO_POWER_OFF, 1); ++} ++ ++static void __init hp_t5325_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(hp_t5325_mpp_config); ++ ++ kirkwood_uart0_init(); ++ spi_register_board_info(hp_t5325_spi_slave_info, ++ ARRAY_SIZE(hp_t5325_spi_slave_info)); ++ kirkwood_spi_init(); ++ kirkwood_i2c_init(); ++ kirkwood_ge00_init(&hp_t5325_ge00_data); ++ kirkwood_sata_init(&hp_t5325_sata_data); ++ kirkwood_ehci_init(); ++ platform_device_register(&hp_t5325_button_device); ++ ++ if (gpio_request(HP_T5325_GPIO_POWER_OFF, "power-off") == 0 && ++ gpio_direction_output(HP_T5325_GPIO_POWER_OFF, 0) == 0) ++ pm_power_off = hp_t5325_power_off; ++ else ++ pr_err("t5325: failed to configure power-off GPIO\n"); ++} ++ ++static int __init hp_t5325_pci_init(void) ++{ ++ if (machine_is_t5325()) ++ kirkwood_pcie_init(); ++ ++ return 0; ++} ++subsys_initcall(hp_t5325_pci_init); ++ ++MACHINE_START(T5325, "HP t5325 Thin Client") ++ /* Maintainer: Martin Michlmayr */ ++ .phys_io = KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, ++ .boot_params = 0x00000100, ++ .init_machine = hp_t5325_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = &kirkwood_timer, ++MACHINE_END diff --git a/debian/patches/series/16 b/debian/patches/series/16 index 31e20a242..237499f5f 100644 --- a/debian/patches/series/16 +++ b/debian/patches/series/16 @@ -134,3 +134,4 @@ + features/arm/openrd-ultimate.patch + features/arm/ts219-mpp36.patch + features/arm/ts219-mpp44.patch ++ features/arm/hp-t5325.patch