gwj / at91sam9263 · Commits

Commit 5d98751b093a37ff1653baa37a44aa9efaedbef5

Authored by balrog
1 parent 6bc1d858

Tosa: provide correct IRQ to tc6393xb init (Dmitry Baryshkov). 

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5613 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
hw/tosa.c
  View file @5d98751
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 #define TOSA_GPIO_ON_RESET (19) 25 #define TOSA_GPIO_ON_RESET (19)
26 #define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ 26 #define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */
27 #define TOSA_GPIO_CF_CD (13) 27 #define TOSA_GPIO_CF_CD (13)
  28 +#define TOSA_GPIO_TC6393XB_INT (15)
28 #define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ 29 #define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */
29 30
30 #define TOSA_SCOOP_GPIO_BASE 1 31 #define TOSA_SCOOP_GPIO_BASE 1
@@ -131,7 +132,7 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, @@ -131,7 +132,7 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
131 cpu_register_physical_memory(0, TOSA_ROM, 132 cpu_register_physical_memory(0, TOSA_ROM,
132 qemu_ram_alloc(TOSA_ROM) | IO_MEM_ROM); 133 qemu_ram_alloc(TOSA_ROM) | IO_MEM_ROM);
133 134
134 - tc6393xb_init(0x10000000, NULL); 135 + tc6393xb_init(0x10000000, pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_TC6393XB_INT]);
135 136
136 scp0 = scoop_init(cpu, 0, 0x08800000); 137 scp0 = scoop_init(cpu, 0, 0x08800000);
137 scp1 = scoop_init(cpu, 1, 0x14800040); 138 scp1 = scoop_init(cpu, 1, 0x14800040);