From 02dda38cc9cd62dc224ee442f9a353df8ab0edda Mon Sep 17 00:00:00 2001 From: Gordon Farquharson Date: Fri, 14 Mar 2008 03:37:40 +0000 Subject: [PATCH] Register the F75375 device in the GLAN Tank platform code (L-A-K patch number 4865/1). svn path=/dists/trunk/linux-2.6/; revision=10833 --- debian/changelog | 1 + .../arm/glantank-register-f75375s.patch | 37 +++++++++++++++++++ debian/patches/series/1~experimental.1 | 1 + 3 files changed, 39 insertions(+) create mode 100644 debian/patches/features/arm/glantank-register-f75375s.patch diff --git a/debian/changelog b/debian/changelog index 2c624224b..6cc6b914c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low * [arm/iop32x] Enable support for the GLAN Tank flash chip (M29W400DB). * [arm/iop32x] Do not build the ARTOP PATA driver (PATA_ARTOP). * [arm/iop32x] Enable CMDLINE_PARTS. + * [arm/iop32x] Register the F75375 device in the GLAN Tank platform code. [ Aurelien Jarno ] * [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks diff --git a/debian/patches/features/arm/glantank-register-f75375s.patch b/debian/patches/features/arm/glantank-register-f75375s.patch new file mode 100644 index 000000000..e29888050 --- /dev/null +++ b/debian/patches/features/arm/glantank-register-f75375s.patch @@ -0,0 +1,37 @@ +diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c +index 74c65ce..d2a7b04 100644 +--- a/arch/arm/mach-iop32x/glantank.c ++++ b/arch/arm/mach-iop32x/glantank.c +@@ -14,8 +14,10 @@ + + #include + #include ++#include + #include + #include ++#include + #include + #include + #include +@@ -167,11 +169,21 @@ static struct platform_device glantank_serial_device = { + .resource = &glantank_uart_resource, + }; + ++static struct f75375s_platform_data glantank_f75375s = { ++ .pwm = { 255, 255 }, ++ .pwm_enable = { 0, 0 }, ++}; ++ + static struct i2c_board_info __initdata glantank_i2c_devices[] = { + { + I2C_BOARD_INFO("rtc-rs5c372", 0x32), + .type = "rs5c372a", + }, ++ { ++ I2C_BOARD_INFO("f75375", 0x2e), ++ .type = "f75375", ++ .platform_data = &glantank_f75375s, ++ }, + }; + + static void glantank_power_off(void) diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index effa7e91b..49fc596f5 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -36,3 +36,4 @@ + bugfix/all/rtc-x1205-new-style-conversion.patch + bugfix/all/rtc-x1205-new-style-conversion-checkpatch-fixes.patch + bugfix/all/file2alias-cross-compile-fix.patch ++ features/arm/glantank-register-f75375s.patch