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

Commit 8d91a42e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull late ARM cleanups for omap from Olof Johansson:
 "From Tony Lindgren:

  Here are few more patches to finish the omap changes for multiplatform
  conversion that are not strictly fixes, but were too complex to do
  with the dependencies during the merge window.  Those are to move of
  serial-omap.h to platform_data, and the removal of remaining
  cpu_is_omap macro usage outside mach-omap2.

  Then there are several trivial fixes for typos and few minimal
  omap2plus_defconfig updates."

* tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON
  OMAP2: Fix a typo - replace regist with register.
  ARM/omap: use module_platform_driver macro
  ARM: OMAP2+: PMU: Remove unused header
  ARM: OMAP4: remove duplicated include from omap_hwmod_44xx_data.c
  ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio
  ARM: OMAP2+: omap2plus_defconfig: Add tps65217 support
  ARM: OMAP2+: enable devtmpfs and devtmpfs automount
  ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
  ARM: OMAP2+: Drop plat/cpu.h for omap2plus
  ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage
  MAINTAINERS: Add an entry for omap related .dts files
parents 4fe2dfab f64d204b

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -5385,6 +5385,15 @@ F: arch/arm/*omap*/ 
F:	drivers/i2c/busses/i2c-omap.c

F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/boot/dts/*omap*

F:	arch/arm/boot/dts/*am3*



OMAP CLOCK FRAMEWORK SUPPORT

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

arch/arm/configs/omap2plus_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ CONFIG_MAC80211_RC_PID=y 
CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y
@@ -132,9 +134,11 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_WATCHDOG=y

CONFIG_OMAP_WATCHDOG=y

CONFIG_TWL4030_WATCHDOG=y

CONFIG_MFD_TPS65217=y

CONFIG_REGULATOR_TWL4030=y

CONFIG_REGULATOR_TPS65023=y

CONFIG_REGULATOR_TPS6507X=y

CONFIG_REGULATOR_TPS65217=y

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y
@@ -170,6 +174,7 @@ CONFIG_SND_DEBUG=y 
CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

CONFIG_SND_OMAP_SOC=m

CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m

CONFIG_USB=y

CONFIG_USB_DEBUG=y

arch/arm/mach-omap1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Common support

obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \

	 serial.o devices.o dma.o

	 serial.o devices.o dma.o fb.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o



ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

arch/arm/mach-omap1/fb.c

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * File: arch/arm/plat-omap/fb.c

 *

 * Framebuffer device registration for TI OMAP platforms

 *

 * Copyright (C) 2006 Nokia Corporation

 * Author: Imre Deak <imre.deak@nokia.com>

 *

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

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/memblock.h>

#include <linux/io.h>

#include <linux/omapfb.h>

#include <linux/dma-mapping.h>



#include <asm/mach/map.h>



#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)



static bool omapfb_lcd_configured;

static struct omapfb_platform_data omapfb_config;



static u64 omap_fb_dma_mask = ~(u32)0;



static struct platform_device omap_fb_device = {

	.name		= "omapfb",

	.id		= -1,

	.dev = {

		.dma_mask		= &omap_fb_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &omapfb_config,

	},

	.num_resources = 0,

};



void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)

{

	omapfb_config.lcd = *config;

	omapfb_lcd_configured = true;

}



static int __init omap_init_fb(void)

{

	/*

	 * If the board file has not set the lcd config with

	 * omapfb_set_lcd_config(), don't bother registering the omapfb device

	 */

	if (!omapfb_lcd_configured)

		return 0;



	return platform_device_register(&omap_fb_device);

}



arch_initcall(omap_init_fb);



#else



void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)

{

}



#endif

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \

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