[oe-commits] org.oe.dev linux-nokia: remove 770, update 800 from poky, all nokia internet tables use linux-nokia800_2.6.18-osso40 now
koen commit
openembedded-commits at lists.openembedded.org
Tue Aug 14 08:34:33 UTC 2007
linux-nokia: remove 770, update 800 from poky, all nokia internet tables use linux-nokia800_2.6.18-osso40 now
* closes #2757 and #2758
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1bc9036087fb27f49f5a122c29e390b0382cc4bb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1bc9036087fb27f49f5a122c29e390b0382cc4bb
Files:
1
packages/linux/linux-nokia770-2.6.12.3-osso14
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig
packages/linux/linux-nokia770-2.6.16-osso26
packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/nokia770
packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
packages/linux/linux-nokia770_2.6.12.3-osso14.bb
packages/linux/linux-nokia770_2.6.16-osso26.bb
packages/linux/linux-nokia800-2.6.18-osso29
packages/linux/linux-nokia800-2.6.18-osso40
packages/linux/linux-nokia800_2.6.18-osso29.bb
packages/linux/linux-nokia800_2.6.18-osso40.bb
packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
Diffs:
#
# mt diff -r9621b8f4f896d5d6a15f243e292fa0e71ad32136 -r1bc9036087fb27f49f5a122c29e390b0382cc4bb
#
#
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770_2.6.12.3-osso14.bb"
#
# delete "packages/linux/linux-nokia770_2.6.16-osso26.bb"
#
# rename "packages/linux/linux-nokia800-2.6.18-osso29"
# to "packages/linux/linux-nokia800-2.6.18-osso40"
#
# rename "packages/linux/linux-nokia800_2.6.18-osso29.bb"
# to "packages/linux/linux-nokia800_2.6.18-osso40.bb"
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch"
# content [eb6ef0f41d90a05bda1c5c5828dd17a7b6f6ca60]
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch"
# content [79031ff75ee9237e749692c9311a4ae85ee90c33]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig"
# from [83984950b5f16c72590ba4cdad931c9d3719053c]
# to [0c90d49ce8bad4a01318e88d4300bb9783bb99b0]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig"
# from [fe49a173d4a67d90ef5e0b47a86cc7b5a4d72750]
# to [e86e6559444ad8443469928527615201bdcf2853]
#
# patch "packages/linux/linux-nokia800_2.6.18-osso40.bb"
# from [a7a41c0847c0ff1e127f056153fd3807610a3003]
# to [4f90826f9fe700b59636abc46e661fe893051730]
#
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch eb6ef0f41d90a05bda1c5c5828dd17a7b6f6ca60
+++ packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch eb6ef0f41d90a05bda1c5c5828dd17a7b6f6ca60
@@ -0,0 +1,327 @@
+
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+"http://www.w3.org/TR/REC-html40/loose.dtd">
+<!-- ViewCVS - http://viewcvs.sourceforge.net/
+by Greg Stein - mailto:gstein at lyra.org -->
+<html>
+<head>
+<title>OpenedHand SVN Repository - log - poky: trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch</title>
+<meta name="generator" content="ViewCVS 1.0-dev">
+<link rel="stylesheet" href="/doc//styles.css" type="text/css">
+</head>
+<body>
+<div class="vc_navheader">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td align="left"><a href="/view/poky/?rev=1770#dirlist">[poky]</a> / <a href="/view/poky/trunk/?rev=1770#dirlist">trunk</a> / <a href="/view/poky/trunk/meta/?rev=1770#dirlist">meta</a> / <a href="/view/poky/trunk/meta/packages/?rev=1770#dirlist">packages</a> / <a href="/view/poky/trunk/meta/packages/linux/?rev=1770#dirlist">linux</a> / <a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/?rev=1770#dirlist">linux-nokia800-2.6.18-osso40</a> / fix_oprofile.patch</td>
+<td align="right">
+
+<form method=get action="/view/poky/">
+
+<b>Project Root:</b>
+<select name="root" onchange="submit()">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<optgroup label="Subversion Repositories"><option>clutter</option><option>contacts</option><option>dates</option><option>didiwiki</option><option>eds-dbus</option><option>gupnp</option><option>matchbox</option><option>misc</option><option>oprofileui</option><option selected>poky</option><option>sato</option><option>sync</option><option>tasks</option></optgroup>
+
+</select>
+<input type=submit value="Go">
+</form>
+
+</td>
+</tr>
+</table>
+</div>
+<div id="header">
+<h1>OpenedHand SVN Repository</h1>
+</div>
+<h1>poky: trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch</h1>
+
+<hr noshade>
+
+No default branch
+
+<br>
+
+
+
+
+
+
+
+<hr size=1 noshade>
+
+
+
+
+<a name="rev1770"></a>
+
+
+Revision <a href="/view/poky?rev=1770&view=rev"><b>1770</b></a>
+ -
+(<a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770&view=markup">view</a>)
+(<a href="/view/*checkout*/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770">download</a>)
+
+
+
+
+
+- <a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770&r1=1770&view=log">[select for diffs]</a>
+
+
+
+
+<br>
+
+Added
+
+<i>Wed May 23 15:22:08 2007 UTC</i> (2 months, 3 weeks ago) by <i>richard</i>
+
+
+
+
+
+
+<br>File length: 994 byte(s)</b>
+
+
+
+
+
+
+
+
+
+
+<pre class="vc_log">linux-nokia800: Add oprofile mismatch workaround, update to osso40</pre>
+
+
+
+
+
+<a name="diff"></a>
+<hr noshade>
+This form allows you to request diffs between any two revisions of
+a file. You may select a symbolic revision name using the selection
+box or you may type in a numeric name using the type-in text box.
+<p>
+<form method="get" action="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch" name="diff_select">
+
+<table border="0" cellpadding="2" cellspacing="0">
+<tr>
+<td> </td>
+<td>
+Diffs between
+
+<input type="hidden" name="r1" value="text" />
+
+<input type="TEXT" size="12" name="tr1" value="1770"
+>
+and
+
+<input type="hidden" name="r2" value="text" />
+
+<input type="TEXT" size="12" name="tr2" value="1770"
+>
+</td>
+</tr>
+<tr>
+<td><input type="checkbox" name="makepatch" id="makepatch" value="1"></td>
+<td><label for="makepatch">Generate output suitable for use with a patch
+program</label></td>
+</tr>
+<tr>
+<td> </td>
+<td>
+Type of Diff should be a
+<select name="diff_format" onchange="submit()">
+<option value="h" selected>Colored Diff</option>
+<option value="l" >Long Colored Diff</option>
+<option value="u" >Unidiff</option>
+<option value="c" >Context Diff</option>
+<option value="s" >Side by Side</option>
+</select>
+<input type="submit" value=" Get Diffs "></form>
+</td>
+</tr>
+</table>
+
+
+
+
+<hr noshade>
+<a name=logsort></a>
+<form method=get action="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch">
+
+Sort log by:
+<select name="logsort" onchange="submit()">
+<option value="cvs" >Not sorted</option>
+<option value="date" selected>Commit date</option>
+<option value="rev" >Revision</option>
+</select>
+<input type=submit value=" Sort ">
+</form>
+
+
+<hr noshade>
+<div id="footer">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td align="left">
+<small>© Copyright <a href="http://o-hand.com">Openedhand</a>
+</td>
+<td align="right"><p><small>Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a></small></p></td>
+<!--
+<td align="left">
+<address><a href="mailto:admin at o-hand.com">CVS Admin</a></address><br />
+Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a>
+</td>
+<td align="right">
+<img src="/doc/viewcvs/images/logo.png" alt="(Powered by ViewCVS)" border="0"
+width="128" height="48" /><br />
+<h5><a target="_blank" href="/doc//help_log.html">ViewCVS and CVS Help</a></h5>
+</td>
+-->
+</tr>
+</table>
+</div>
+</body>
+</html>
+
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch 79031ff75ee9237e749692c9311a4ae85ee90c33
+++ packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch 79031ff75ee9237e749692c9311a4ae85ee90c33
@@ -0,0 +1,415 @@
+---
+ arch/arm/mach-omap1/board-nokia770.c | 60 +++++++++++++++++++++++++++++++----
+ arch/arm/mach-omap1/mmu.c | 1
+ drivers/cbus/tahvo-usb.c | 4 +-
+ drivers/i2c/chips/isp1301_omap.c | 1
+ drivers/mtd/mtdchar.c | 6 +++
+ drivers/mtd/mtdpart.c | 5 ++
+ drivers/mtd/nand/omap-hw.c | 55 +++++++++++++++-----------------
+ drivers/serial/8250.c | 2 +
+ drivers/video/omap/omapfb_main.c | 4 +-
+ include/asm-arm/arch-omap/keypad.h | 3 +
+ include/asm-arm/arch-omap/serial.h | 16 +++++++++
+ 11 files changed, 118 insertions(+), 39 deletions(-)
+
+Index: linux-g/arch/arm/mach-omap1/board-nokia770.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/board-nokia770.c 2006-11-08 13:18:39.000000000 +0100
++++ linux-g/arch/arm/mach-omap1/board-nokia770.c 2007-08-13 16:23:15.000000000 +0200
+@@ -16,6 +16,8 @@
+
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
++#include <linux/workqueue.h>
++#include <linux/delay.h>
+
+ #include <asm/hardware.h>
+ #include <asm/mach-types.h>
+@@ -33,9 +35,12 @@
+ #include <asm/arch/gpio.h>
+ #include <asm/arch/omapfb.h>
+ #include <asm/arch/hwa742.h>
++#include <asm/arch/lcd_mipid.h>
+
+ #include "../plat-omap/dsp/dsp_common.h"
+
++#define ADS7846_PENDOWN_GPIO 15
++
+ static void __init omap_nokia770_init_irq(void)
+ {
+ /* On Nokia 770, the SleepX signal is masked with an
+@@ -75,9 +80,11 @@
+ };
+
+ static struct omap_kp_platform_data nokia770_kp_data = {
+- .rows = 8,
+- .cols = 8,
+- .keymap = nokia770_keymap
++ .rows = 8,
++ .cols = 8,
++ .keymap = nokia770_keymap,
++ .keymapsize = ARRAY_SIZE(nokia770_keymap),
++ .delay = 4,
+ };
+
+ static struct platform_device nokia770_kp_device = {
+@@ -94,6 +101,41 @@
+ &nokia770_kp_device,
+ };
+
++static void mipid_shutdown(struct mipid_platform_data *pdata)
++{
++ if (pdata->nreset_gpio != -1) {
++ printk(KERN_INFO "shutdown LCD\n");
++ omap_set_gpio_dataout(pdata->nreset_gpio, 0);
++ msleep(120);
++ }
++}
++
++static struct mipid_platform_data nokia770_mipid_platform_data = {
++ .shutdown = mipid_shutdown,
++};
++
++static void mipid_dev_init(void)
++{
++ const struct omap_lcd_config *conf;
++
++ conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
++ if (conf != NULL) {
++ nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
++ nokia770_mipid_platform_data.data_lines = conf->data_lines;
++ }
++}
++
++static void ads7846_dev_init(void)
++{
++ if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
++ printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
++}
++
++static int ads7846_get_pendown_state(void)
++{
++ return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
++}
++
+ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
+ .x_max = 0x0fff,
+ .y_max = 0x0fff,
+@@ -101,14 +143,17 @@
+ .pressure_max = 255,
+ .debounce_max = 10,
+ .debounce_tol = 3,
++ .debounce_rep = 1,
++ .get_pendown_state = ads7846_get_pendown_state,
+ };
+
+ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
+ [0] = {
+- .modalias = "lcd_lph8923",
++ .modalias = "lcd_mipid",
+ .bus_num = 2,
+ .chip_select = 3,
+ .max_speed_hz = 12000000,
++ .platform_data = &nokia770_mipid_platform_data,
+ },
+ [1] = {
+ .modalias = "ads7846",
+@@ -189,7 +234,7 @@
+ },
+ };
+
+-static struct omap_board_config_kernel nokia770_config[] = {
++static struct omap_board_config_kernel nokia770_config[] __initdata = {
+ { OMAP_TAG_USB, NULL },
+ { OMAP_TAG_MMC, &nokia770_mmc_config },
+ };
+@@ -235,7 +280,7 @@
+ printk("HP connected\n");
+ }
+
+-static void codec_delayed_power_down(void *arg)
++static void codec_delayed_power_down(struct work_struct *work)
+ {
+ down(&audio_pwr_sem);
+ if (audio_pwr_state == -1)
+@@ -326,9 +371,12 @@
+ ARRAY_SIZE(nokia770_spi_board_info));
+ omap_board_config = nokia770_config;
+ omap_board_config_size = ARRAY_SIZE(nokia770_config);
++ omap_gpio_init();
+ omap_serial_init();
+ omap_dsp_init();
+ hwa742_dev_init();
++ ads7846_dev_init();
++ mipid_dev_init();
+ }
+
+ static void __init omap_nokia770_map_io(void)
+Index: linux-g/arch/arm/mach-omap1/mmu.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/mmu.c 2007-08-13 13:54:01.000000000 +0200
++++ linux-g/arch/arm/mach-omap1/mmu.c 2007-08-13 16:23:15.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+ #include <linux/err.h>
++#include <linux/delay.h>
+ #include "mmu.h"
+ #include <asm/tlbflush.h>
+
+Index: linux-g/drivers/cbus/tahvo-usb.c
+===================================================================
+--- linux-g.orig/drivers/cbus/tahvo-usb.c 2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/cbus/tahvo-usb.c 2007-08-13 16:23:15.000000000 +0200
+@@ -135,8 +135,8 @@
+ if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) &&
+ tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
+ /* role is host */
+- usb_bus_start_enum(tu->otg.host,
+- tu->otg.host->otg_port);
++ //usb_bus_start_enum(tu->otg.host,
++ // tu->otg.host->otg_port);
+ }
+ OTG_IRQ_SRC_REG = DRIVER_SWITCH;
+ } else
+Index: linux-g/drivers/i2c/chips/isp1301_omap.c
+===================================================================
+--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c 2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/i2c/chips/isp1301_omap.c 2007-08-13 16:23:15.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <linux/usb_gadget.h>
+ #include <linux/usb.h>
+ #include <linux/usb_otg.h>
++#include <linux/usb/otg.h>
+ #include <linux/i2c.h>
+ #include <linux/workqueue.h>
+
+Index: linux-g/drivers/mtd/mtdchar.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdchar.c 2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdchar.c 2007-08-13 16:23:15.000000000 +0200
+@@ -622,6 +622,12 @@
+ break;
+ }
+
++ case MEMSETOOBSEL:
++ {
++ break;
++ }
++
++
+ case MEMGETBADBLOCK:
+ {
+ loff_t offs;
+Index: linux-g/drivers/mtd/mtdpart.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdpart.c 2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdpart.c 2007-08-13 16:23:15.000000000 +0200
+@@ -200,6 +200,11 @@
+ return -EINVAL;
+ instr->addr += part->offset;
+ ret = part->master->erase(part->master, instr);
++ if (ret) {
++ if (instr->fail_addr != 0xffffffff)
++ instr->fail_addr -= part->offset;
++ instr->addr -= part->offset;
++ }
+ return ret;
+ }
+
+Index: linux-g/drivers/mtd/nand/omap-hw.c
+===================================================================
+--- linux-g.orig/drivers/mtd/nand/omap-hw.c 2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/nand/omap-hw.c 2007-08-13 16:23:15.000000000 +0200
+@@ -386,11 +386,6 @@
+ return nand_read_reg8(NND_ACCESS);
+ }
+
+-static void omap_nand_write_byte(struct mtd_info *mtd, u_char byte)
+-{
+- nand_write_reg8(NND_ACCESS, byte);
+-}
+-
+ static int omap_nand_dev_ready(struct mtd_info *mtd)
+ {
+ u32 l;
+@@ -425,9 +420,9 @@
+ if (command == NAND_CMD_SEQIN) {
+ int readcmd;
+
+- if (column >= mtd->oobblock) {
++ if (column >= mtd->writesize) {
+ /* OOB area */
+- column -= mtd->oobblock;
++ column -= mtd->writesize;
+ readcmd = NAND_CMD_READOOB;
+ } else if (column < 256) {
+ /* First 256 bytes --> READ0 */
+@@ -458,7 +453,7 @@
+ struct nand_chip *this = mtd->priv;
+
+ if (command == NAND_CMD_READOOB) {
+- column += mtd->oobblock;
++ column += mtd->writesize;
+ command = NAND_CMD_READ0;
+ }
+ switch (command) {
+@@ -495,7 +490,8 @@
+ int n;
+ struct nand_chip *this = mtd->priv;
+
+- if (this->eccmode == NAND_ECC_HW12_2048)
++ /* Ex NAND_ECC_HW12_2048 */
++ if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size == 2048))
+ n = 4;
+ else
+ n = 1;
+@@ -642,7 +638,8 @@
+ int block_count = 0, i, r;
+
+ this = mtd->priv;
+- if (this->eccmode == NAND_ECC_HW12_2048)
++ /* Ex NAND_ECC_HW12_2048 */
++ if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size == 2048))
+ block_count = 4;
+ else
+ block_count = 1;
+@@ -672,12 +669,12 @@
+ {
+ static const char *part_parsers[] = { "cmdlinepart", NULL };
+ struct mtd_partition *parts;
+- const struct omap_flash_part_config *cfg;
++ const struct omap_flash_part_str_config *cfg;
+ char *part_str = NULL;
+ size_%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list