2005-10-31 13:44:08

by Pavel Machek

[permalink] [raw]
Subject: Make spitz compile again

Hi!

This is what I needed to do after update to latest linus
kernel. Perhaps it helps someone.

Signed-off-by: Pavel Machek <[email protected]>

, but it is against Richard's tree merged into my tree, so do not
expect to apply it over mainline. Akita code movement is needed if I
want to compile kernel without akita support...


Pavel

Fix compilation after update to latest 2.6.14.

---
commit 84a41bb5e3a0a46b271929818f6699357f9c03e9
tree b6e836af503cb9e1c0bffe21413ec03eb0845644
parent 128aac988a7eaaa882a71670109831265d24c121
author <pavel@amd.(none)> Mon, 31 Oct 2005 14:40:01 +0100
committer <pavel@amd.(none)> Mon, 31 Oct 2005 14:40:01 +0100

arch/arm/mach-pxa/pxa_keys.c | 20 ++++++++------------
arch/arm/mach-pxa/sharpsl_pm.c | 37 ++++++++++++++++---------------------
arch/arm/mach-pxa/spitz.c | 24 +++++++++++-------------
config.3000 | 19 ++++++++++++++++---
drivers/i2c/busses/i2c-pxa.c | 6 ++----
5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/arch/arm/mach-pxa/pxa_keys.c b/arch/arm/mach-pxa/pxa_keys.c
--- a/arch/arm/mach-pxa/pxa_keys.c
+++ b/arch/arm/mach-pxa/pxa_keys.c
@@ -55,24 +55,20 @@ pxa_keys_isr (int irq, void *dev_id, str
}

#ifdef CONFIG_PM
-static int pxa_keys_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int pxa_keys_suspend(struct device *dev, pm_message_t state)
{
- if (level == SUSPEND_POWER_DOWN) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
- k->suspended = 1;
- }
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ k->suspended = 1;
return 0;
}

-static int pxa_keys_resume(struct device *dev, uint32_t level)
+static int pxa_keys_resume(struct device *dev)
{
- if (level == RESUME_POWER_ON) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);

- /* Upon resume, ignore the suspend key for a short while */
- k->suspend_jiffies=jiffies;
- k->suspended = 0;
- }
+ /* Upon resume, ignore the suspend key for a short while */
+ k->suspend_jiffies=jiffies;
+ k->suspended = 0;
return 0;
}
#else
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -634,36 +634,31 @@ static int sharpsl_ac_check(void)

#ifdef CONFIG_PM

-static int corgi_batt_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int corgi_batt_suspend(struct device *dev, pm_message_t state)
{
- if (level == SUSPEND_POWER_DOWN) {
+ DPRINTK("SharpSL Battery Suspending \n");
+ sharpsl_pm.suspended=1;

- DPRINTK("SharpSL Battery Suspending \n");
- sharpsl_pm.suspended=1;
-
- flush_scheduled_work();
+ flush_scheduled_work();

- if (sharpsl_pm.charge_mode == CHRG_ON)
- sharpsl_pm.offline_charge_activate = 1;
- else
- sharpsl_pm.offline_charge_activate = 0;
- }
+ if (sharpsl_pm.charge_mode == CHRG_ON)
+ sharpsl_pm.offline_charge_activate = 1;
+ else
+ sharpsl_pm.offline_charge_activate = 0;
+
return 0;
}

-static int corgi_batt_resume(struct device *dev, uint32_t level)
+static int corgi_batt_resume(struct device *dev)
{
- if (level == RESUME_POWER_ON) {
+ DPRINTK("SharpSL Battery Resuming \n");

- DPRINTK("SharpSL Battery Resuming \n");
-
- /* Clear the reset source indicators as they break the bootloader upon reboot */
- RCSR=0x0f;
- apm_event_queued = 0;
- sharpsl_average_clear();
+ /* Clear the reset source indicators as they break the bootloader upon reboot */
+ RCSR=0x0f;
+ apm_event_queued = 0;
+ sharpsl_average_clear();

- sharpsl_pm.suspended = 0;
- }
+ sharpsl_pm.suspended = 0;
return 0;
}

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -412,19 +412,6 @@ static void __init spitz_init(void)
platform_device_register(&spitzscoop2_device);
}

-static void __init akita_init(void)
-{
- spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
-
- /* We just pretend the second element of the array doesn't exist */
- scoop_num = 1;
- scoop_devs = &spitz_pcmcia_scoop[0];
- spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
-
- common_init();
- platform_device_register(&akitaioexp_device);
-}
-
static void __init fixup_spitz(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi)
{
@@ -462,6 +449,17 @@ MACHINE_END
#endif

#ifdef CONFIG_MACH_AKITA
+static void __init akita_init(void)
+{
+ /* We just pretend the second element of the array doesn't exist */
+ scoop_num = 1;
+ scoop_devs = &spitz_pcmcia_scoop[0];
+ spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
+
+ common_init();
+ platform_device_register(&akitaioexp_device);
+}
+
MACHINE_START(AKITA, "SHARP Akita")
.phys_ram = 0xa0000000,
.phys_io = 0x40000000,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1009,11 +1009,9 @@ static int i2c_pxa_remove(struct device
}

#ifdef CONFIG_PM
-static int i2c_pxa_resume(struct device *dev, u32 level)
+static int i2c_pxa_resume(struct device *dev)
{
- if (level == RESUME_ENABLE) {
- i2c_pxa_reset(dev_get_drvdata(dev));
- }
+ i2c_pxa_reset(dev_get_drvdata(dev));
return 0;
}



--
Thanks, Sharp!


2005-10-31 15:45:55

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi Pavel,

> This is what I needed to do after update to latest linus
> kernel. Perhaps it helps someone.
>
> Signed-off-by: Pavel Machek <[email protected]>
>
> , but it is against Richard's tree merged into my tree, so do not
> expect to apply it over mainline. Akita code movement is needed if I
> want to compile kernel without akita support...

This is an update of my tree against 2.6.14-git3:

http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz

I realise a number of the tosa and ipaq drivers are no longer in sync
with the recent changes in mainline but the other drivers all should be
and cxx00 and c7x0 should work.

This has some interesting alpha code from various places including ALSA
SoC code from Liam Girdwood (I've added a wm8750 codec driver to this
which sort of works on cxx00) and framebuffer console rotation from
Antonino Daplas.

A suitable defconfig is:

http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00

This adds compiles console rotation support into the kernel and enables
it on the commandline. Let Antonino know how much nicer the device is
with this :)

Cheers,

Richard

2005-11-01 19:55:51

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > This is what I needed to do after update to latest linus
> > kernel. Perhaps it helps someone.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> >
> > , but it is against Richard's tree merged into my tree, so do not
> > expect to apply it over mainline. Akita code movement is needed if I
> > want to compile kernel without akita support...
>
> This is an update of my tree against 2.6.14-git3:
>
> http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz

I needed this to get it to compile... Please apply (probably modulo //
part).

Signed-off-by: Pavel Machek <[email protected]>
Pavel


--- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100
+++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100
@@ -55,24 +55,20 @@
}

#ifdef CONFIG_PM
-static int pxa_keys_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int pxa_keys_suspend(struct device *dev, pm_message_t state)
{
- if (level == SUSPEND_POWER_DOWN) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
- k->suspended = 1;
- }
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ k->suspended = 1;
return 0;
}

-static int pxa_keys_resume(struct device *dev, uint32_t level)
+static int pxa_keys_resume(struct device *dev)
{
- if (level == RESUME_POWER_ON) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);

- /* Upon resume, ignore the suspend key for a short while */
- k->suspend_jiffies=jiffies;
- k->suspended = 0;
- }
+ /* Upon resume, ignore the suspend key for a short while */
+ k->suspend_jiffies=jiffies;
+ k->suspended = 0;
return 0;
}
#else
--- clean-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 19:32:56.000000000 +0100
+++ linux-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 20:28:43.000000000 +0100
@@ -321,6 +321,7 @@
};


+#ifdef CONFIG_MACH_AKITA
/*
* Irda
*/
@@ -339,10 +340,11 @@
else
akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_IR_ON);
}
+#endif

static struct pxaficp_platform_data spitz_ficp_platform_data = {
.transceiver_cap = IR_SIRMODE | IR_OFF,
- .transceiver_mode = spitz_irda_transceiver_mode,
+// .transceiver_mode = spitz_irda_transceiver_mode,
};


@@ -422,21 +424,6 @@
platform_device_register(&spitzscoop2_device);
}

-static void __init akita_init(void)
-{
- spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
-
- /* We just pretend the second element of the array doesn't exist */
- scoop_num = 1;
- scoop_devs = &spitz_pcmcia_scoop[0];
- spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
-
- platform_device_register(&akitaioexp_device);
-
- spitzscoop_device.dev.parent=&akitaioexp_device.dev;
- common_init();
-}
-
static void __init fixup_spitz(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi)
{
@@ -474,6 +461,21 @@
#endif

#ifdef CONFIG_MACH_AKITA
+static void __init akita_init(void)
+{
+ spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
+
+ /* We just pretend the second element of the array doesn't exist */
+ scoop_num = 1;
+ scoop_devs = &spitz_pcmcia_scoop[0];
+ spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
+
+ platform_device_register(&akitaioexp_device);
+
+ spitzscoop_device.dev.parent=&akitaioexp_device.dev;
+ common_init();
+}
+
MACHINE_START(AKITA, "SHARP Akita")
.phys_ram = 0xa0000000,
.phys_io = 0x40000000,

--
Thanks, Sharp!

2005-11-01 20:05:34

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > This is what I needed to do after update to latest linus
> > kernel. Perhaps it helps someone.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> >
> > , but it is against Richard's tree merged into my tree, so do not
> > expect to apply it over mainline. Akita code movement is needed if I
> > want to compile kernel without akita support...
>
> This is an update of my tree against 2.6.14-git3:
>
> http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz

I did compile fixing, but it still will not boot. With neither my
config, not with yours. Just blank screen. Any ideas?

> http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00

Pavel
--
Thanks, Sharp!

2005-11-01 20:10:54

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Tue, 2005-11-01 at 20:31 +0100, Pavel Machek wrote:
> Hi!
>
> > > This is what I needed to do after update to latest linus
> > > kernel. Perhaps it helps someone.
> > >
> > > Signed-off-by: Pavel Machek <[email protected]>
> > >
> > > , but it is against Richard's tree merged into my tree, so do not
> > > expect to apply it over mainline. Akita code movement is needed if I
> > > want to compile kernel without akita support...
> >
> > This is an update of my tree against 2.6.14-git3:
> >
> > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz
>
> I needed this to get it to compile... Please apply (probably modulo //
> part).
>
> Signed-off-by: Pavel Machek <[email protected]>
> Pavel

> --- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100
> +++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100

None of the Zaurus models use pxa_keys so I don't know why you're
compiling this. I'll sort it out but its only needed for the hx2750 in
the tree you have.

> static struct pxaficp_platform_data spitz_ficp_platform_data = {
> .transceiver_cap = IR_SIRMODE | IR_OFF,
> - .transceiver_mode = spitz_irda_transceiver_mode,
> +// .transceiver_mode = spitz_irda_transceiver_mode,
> };

I'm not sure why you'd want to do that?

I'll move the akita code around and sort out the #ifdefs - it should
compile and just throw the odd warning about unused code as it stands
though?

Richard



2005-11-01 20:19:44

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Tue, 2005-11-01 at 21:05 +0100, Pavel Machek wrote:
> Hi!
>
> > > This is what I needed to do after update to latest linus
> > > kernel. Perhaps it helps someone.
> > >
> > > Signed-off-by: Pavel Machek <[email protected]>
> > >
> > > , but it is against Richard's tree merged into my tree, so do not
> > > expect to apply it over mainline. Akita code movement is needed if I
> > > want to compile kernel without akita support...
> >
> > This is an update of my tree against 2.6.14-git3:
> >
> > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz
>
> I did compile fixing, but it still will not boot. With neither my
> config, not with yours. Just blank screen. Any ideas?
>
> > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00

I'm seeing the blank screen on the c7x0 models but my spitz kernels are
all working.

I've traced the c7x0 problem to this patch:

http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90072059d2963dec237ae0cf49831ef77ddb5739

I've asked Russell and he doesn't know what's wrong. I'm trying to write
a patch which reverts this from 2.6.13-git3 but its complicated by some
of the later arm patches.

I was surprised the c7x0 problem happened and yet spitz was fine so
perhaps this is related to your problem.

Richard

2005-11-01 20:37:56

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > I needed this to get it to compile... Please apply (probably modulo //
> > part).
> >
> > Signed-off-by: Pavel Machek <[email protected]>
>
> > --- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100
> > +++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100
>
> None of the Zaurus models use pxa_keys so I don't know why you're
> compiling this. I'll sort it out but its only needed for the hx2750 in
> the tree you have.

Sorry, will fix that.. The patch should still help poor 2750 users
;-).

> > static struct pxaficp_platform_data spitz_ficp_platform_data = {
> > .transceiver_cap = IR_SIRMODE | IR_OFF,
> > - .transceiver_mode = spitz_irda_transceiver_mode,
> > +// .transceiver_mode = spitz_irda_transceiver_mode,
> > };
>
> I'm not sure why you'd want to do that?

Because of this one?

CC arch/arm/mach-pxa/spitz.o
arch/arm/mach-pxa/spitz.c:347: error: `spitz_irda_transceiver_mode'
undeclared here (not in a function)
arch/arm/mach-pxa/spitz.c:347: error: initializer element is not
constant
arch/arm/mach-pxa/spitz.c:347: error: (near initialization for
`spitz_ficp_platform_data.transceiver_mode')
make[1]: *** [arch/arm/mach-pxa/spitz.o] Error 1

:-). I probably should have enabled irda in config or something.

> I'll move the akita code around and sort out the #ifdefs - it should
> compile and just throw the odd warning about unused code as it stands
> though?

Probably same irda problem.
Pavel
--
Thanks, Sharp!

2005-11-01 20:39:53

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > > This is an update of my tree against 2.6.14-git3:
> > >
> > > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz
> >
> > I needed this to get it to compile... Please apply (probably modulo //
> > part).
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> > Pavel
>
> > --- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100
> > +++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100
>
> None of the Zaurus models use pxa_keys so I don't know why you're
> compiling this. I'll sort it out but its only needed for the hx2750 in
> the tree you have.
>
> > static struct pxaficp_platform_data spitz_ficp_platform_data = {
> > .transceiver_cap = IR_SIRMODE | IR_OFF,
> > - .transceiver_mode = spitz_irda_transceiver_mode,
> > +// .transceiver_mode = spitz_irda_transceiver_mode,
> > };
>
> I'm not sure why you'd want to do that?

Sorry, wrongly placed #ifdef on my part. (#ifdef AKITA should not
contain spitz function.)

Pavel
--
Thanks, Sharp!

2005-11-01 20:41:31

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > I needed this to get it to compile... Please apply (probably modulo //
> > part).
> >
> > Signed-off-by: Pavel Machek <[email protected]>

Fixed patch follows.

--- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100
+++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100
@@ -55,24 +55,20 @@
}

#ifdef CONFIG_PM
-static int pxa_keys_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int pxa_keys_suspend(struct device *dev, pm_message_t state)
{
- if (level == SUSPEND_POWER_DOWN) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
- k->suspended = 1;
- }
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ k->suspended = 1;
return 0;
}

-static int pxa_keys_resume(struct device *dev, uint32_t level)
+static int pxa_keys_resume(struct device *dev)
{
- if (level == RESUME_POWER_ON) {
- struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+ struct pxa_keys_platform_data *k = dev_get_drvdata(dev);

- /* Upon resume, ignore the suspend key for a short while */
- k->suspend_jiffies=jiffies;
- k->suspended = 0;
- }
+ /* Upon resume, ignore the suspend key for a short while */
+ k->suspend_jiffies=jiffies;
+ k->suspended = 0;
return 0;
}
#else
--- clean-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 19:32:56.000000000 +0100
+++ linux-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 21:38:19.000000000 +0100
@@ -332,6 +332,7 @@
reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);
}

+#ifdef CONFIG_MACH_AKITA
static void akita_irda_transceiver_mode(struct device *dev, int mode)
{
if (mode & IR_OFF)
@@ -339,6 +340,7 @@
else
akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_IR_ON);
}
+#endif

static struct pxaficp_platform_data spitz_ficp_platform_data = {
.transceiver_cap = IR_SIRMODE | IR_OFF,
@@ -422,21 +424,6 @@
platform_device_register(&spitzscoop2_device);
}

-static void __init akita_init(void)
-{
- spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
-
- /* We just pretend the second element of the array doesn't exist */
- scoop_num = 1;
- scoop_devs = &spitz_pcmcia_scoop[0];
- spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
-
- platform_device_register(&akitaioexp_device);
-
- spitzscoop_device.dev.parent=&akitaioexp_device.dev;
- common_init();
-}
-
static void __init fixup_spitz(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi)
{
@@ -474,6 +461,21 @@
#endif

#ifdef CONFIG_MACH_AKITA
+static void __init akita_init(void)
+{
+ spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
+
+ /* We just pretend the second element of the array doesn't exist */
+ scoop_num = 1;
+ scoop_devs = &spitz_pcmcia_scoop[0];
+ spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
+
+ platform_device_register(&akitaioexp_device);
+
+ spitzscoop_device.dev.parent=&akitaioexp_device.dev;
+ common_init();
+}
+
MACHINE_START(AKITA, "SHARP Akita")
.phys_ram = 0xa0000000,
.phys_io = 0x40000000,


--
Thanks, Sharp!

2005-11-01 21:47:10

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Tue, 2005-11-01 at 21:05 +0100, Pavel Machek wrote:
> Hi!
>
> > > This is what I needed to do after update to latest linus
> > > kernel. Perhaps it helps someone.
> > >
> > > Signed-off-by: Pavel Machek <[email protected]>
> > >
> > > , but it is against Richard's tree merged into my tree, so do not
> > > expect to apply it over mainline. Akita code movement is needed if I
> > > want to compile kernel without akita support...
> >
> > This is an update of my tree against 2.6.14-git3:
> >
> > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz
>
> I did compile fixing, but it still will not boot. With neither my
> config, not with yours. Just blank screen. Any ideas?
>
> > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00

I've worked out a patch to revert the change that broke things for c7x0:

http://www.rpsys.net/openzaurus/patches/revert_bootmem-r0.patch

I'd be interested to know if this helps your spitz kernel as its gets
c7x0 working again. Obviously the next step is to work out why this
breaks things but reverting it gets my Zaurus dev tree working again
which stops users c7x0 complaining :)

Richard

2005-11-01 22:14:20

by Russell King

[permalink] [raw]
Subject: Re: Make spitz compile again

On Tue, Nov 01, 2005 at 09:46:52PM +0000, Richard Purdie wrote:
> On Tue, 2005-11-01 at 21:05 +0100, Pavel Machek wrote:
> > Hi!
> >
> > > > This is what I needed to do after update to latest linus
> > > > kernel. Perhaps it helps someone.
> > > >
> > > > Signed-off-by: Pavel Machek <[email protected]>
> > > >
> > > > , but it is against Richard's tree merged into my tree, so do not
> > > > expect to apply it over mainline. Akita code movement is needed if I
> > > > want to compile kernel without akita support...
> > >
> > > This is an update of my tree against 2.6.14-git3:
> > >
> > > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz
> >
> > I did compile fixing, but it still will not boot. With neither my
> > config, not with yours. Just blank screen. Any ideas?
> >
> > > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00
>
> I've worked out a patch to revert the change that broke things for c7x0:
>
> http://www.rpsys.net/openzaurus/patches/revert_bootmem-r0.patch
>
> I'd be interested to know if this helps your spitz kernel as its gets
> c7x0 working again. Obviously the next step is to work out why this
> breaks things but reverting it gets my Zaurus dev tree working again
> which stops users c7x0 complaining :)

You need to at least follow my suggestion in order to move forward on
this. You're the only ones seeing a problem so far.

Maybe when other folk try it out some pattern will emerge.

Shame this couldn't have been done a month ago though when I wrote the
patch and it was fresh in my mind.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core

2005-11-01 22:55:05

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Tue, 2005-11-01 at 22:14 +0000, Russell King wrote:
> On Tue, Nov 01, 2005 at 09:46:52PM +0000, Richard Purdie wrote:
> > I'd be interested to know if this helps your spitz kernel as its gets
> > c7x0 working again. Obviously the next step is to work out why this
> > breaks things but reverting it gets my Zaurus dev tree working again
> > which stops users c7x0 complaining :)
>
> You need to at least follow my suggestion in order to move forward on
> this. You're the only ones seeing a problem so far.

I realise that and I will debug this when I have time to do so. At least
that patch identifies roughly where the problem is and allows me to
think about merging more code now my dev tree works again.

I passed the patch on to Pavel in the hope that it might solve his
immediate problem and give him a clue as to where to look for the real
solution if it does.

> Maybe when other folk try it out some pattern will emerge.
>
> Shame this couldn't have been done a month ago though when I wrote the
> patch and it was fresh in my mind.

It is as I could have spent the time merging more Zaurus support instead
of chasing bugs. Several Zaurus related things I'd like to have seen
merged in 2.6.15 are looking unlikely to happen due to time
constraints :-(.

Richard


2005-11-02 11:11:04

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > I did compile fixing, but it still will not boot. With neither my
> > config, not with yours. Just blank screen. Any ideas?
> >
> > > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0-defconfig-cxx00
>
> I've worked out a patch to revert the change that broke things for c7x0:
>
> http://www.rpsys.net/openzaurus/patches/revert_bootmem-r0.patch
>
> I'd be interested to know if this helps your spitz kernel as its gets
> c7x0 working again. Obviously the next step is to work out why this
> breaks things but reverting it gets my Zaurus dev tree working again
> which stops users c7x0 complaining :)

I do not know what happened, but now I used your kernel, again
(without revert_bootmem patch), and it works. Strange. sorry for
confusion.
Pavel
--
Thanks, Sharp!

2005-11-02 13:27:08

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> > This is what I needed to do after update to latest linus
> > kernel. Perhaps it helps someone.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> >
> > , but it is against Richard's tree merged into my tree, so do not
> > expect to apply it over mainline. Akita code movement is needed if I
> > want to compile kernel without akita support...
>
> This is an update of my tree against 2.6.14-git3:
>
> http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz

Did you see any problems with touchscreen? I see "ts" registered,
interrupts coming, but opie does not see any clicks :-(.
Pavel
--
Thanks, Sharp!

2005-11-02 13:48:05

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Wed, 2005-11-02 at 13:51 +0100, Pavel Machek wrote:
> Did you see any problems with touchscreen? I see "ts" registered,
> interrupts coming, but opie does not see any clicks :-(.

Update to udev 071 ;-)

Richard

2005-11-02 13:53:12

by Pavel Machek

[permalink] [raw]
Subject: Re: Make spitz compile again

Hi!

> On Wed, 2005-11-02 at 13:51 +0100, Pavel Machek wrote:
> > Did you see any problems with touchscreen? I see "ts" registered,
> > interrupts coming, but opie does not see any clicks :-(.
>
> Update to udev 071 ;-)

Is there some other workaround? I'm not able to do that on spitz --
you know my bitbake capabilities :-(.
Pavel
--
Thanks, Sharp!

2005-11-02 14:44:31

by Richard Purdie

[permalink] [raw]
Subject: Re: Make spitz compile again

On Wed, 2005-11-02 at 14:52 +0100, Pavel Machek wrote:
> Hi!
>
> > On Wed, 2005-11-02 at 13:51 +0100, Pavel Machek wrote:
> > > Did you see any problems with touchscreen? I see "ts" registered,
> > > interrupts coming, but opie does not see any clicks :-(.
> >
> > Update to udev 071 ;-)
>
> Is there some other workaround? I'm not able to do that on spitz --
> you know my bitbake capabilities :-(.

Create /dev/input/ and add event0 and event1 nodes. You'll have to hack
the init scripts to do this and fight off udev.

or

Download and copy this to the device:
http://www.rpsys.net/openzaurus/temp/udev_071-r5_armv5te.ipk

and ipkg install udev_071-r5_armv5te.ipk

I'm not sure these kind of things should be going to LKML in future
though...

Richard

2005-11-07 12:45:57

by Pavel Machek

[permalink] [raw]
Subject: spitz autorepeat

Hi!

Spitz is *very* touchy - autorepeat is way too fast for such small and
crappy keyboard. Could we get some saner defaults? Not faster than
250msec delay, 30 per second....
--
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms