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

Commit 6839dbbb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'intc-part2-for-v3.18' of... 

Merge tag 'intc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

 into next/drivers

Merge "part 2 of omap intc changes" from Tony Lindgren:

Second part of omap intc interrupt controller changes to
move it to drivers.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'intc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  irqchip: omap-intc: remove unnecessary comments
  irqchip: omap-intc: correct maximum number or MIR registers
  irqchip: omap-intc: enable TURBO idle mode
  irqchip: omap-intc: enable IP protection
  irqchip: omap-intc: remove unnecesary of_address_to_resource() call
  irqchip: omap-intc: comment style cleanup
  irqchip: omap-intc: minor improvement to omap_irq_pending()
  arm: omap: irq: move irq.c to drivers/irqchip/
  irqchip: add irq-omap-intc.h header
  arm: omap2: n8x0: move i2c devices to DT
parents 8a87f1a6 64d5947b

arch/arm/boot/dts/omap2420-n810.dts

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ 
	model = "Nokia N810";

	compatible = "nokia,n810", "nokia,n8x0", "ti,omap2420", "ti,omap2";

};



&i2c2 {

	aic3x@18 {

		compatible = "tlv320aic3x";

		reg = <0x18>;

	};

};

arch/arm/boot/dts/omap2420-n8x0-common.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ 


&i2c1 {

	clock-frequency = <400000>;



	pmic@72 {

		compatible = "menelaus";

		reg = <0x72>;

		interrupts = <7 IRQ_TYPE_EDGE_RISING>;

	};

};



&i2c2 {

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ config ARCH_OMAP2PLUS 
	select PINCTRL

	select SOC_BUS

	select TI_PRIV_EDMA

	select OMAP_IRQCHIP

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5

arch/arm/mach-omap2/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ 
	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o sram.o drm.o



omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \
@@ -20,7 +19,7 @@ secure-common = omap-smc.o omap-secure.o 
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)

obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)

obj-$(CONFIG_SOC_OMAP5)	 += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)

arch/arm/mach-omap2/board-n8x0.c

+3 −23
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "mmc.h"

#include "soc.h"

#include "gpmc-onenand.h"

#include "common-board-devices.h"



#define TUSB6010_ASYNC_CS	1

#define TUSB6010_SYNC_CS	4
@@ -568,29 +569,14 @@ static int n8x0_menelaus_late_init(struct device *dev) 
}

#endif



static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {

struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {

	.late_init = n8x0_menelaus_late_init,

};



static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {

	{

		I2C_BOARD_INFO("menelaus", 0x72),

		.irq = 7 + OMAP_INTC_START,

		.platform_data = &n8x0_menelaus_platform_data,

	},

};



static struct aic3x_pdata n810_aic33_data __initdata = {

struct aic3x_pdata n810_aic33_data __initdata = {

	.gpio_reset = 118,

};



static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

		.platform_data = &n810_aic33_data,

	},

};



static int __init n8x0_late_initcall(void)

{

	if (!board_caps)
@@ -612,11 +598,5 @@ void * __init n8x0_legacy_init(void) 
	board_check_revision();

	spi_register_board_info(n800_spi_board_info,

				ARRAY_SIZE(n800_spi_board_info));

	i2c_register_board_info(0, n8x0_i2c_board_info_1,

				ARRAY_SIZE(n8x0_i2c_board_info_1));

	if (board_is_n810())

		i2c_register_board_info(1, n810_i2c_board_info_2,

					ARRAY_SIZE(n810_i2c_board_info_2));



	return &mmc1_data;

}