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

Commit b08827f4 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next

parents 75c0b3b4 5fd2a84a 7be13ad0 667a11fa

Documentation/DocBook/genericirq.tmpl

+47 −35
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ 
	<para>

	Whenever an interrupt triggers, the lowlevel arch code calls into

	the generic interrupt code by calling desc->handle_irq().

	This highlevel IRQ handling function only uses desc->chip primitives

	referenced by the assigned chip descriptor structure.

	This highlevel IRQ handling function only uses desc->irq_data.chip

	primitives referenced by the assigned chip descriptor structure.

	</para>

    </sect1>

    <sect1 id="Highlevel_Driver_API">
@@ -206,11 +206,11 @@ 
	  <listitem><para>enable_irq()</para></listitem>

	  <listitem><para>disable_irq_nosync() (SMP only)</para></listitem>

	  <listitem><para>synchronize_irq() (SMP only)</para></listitem>

	  <listitem><para>set_irq_type()</para></listitem>

	  <listitem><para>set_irq_wake()</para></listitem>

	  <listitem><para>set_irq_data()</para></listitem>

	  <listitem><para>set_irq_chip()</para></listitem>

	  <listitem><para>set_irq_chip_data()</para></listitem>

	  <listitem><para>irq_set_irq_type()</para></listitem>

	  <listitem><para>irq_set_irq_wake()</para></listitem>

	  <listitem><para>irq_set_handler_data()</para></listitem>

	  <listitem><para>irq_set_chip()</para></listitem>

	  <listitem><para>irq_set_chip_data()</para></listitem>

          </itemizedlist>

	  See the autogenerated function documentation for details.

	</para>
@@ -225,6 +225,8 @@ 
	  <listitem><para>handle_fasteoi_irq</para></listitem>

	  <listitem><para>handle_simple_irq</para></listitem>

	  <listitem><para>handle_percpu_irq</para></listitem>

	  <listitem><para>handle_edge_eoi_irq</para></listitem>

	  <listitem><para>handle_bad_irq</para></listitem>

	  </itemizedlist>

	  The interrupt flow handlers (either predefined or architecture

	  specific) are assigned to specific interrupts by the architecture
@@ -241,13 +243,13 @@ 
		<programlisting>

default_enable(struct irq_data *data)

{

	desc->chip->irq_unmask(data);

	desc->irq_data.chip->irq_unmask(data);

}



default_disable(struct irq_data *data)

{

	if (!delay_disable(data))

		desc->chip->irq_mask(data);

		desc->irq_data.chip->irq_mask(data);

}



default_ack(struct irq_data *data)
@@ -284,9 +286,9 @@ noop(struct irq_data *data)) 
		<para>

		The following control flow is implemented (simplified excerpt):

		<programlisting>

desc->chip->irq_mask();

handle_IRQ_event(desc->action);

desc->chip->irq_unmask();

desc->irq_data.chip->irq_mask_ack();

handle_irq_event(desc->action);

desc->irq_data.chip->irq_unmask();

		</programlisting>

		</para>

	    </sect3>
@@ -300,8 +302,8 @@ desc->chip->irq_unmask(); 
		<para>

		The following control flow is implemented (simplified excerpt):

		<programlisting>

handle_IRQ_event(desc->action);

desc->chip->irq_eoi();

handle_irq_event(desc->action);

desc->irq_data.chip->irq_eoi();

		</programlisting>

		</para>

	    </sect3>
@@ -315,17 +317,17 @@ desc->chip->irq_eoi(); 
		The following control flow is implemented (simplified excerpt):

		<programlisting>

if (desc->status &amp; running) {

	desc->chip->irq_mask();

	desc->irq_data.chip->irq_mask_ack();

	desc->status |= pending | masked;

	return;

}

desc->chip->irq_ack();

desc->irq_data.chip->irq_ack();

desc->status |= running;

do {

	if (desc->status &amp; masked)

		desc->chip->irq_unmask();

		desc->irq_data.chip->irq_unmask();

	desc->status &amp;= ~pending;

	handle_IRQ_event(desc->action);

	handle_irq_event(desc->action);

} while (status &amp; pending);

desc->status &amp;= ~running;

		</programlisting>
@@ -344,7 +346,7 @@ desc->status &amp;= ~running; 
		<para>

		The following control flow is implemented (simplified excerpt):

		<programlisting>

handle_IRQ_event(desc->action);

handle_irq_event(desc->action);

		</programlisting>

		</para>

   	    </sect3>
@@ -362,12 +364,29 @@ handle_IRQ_event(desc->action); 
		<para>

		The following control flow is implemented (simplified excerpt):

		<programlisting>

handle_IRQ_event(desc->action);

if (desc->chip->irq_eoi)

        desc->chip->irq_eoi();

if (desc->irq_data.chip->irq_ack)

	desc->irq_data.chip->irq_ack();

handle_irq_event(desc->action);

if (desc->irq_data.chip->irq_eoi)

        desc->irq_data.chip->irq_eoi();

		</programlisting>

		</para>

   	    </sect3>

	    <sect3 id="EOI_Edge_IRQ_flow_handler">

	 	<title>EOI Edge IRQ flow handler</title>

		<para>

		handle_edge_eoi_irq provides an abnomination of the edge

		handler which is solely used to tame a badly wreckaged

		irq controller on powerpc/cell.

		</para>

   	    </sect3>

	    <sect3 id="BAD_IRQ_flow_handler">

	 	<title>Bad IRQ flow handler</title>

		<para>

		handle_bad_irq is used for spurious interrupts which

		have no real handler assigned..

		</para>

   	    </sect3>

	</sect2>

	<sect2 id="Quirks_and_optimizations">

	<title>Quirks and optimizations</title>
@@ -410,6 +429,7 @@ if (desc->chip->irq_eoi) 
	  <listitem><para>irq_mask_ack() - Optional, recommended for performance</para></listitem>

	  <listitem><para>irq_mask()</para></listitem>

	  <listitem><para>irq_unmask()</para></listitem>

	  <listitem><para>irq_eoi() - Optional, required for eoi flow handlers</para></listitem>

	  <listitem><para>irq_retrigger() - Optional</para></listitem>

	  <listitem><para>irq_set_type() - Optional</para></listitem>

	  <listitem><para>irq_set_wake() - Optional</para></listitem>
@@ -424,32 +444,24 @@ if (desc->chip->irq_eoi) 
  <chapter id="doirq">

     <title>__do_IRQ entry point</title>

     <para>

 	The original implementation __do_IRQ() is an alternative entry

	point for all types of interrupts.

	The original implementation __do_IRQ() was an alternative entry

	point for all types of interrupts. It not longer exists.

     </para>

     <para>

	This handler turned out to be not suitable for all

	interrupt hardware and was therefore reimplemented with split

	functionality for egde/level/simple/percpu interrupts. This is not

	functionality for edge/level/simple/percpu interrupts. This is not

	only a functional optimization. It also shortens code paths for

	interrupts.

      </para>

      <para>

	To make use of the split implementation, replace the call to

	__do_IRQ by a call to desc->handle_irq() and associate

        the appropriate handler function to desc->handle_irq().

	In most cases the generic handler implementations should

	be sufficient.

     </para>

  </chapter>



  <chapter id="locking">

     <title>Locking on SMP</title>

     <para>

	The locking of chip registers is up to the architecture that

	defines the chip primitives. There is a chip->lock field that can be used

	for serialization, but the generic layer does not touch it. The per-irq

	structure is protected via desc->lock, by the generic layer.

	defines the chip primitives. The per-irq structure is

	protected via desc->lock, by the generic layer.

     </para>

  </chapter>

  <chapter id="structs">

arch/arm/configs/omap2plus_defconfig

+7 −76
Original line number Diff line number Diff line
@@ -21,58 +21,22 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

CONFIG_ARCH_OMAP3=y

CONFIG_ARCH_OMAP4=y

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_MUX_DEBUG=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_ARCH_OMAP2420=y

CONFIG_ARCH_OMAP2430=y

CONFIG_ARCH_OMAP3430=y

CONFIG_MACH_OMAP_H4=y

CONFIG_MACH_OMAP_APOLLON=y

CONFIG_MACH_OMAP_2430SDP=y

CONFIG_MACH_OMAP3_BEAGLE=y

CONFIG_MACH_DEVKIT8000=y

CONFIG_MACH_OMAP_LDP=y

CONFIG_MACH_OVERO=y

CONFIG_MACH_OMAP3EVM=y

CONFIG_MACH_OMAP3517EVM=y

CONFIG_MACH_OMAP3_PANDORA=y

CONFIG_MACH_OMAP3_TOUCHBOOK=y

CONFIG_MACH_OMAP_3430SDP=y

CONFIG_MACH_NOKIA_N8X0=y

CONFIG_MACH_NOKIA_RX51=y

CONFIG_MACH_OMAP_ZOOM2=y

CONFIG_MACH_OMAP_ZOOM3=y

CONFIG_MACH_CM_T35=y

CONFIG_MACH_IGEP0020=y

CONFIG_MACH_SBC3530=y

CONFIG_MACH_OMAP_3630SDP=y

CONFIG_MACH_OMAP_4430SDP=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"

CONFIG_KEXEC=y

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=y

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -89,14 +53,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=m

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_BCSP=y
@@ -107,11 +63,9 @@ CONFIG_CFG80211=m 
CONFIG_MAC80211=m

CONFIG_MAC80211_RC_PID=y

CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_MAC80211_LEDS=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y
@@ -127,7 +81,6 @@ CONFIG_MTD_UBI=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_EEPROM_LEGACY=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y
@@ -158,19 +111,15 @@ CONFIG_TOUCHSCREEN_ADS7846=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_TWL4030_PWRBUTTON=y

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_OMAP=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

CONFIG_DEBUG_GPIO=y
@@ -181,10 +130,6 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_WATCHDOG=y

CONFIG_OMAP_WATCHDOG=y

CONFIG_TWL4030_WATCHDOG=y

CONFIG_MENELAUS=y

CONFIG_TWL4030_CORE=y

CONFIG_TWL4030_POWER=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

CONFIG_REGULATOR_TPS65023=y

CONFIG_REGULATOR_TPS6507X=y
@@ -208,7 +153,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y 
CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

CONFIG_DISPLAY_SUPPORT=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_FONTS=y
@@ -217,25 +161,20 @@ CONFIG_FONT_8x16=y 
CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_VERBOSE_PRINTK=y

CONFIG_SND_DEBUG=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_OMAP_SOC=y

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y

CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

CONFIG_SND_OMAP_SOC=m

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG_WHITELIST is not set

CONFIG_USB_MON=y

# CONFIG_USB_MUSB_HDRC is not set

# CONFIG_USB_MUSB_OTG is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set

CONFIG_USB_MUSB_DEBUG=y

CONFIG_USB_WDM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y
@@ -250,18 +189,12 @@ CONFIG_MMC_UNSAFE_RESUME=y 
CONFIG_SDIO_UART=y

CONFIG_MMC_OMAP=y

CONFIG_MMC_OMAP_HS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TWL92330=y

CONFIG_RTC_DRV_TWL4030=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=y
@@ -285,12 +218,10 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

# CONFIG_LOCK_STAT is not set

CONFIG_DEBUG_SPINLOCK_SLEEP=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ config MACH_IGEP0030 
	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select MACH_IGEP0020



config MACH_SBC3530

	bool "OMAP3 SBC STALKER board"

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ 
obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \

					   hsmmc.o

obj-$(CONFIG_MACH_IGEP0030)		+= board-igep0030.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
@@ -270,3 +268,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o 


disp-$(CONFIG_OMAP2_DSS)		:= display.o

obj-y					+= $(disp-m) $(disp-y)



obj-y					+= common-board-devices.o

arch/arm/mach-omap2/board-2430sdp.c

+5 −22
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include "mux.h"

#include "hsmmc.h"

#include "common-board-devices.h"



#define SDP2430_CS0_BASE	0x04000000

#define SECONDARY_LCD_GPIO		147
@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = { 
	.vmmc1		= &sdp2430_vmmc1,

};



static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_24XX_SYS_NIRQ,

		.platform_data = &sdp2430_twldata,

	},

};



static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {

	{

		I2C_BOARD_INFO("isp1301_omap", 0x2D),
@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void) 
{

	omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,

			ARRAY_SIZE(sdp2430_i2c1_boardinfo));

	omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,

			ARRAY_SIZE(sdp2430_i2c_boardinfo));

	omap2_pmic_init("twl4030", &sdp2430_twldata);

	return 0;

}
@@ -217,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
	{}	/* Terminator */

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};

static struct omap_usb_config sdp2430_usb_config __initdata = {

	.otg		= 1,

#ifdef  CONFIG_USB_GADGET_OMAP
@@ -240,8 +226,6 @@ static struct omap_board_mux board_mux[] __initdata = { 


static void __init omap_2430sdp_init(void)

{

	int ret;



	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);



	omap_board_config = sdp2430_config;
@@ -255,14 +239,13 @@ static void __init omap_2430sdp_init(void) 
	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);



	board_smc91x_init();



	/* Turn off secondary LCD backlight */

	ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight");

	if (ret == 0)

		gpio_direction_output(SECONDARY_LCD_GPIO, 0);

	gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,

			 "Secondary LCD backlight");

}



static void __init omap_2430sdp_map_io(void)