Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8fbeb0 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> 



Split the header file into two parts and move them to directories where
they belong.

Information on internal structure of FIQ buffer is moved to
<linux/platform_data/ams-delta-fiq.h> for ams-delta-serio driver use.

Other information used by ams-delta board init file and FIQ code is
made local to mach-omap1 root directory.

Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a32d5ce1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10391,6 +10391,7 @@ F: arch/arm/plat-omap/ 
F:	arch/arm/configs/omap1_defconfig

F:	drivers/i2c/busses/i2c-omap.c

F:	include/linux/platform_data/i2c-omap.h

F:	include/linux/platform_data/ams-delta-fiq.h



OMAP2+ SUPPORT

M:	Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap1/ams-delta-fiq-handler.S

+3 −2
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 */



#include <linux/linkage.h>

#include <asm/assembler.h>

#include <linux/platform_data/ams-delta-fiq.h>



#include <asm/assembler.h>

#include <mach/board-ams-delta.h>

#include <mach/ams-delta-fiq.h>



#include "ams-delta-fiq.h"

#include "iomap.h"

#include "soc.h"

arch/arm/mach-omap1/ams-delta-fiq.c

+4 −3
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 
#include <linux/irq.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/platform_data/ams-delta-fiq.h>



#include <mach/board-ams-delta.h>



#include <asm/fiq.h>



#include <mach/ams-delta-fiq.h>

#include "ams-delta-fiq.h"



static struct fiq_handler fh = {

	.name	= "ams-delta-fiq"
@@ -35,8 +36,8 @@ static struct fiq_handler fh = { 
 * The FIQ and IRQ isrs can both read and write it.

 * It is structured as a header section several 32bit slots,

 * followed by the circular buffer where the FIQ isr stores

 * keystrokes received from the qwerty keyboard.

 * See ams-delta-fiq.h for details of offsets.

 * keystrokes received from the qwerty keyboard.  See

 * <linux/platform_data/ams-delta-fiq.h> for details of offsets.

 */

unsigned int fiq_buffer[1024];

EXPORT_SYMBOL(fiq_buffer);

arch/arm/mach-omap1/ams-delta-fiq.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



/*

 * arch/arm/mach-omap1/ams-delta-fiq.h

 *

 * Taken from the original Amstrad modifications to fiq.h

 *

 * Copyright (c) 2004 Amstrad Plc

 * Copyright (c) 2006 Matt Callow

 * Copyright (c) 2010 Janusz Krzysztofik

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __AMS_DELTA_FIQ_H

#define __AMS_DELTA_FIQ_H



#include <mach/irqs.h>



/*

 * Interrupt number used for passing control from FIQ to IRQ.

 * IRQ12, described as reserved, has been selected.

 */

#define INT_DEFERRED_FIQ	INT_1510_RES12

/*

 * Base address of an interrupt handler that the INT_DEFERRED_FIQ belongs to.

 */

#if (INT_DEFERRED_FIQ < IH2_BASE)

#define DEFERRED_FIQ_IH_BASE	OMAP_IH1_BASE

#else

#define DEFERRED_FIQ_IH_BASE	OMAP_IH2_BASE

#endif



#ifndef __ASSEMBLER__

extern unsigned char qwerty_fiqin_start, qwerty_fiqin_end;



extern void __init ams_delta_init_fiq(struct gpio_chip *chip);

#endif



#endif

arch/arm/mach-omap1/board-ams-delta.c

+1 −1
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
#include <mach/mux.h>



#include <mach/hardware.h>

#include <mach/ams-delta-fiq.h>

#include "camera.h"

#include <mach/usb.h>



#include "ams-delta-fiq.h"

#include "iomap.h"

#include "common.h"