Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [795] linux4palm/linux/trunk/arch/arm
|
From: <ph...@us...> - 2007-02-04 08:14:08
|
Revision: 795
http://svn.sourceforge.net/hackndev/?rev=795&view=rev
Author: phiren
Date: 2007-02-04 00:14:03 -0800 (Sun, 04 Feb 2007)
Log Message:
-----------
initramfs, sound and touchscreen added for Palm zire 31
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmz31_defconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmz31/palmz31.c
Modified: linux4palm/linux/trunk/arch/arm/configs/palmz31_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmz31_defconfig 2007-02-03 21:40:24 UTC (rev 794)
+++ linux4palm/linux/trunk/arch/arm/configs/palmz31_defconfig 2007-02-04 08:14:03 UTC (rev 795)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.17-hnd0
-# Fri Feb 2 17:11:17 2007
+# Sun Feb 4 20:58:45 2007
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -32,7 +32,9 @@
# CONFIG_IKCONFIG is not set
# CONFIG_MINIMAL_OOPS is not set
# CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INITRAMFS_SOURCE="usr/zire31initramfs/"
+CONFIG_INITRAMFS_ROOT_UID=1000
+CONFIG_INITRAMFS_ROOT_GID=1000
CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
@@ -220,7 +222,7 @@
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=64m root=/dev/nfs rw nfsroot=/tc ip=:::255.255.255.0::usb0:dhcp init=/linuxrc console=tty0"
+CONFIG_CMDLINE="mem=16m init=/linuxrc"
# CONFIG_XIP_KERNEL is not set
#
@@ -463,7 +465,9 @@
#
# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_TSDEV=y
+CONFIG_INPUT_TSDEV_SCREEN_X=160
+CONFIG_INPUT_TSDEV_SCREEN_Y=160
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
@@ -473,7 +477,17 @@
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+CONFIG_TOUCHSCREEN_WM9712=y
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
# CONFIG_INPUT_MISC is not set
#
@@ -672,9 +686,46 @@
#
# Sound
#
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_AC97_BUS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+# CONFIG_SND_PXA2xx_I2SOUND is not set
+CONFIG_SND_PXA2XX_PCM=y
+CONFIG_SND_PXA2XX_AC97=y
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz31/palmz31.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz31/palmz31.c 2007-02-03 21:40:24 UTC (rev 794)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz31/palmz31.c 2007-02-04 08:14:03 UTC (rev 795)
@@ -22,14 +22,50 @@
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxapwm-bl.h>
+#include <asm/arch/audio.h>
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+#include <sound/ac97_codec.h>
+
#include "../generic.h"
#include "palmz31-gpio.h"
#define DEBUG
+/**
+ * AC97 audio controller
+ */
+static pxa2xx_audio_ops_t palmld_audio_ops = {
+ /*
+ .startup = palmld_audio_startup,
+ .shutdown = mst_audio_shutdown,
+ .suspend = mst_audio_suspend,
+ .resume = mst_audio_resume,
+ */
+};
+
+static struct platform_device palmld_ac97 = {
+ .name = "pxa2xx-ac97",
+ .id = -1,
+ .dev = { .platform_data = &palmld_audio_ops },
+};
+
+static struct platform_device *devices[] __initdata = {
+ &palmld_ac97,
+};
+
static void zire31_backlight_power(int on)
{
/* TODO */
+ if(on) {
+ PWM_CTRL1 = 0x1;
+ PWM_PWDUTY1 = 0x50;
+ PWM_PERVAL1 = 0x12b;
+ CKEN |= CKEN1_PWM1;
+ } else
+ CKEN &= ~CKEN1_PWM1;
}
static struct pxafb_mach_info zire31_lcd __initdata = {
@@ -41,8 +77,8 @@
.left_margin = 30,
.right_margin = 7,
.vsync_len = 1,
- .upper_margin = 6,
- .lower_margin = 7,
+ .upper_margin = 0,
+ .lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
.lccr0 = 0x00100079,
@@ -56,6 +92,8 @@
set_pxa_fb_info(&zire31_lcd);
GCR &= ~GCR_PRIRDY_IEN;
+
+ platform_add_devices(devices, ARRAY_SIZE(devices));
}
MACHINE_START(ZIRE31, "Zire 31")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
