HP6xx compilation issues 2.6.20 vanilla

[Kristoffer E. <kri...@ho...>]

Greetings,

Made use of our new jlime bugtracker 
(http://jlime.com/bugtracker/main_page.php) to try and sort out the current 
issues with the 2.6.20 kernel. Just for future reference, here is a almost 
complete list of what needs doing.

Im still having issues with the ": undefined reference to `make_ipr_irq'" 
that occurs just before finishing the compile. Paul, do I need to create a 
proper ipr_map? And I will send in a minor patch to fix the get_clk changes.

Best wishes
Kristoffer Ericson
www.jlime.com

--- linux-2.6.20-vanilla/arch/sh/kernel/cpu/irq/pint.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/arch/sh/kernel/cpu/irq/pint.c	2007-02-21 21:12:38.000000000 
+0000
@@ -18,6 +18,38 @@
#include <asm/io.h>
#include <asm/machvec.h>

+#define INTC_IRR0   0xa4000004UL
+#define INTC_IRR1   0xa4000006UL
+#define INTC_IRR2   0xa4000008UL
+#define INTC_IPRA   0xfffffee2UL
+#define INTC_IPRB   0xfffffee4UL
+
+#define INTC_ICR0   0xfffffee0UL
+#define INTC_ICR1   0xa4000010UL
+#define INTC_ICR2   0xa4000012UL
+
+#define INTC_IPRD   0xa4000018UL
+#define INTC_INTER  0xa4000014UL
+
+#define PORT_PACR   0xa4000100UL
+#define PORT_PBCR   0xa4000102UL
+#define PORT_PCCR   0xa4000104UL
+#define PORT_PFCR   0xa400010aUL
+#define PORT_PADR   0xa4000120UL
+#define PORT_PBDR   0xa4000122UL
+#define PORT_PCDR   0xa4000124UL
+#define PORT_PFDR   0xa400012aUL
+
+#define PINT0_IRQ   40
+#define PINT8_IRQ   41
+#define PINT0_IPR_ADDR INTC_IPRD
+#define PINT8_IPR_ADDR INTC_IPRD
+
+#define PINT0_IPR_POS 3
+#define PINT8_IPR_POS 2
+#define PINT0_PRIORITY 2
+#define PINT8_PRIORITY 2
+
static unsigned char pint_map[256];
static unsigned long portcr_mask;

--- linux-2.6.20-vanilla/arch/sh/boards/hp6xx/hp6xx_apm.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/arch/sh/boards/hp6xx/hp6xx_apm.c	2007-02-21 
21:22:57.000000000 +0000
@@ -25,6 +25,8 @@
#define HP680_BATTERY_MIN		600
#define HP680_BATTERY_AC_ON		900

+#define IRQ0_IRQ  32
+
#define MODNAME "hp6x0_apm"

static int hp6x0_apm_get_info(char *buf, char **start, off_t fpos, int 
length)

--- linux-2.6.20-vanilla/arch/sh/cchips/hd6446x/hd64461/setup.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/arch/sh/cchips/hd6446x/hd64461/setup.c	2007-02-21 
21:29:16.000000000 +0000
@@ -15,6 +15,8 @@
#include <asm/irq.h>
#include <asm/hd64461.h>

+#define INTC_ICR1 0xa4000010UL
+
static void disable_hd64461_irq(unsigned int irq)
{
	unsigned short nimr;

--- 
linux-2.6.20-vanilla/drivers/input/touchscreen/hp680_ts_input.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/drivers/input/touchscreen/hp680_ts_input.c	2007-02-21 
21:38:03.000000000 +0000
@@ -17,11 +17,12 @@

#define	PHDR	0xa400012e
#define SCPDR	0xa4000136
+#define IRQ3_IRQ 35

static void do_softint(void *data);

static struct input_dev *hp680_ts_dev;
-static DECLARE_WORK(work, do_softint, 0);
+static DECLARE_WORK(work, do_softint);

static void do_softint(void *data)
{

--- linux-2.6.20-vanilla/sound/oss/sh_dac_audio.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/sound/oss/sh_dac_audio.c	2007-02-21 21:49:37.000000000 
+0000
@@ -31,6 +31,8 @@

#define MODNAME "sh_dac_audio"

+#define TIMER1_IRQ 16
+
#define TMU_TOCR_INIT	0x00

#define TMU1_TCR_INIT	0x0020	/* Clock/4, rising edge; interrupt on */
@@ -104,7 +106,7 @@
	unsigned long interval;
  	struct clk *clk;

- 	clk = clk_get("module_clk");
+ 	clk = clk_get(NULL, "module_clk");
  	interval = (clk_get_rate(clk) / 4) / rate;
  	clk_put(clk);
	ctrl_outl(interval, TMU1_TCOR);

--- linux-2.6.20-vanilla/arch/sh/drivers/dma/dma-sh.c	2007-02-04 
18:44:54.000000000 +0000
+++ linux-2.6.20/arch/sh/drivers/dma/dma-sh.c	2007-02-21 21:56:32.000000000 
+0000
@@ -19,6 +19,15 @@
#include <asm/io.h>
#include "dma-sh.h"

+#define INTC_IPRE  0xa400001aUL
+#define DMTE0_IRQ  48
+#define DMTE1_IRQ  49
+#define DMTE2_IRQ  50
+#define DMTE3_IRQ  51
+#define DMTE4_IRQ  76
+#define DMA_IPR_ADDR INTC_IPRE
+#define DMA_IPR_POS  3
+#define DMA_PRIORITY 7


#ifdef CONFIG_CPU_SH4

_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE! 
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/