Skip to content

Commit 8d91a42

Browse files
torvaldstorvalds
committed
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
2 parents 4fe2dfa + f64d204 commit 8d91a42

File tree

20 files changed

+109
-88
lines changed

20 files changed

+109
-88
lines changed

‎MAINTAINERS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5385,6 +5385,15 @@ F: arch/arm/*omap*/
53855385
F: drivers/i2c/busses/i2c-omap.c
53865386
F: include/linux/i2c-omap.h
53875387

5388+
OMAP DEVICE TREE SUPPORT
5389+
M: Benoît Cousson <b-cousson@ti.com>
5390+
M: Tony Lindgren <tony@atomide.com>
5391+
L: linux-omap@vger.kernel.org
5392+
L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
5393+
S: Maintained
5394+
F: arch/arm/boot/dts/*omap*
5395+
F: arch/arm/boot/dts/*am3*
5396+
53885397
OMAP CLOCK FRAMEWORK SUPPORT
53895398
M: Paul Walmsley <paul@pwsan.com>
53905399
L: linux-omap@vger.kernel.org

‎arch/arm/configs/omap2plus_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ CONFIG_MAC80211_RC_PID=y
6565
CONFIG_MAC80211_RC_DEFAULT_PID=y
6666
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
6767
CONFIG_CONNECTOR=y
68+
CONFIG_DEVTMPFS=y
69+
CONFIG_DEVTMPFS_MOUNT=y
6870
CONFIG_MTD=y
6971
CONFIG_MTD_CMDLINE_PARTS=y
7072
CONFIG_MTD_CHAR=y
@@ -132,9 +134,11 @@ CONFIG_POWER_SUPPLY=y
132134
CONFIG_WATCHDOG=y
133135
CONFIG_OMAP_WATCHDOG=y
134136
CONFIG_TWL4030_WATCHDOG=y
137+
CONFIG_MFD_TPS65217=y
135138
CONFIG_REGULATOR_TWL4030=y
136139
CONFIG_REGULATOR_TPS65023=y
137140
CONFIG_REGULATOR_TPS6507X=y
141+
CONFIG_REGULATOR_TPS65217=y
138142
CONFIG_FB=y
139143
CONFIG_FIRMWARE_EDID=y
140144
CONFIG_FB_MODE_HELPERS=y
@@ -170,6 +174,7 @@ CONFIG_SND_DEBUG=y
170174
CONFIG_SND_USB_AUDIO=m
171175
CONFIG_SND_SOC=m
172176
CONFIG_SND_OMAP_SOC=m
177+
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
173178
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
174179
CONFIG_USB=y
175180
CONFIG_USB_DEBUG=y

‎arch/arm/mach-omap1/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Common support
66
obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \
7-
serial.o devices.o dma.o
7+
serial.o devices.o dma.o fb.o
88
obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
99

1010
ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

‎arch/arm/mach-omap1/fb.c

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/*
2+
* File: arch/arm/plat-omap/fb.c
3+
*
4+
* Framebuffer device registration for TI OMAP platforms
5+
*
6+
* Copyright (C) 2006 Nokia Corporation
7+
* Author: Imre Deak <imre.deak@nokia.com>
8+
*
9+
* This program is free software; you can redistribute it and/or modify it
10+
* under the terms of the GNU General Public License as published by the
11+
* Free Software Foundation; either version 2 of the License, or (at your
12+
* option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful, but
15+
* WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU General Public License along
20+
* with this program; if not, write to the Free Software Foundation, Inc.,
21+
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22+
*/
23+
24+
#include <linux/module.h>
25+
#include <linux/kernel.h>
26+
#include <linux/mm.h>
27+
#include <linux/init.h>
28+
#include <linux/platform_device.h>
29+
#include <linux/memblock.h>
30+
#include <linux/io.h>
31+
#include <linux/omapfb.h>
32+
#include <linux/dma-mapping.h>
33+
34+
#include <asm/mach/map.h>
35+
36+
#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
37+
38+
static bool omapfb_lcd_configured;
39+
static struct omapfb_platform_data omapfb_config;
40+
41+
static u64 omap_fb_dma_mask = ~(u32)0;
42+
43+
static struct platform_device omap_fb_device = {
44+
.name = "omapfb",
45+
.id = -1,
46+
.dev = {
47+
.dma_mask = &omap_fb_dma_mask,
48+
.coherent_dma_mask = DMA_BIT_MASK(32),
49+
.platform_data = &omapfb_config,
50+
},
51+
.num_resources = 0,
52+
};
53+
54+
void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
55+
{
56+
omapfb_config.lcd = *config;
57+
omapfb_lcd_configured = true;
58+
}
59+
60+
static int __init omap_init_fb(void)
61+
{
62+
/*
63+
* If the board file has not set the lcd config with
64+
* omapfb_set_lcd_config(), don't bother registering the omapfb device
65+
*/
66+
if (!omapfb_lcd_configured)
67+
return 0;
68+
69+
return platform_device_register(&omap_fb_device);
70+
}
71+
72+
arch_initcall(omap_init_fb);
73+
74+
#else
75+
76+
void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
77+
{
78+
}
79+
80+
#endif

‎arch/arm/mach-omap2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Common support
6-
obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
6+
obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
77
common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
88
omap_device.o sram.o
99

‎arch/arm/mach-omap2/control.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
#define OMAP343X_PADCONF_ETK_D14 OMAP343X_PADCONF_ETK(16)
235235
#define OMAP343X_PADCONF_ETK_D15 OMAP343X_PADCONF_ETK(17)
236236

237-
/* 34xx GENERAL_WKUP regist offsets */
237+
/* 34xx GENERAL_WKUP register offsets */
238238
#define OMAP343X_CONTROL_WKUP_DEBOBSMUX(i) (OMAP343X_CONTROL_GENERAL_WKUP + \
239239
0x008 + (i))
240240
#define OMAP343X_CONTROL_WKUP_DEBOBS0 (OMAP343X_CONTROL_GENERAL_WKUP + 0x008)

‎arch/arm/mach-omap2/dpll3xxx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,7 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
504504
if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
505505
freqsel = _omap3_dpll_compute_freqsel(clk,
506506
dd->last_rounded_n);
507-
if (!freqsel)
508-
WARN_ON(1);
507+
WARN_ON(!freqsel);
509508
}
510509

511510
pr_debug("%s: %s: set rate: locking rate to %lu.\n",

‎arch/arm/mach-omap2/drm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include "omap_device.h"
2929
#include "omap_hwmod.h"
30-
#include <plat/cpu.h>
3130

3231
#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
3332

‎arch/arm/mach-omap2/dss-common.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
#include <video/omap-panel-nokia-dsi.h>
3232
#include <video/omap-panel-picodlp.h>
3333

34-
#include <plat/cpu.h>
35-
34+
#include "soc.h"
3635
#include "dss-common.h"
3736
#include "mux.h"
3837

‎arch/arm/plat-omap/fb.c renamed to ‎arch/arm/mach-omap2/fb.c

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
* File: arch/arm/plat-omap/fb.c
3-
*
42
* Framebuffer device registration for TI OMAP platforms
53
*
64
* Copyright (C) 2006 Nokia Corporation
@@ -33,7 +31,7 @@
3331

3432
#include <asm/mach/map.h>
3533

36-
#include <plat/cpu.h>
34+
#include "soc.h"
3735

3836
#ifdef CONFIG_OMAP2_VRFB
3937

@@ -94,45 +92,7 @@ static int __init omap_init_vrfb(void)
9492
arch_initcall(omap_init_vrfb);
9593
#endif
9694

97-
#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
98-
99-
static bool omapfb_lcd_configured;
100-
static struct omapfb_platform_data omapfb_config;
101-
102-
static u64 omap_fb_dma_mask = ~(u32)0;
103-
104-
static struct platform_device omap_fb_device = {
105-
.name = "omapfb",
106-
.id = -1,
107-
.dev = {
108-
.dma_mask = &omap_fb_dma_mask,
109-
.coherent_dma_mask = DMA_BIT_MASK(32),
110-
.platform_data = &omapfb_config,
111-
},
112-
.num_resources = 0,
113-
};
114-
115-
void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
116-
{
117-
omapfb_config.lcd = *config;
118-
omapfb_lcd_configured = true;
119-
}
120-
121-
static int __init omap_init_fb(void)
122-
{
123-
/*
124-
* If the board file has not set the lcd config with
125-
* omapfb_set_lcd_config(), don't bother registering the omapfb device
126-
*/
127-
if (!omapfb_lcd_configured)
128-
return 0;
129-
130-
return platform_device_register(&omap_fb_device);
131-
}
132-
133-
arch_initcall(omap_init_fb);
134-
135-
#elif defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
95+
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
13696

13797
static u64 omap_fb_dma_mask = ~(u32)0;
13898
static struct omapfb_platform_data omapfb_config;
@@ -155,10 +115,4 @@ static int __init omap_init_fb(void)
155115

156116
arch_initcall(omap_init_fb);
157117

158-
#else
159-
160-
void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
161-
{
162-
}
163-
164118
#endif

‎arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
#include <linux/omap-dma.h>
2828

29-
#include <linux/platform_data/omap_ocp2scp.h>
3029
#include <linux/platform_data/spi-omap2-mcspi.h>
3130
#include <linux/platform_data/asoc-ti-mcbsp.h>
3231
#include <linux/platform_data/iommu-omap.h>

‎arch/arm/mach-omap2/omap_twl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ int __init omap3_twl_set_sr_bit(bool enable)
292292
if (twl_sr_enable_autoinit)
293293
pr_warning("%s: unexpected multiple calls\n", __func__);
294294

295-
ret = twl_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &temp,
296-
TWL4030_DCDC_GLOBAL_CFG);
295+
ret = twl_i2c_read_u8(TWL_MODULE_PM_RECEIVER, &temp,
296+
TWL4030_DCDC_GLOBAL_CFG);
297297
if (ret)
298298
goto err;
299299

@@ -302,8 +302,8 @@ int __init omap3_twl_set_sr_bit(bool enable)
302302
else
303303
temp &= ~SMARTREFLEX_ENABLE;
304304

305-
ret = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, temp,
306-
TWL4030_DCDC_GLOBAL_CFG);
305+
ret = twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, temp,
306+
TWL4030_DCDC_GLOBAL_CFG);
307307
if (!ret) {
308308
twl_sr_enable_autoinit = true;
309309
return 0;

‎arch/arm/mach-omap2/pmu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
* the Free Software Foundation; either version 2 of the License, or
1212
* (at your option) any later version.
1313
*/
14-
#include <linux/pm_runtime.h>
15-
1614
#include <asm/pmu.h>
1715

1816
#include "soc.h"

‎arch/arm/mach-omap2/prm2xxx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#include <linux/io.h>
1919
#include <linux/irq.h>
2020

21+
#include "soc.h"
2122
#include "common.h"
22-
#include <plat/cpu.h>
23-
2423
#include "vp.h"
2524
#include "powerdomain.h"
2625
#include "clockdomain.h"

‎arch/arm/mach-omap2/prm3xxx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#include <linux/io.h>
1919
#include <linux/irq.h>
2020

21+
#include "soc.h"
2122
#include "common.h"
22-
#include <plat/cpu.h>
23-
2423
#include "vp.h"
2524
#include "powerdomain.h"
2625
#include "prm3xxx.h"

‎arch/arm/plat-omap/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Common support
6-
obj-y := sram.o dma.o fb.o counter_32k.o
6+
obj-y := sram.o dma.o counter_32k.o
77
obj-m :=
88
obj-n :=
99
obj- :=

‎arch/arm/plat-omap/dmtimer.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -898,19 +898,8 @@ static struct platform_driver omap_dm_timer_driver = {
898898
},
899899
};
900900

901-
static int __init omap_dm_timer_driver_init(void)
902-
{
903-
return platform_driver_register(&omap_dm_timer_driver);
904-
}
905-
906-
static void __exit omap_dm_timer_driver_exit(void)
907-
{
908-
platform_driver_unregister(&omap_dm_timer_driver);
909-
}
910-
911901
early_platform_init("earlytimer", &omap_dm_timer_driver);
912-
module_init(omap_dm_timer_driver_init);
913-
module_exit(omap_dm_timer_driver_exit);
902+
module_platform_driver(omap_dm_timer_driver);
914903

915904
MODULE_DESCRIPTION("OMAP Dual-Mode Timer Driver");
916905
MODULE_LICENSE("GPL");

‎arch/arm/plat-omap/include/plat/cpu.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,4 @@
3232
#include <mach/soc.h>
3333
#endif
3434

35-
#ifdef CONFIG_ARCH_OMAP2PLUS
36-
#include "../../mach-omap2/soc.h"
37-
#endif
38-
3935
#endif

‎drivers/media/platform/omap3isp/isp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
#include <media/v4l2-common.h>
7272
#include <media/v4l2-device.h>
7373

74-
#include <plat/cpu.h>
75-
7674
#include "isp.h"
7775
#include "ispreg.h"
7876
#include "ispccdc.h"

‎drivers/power/avs/smartreflex.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#include <linux/pm_runtime.h>
2828
#include <linux/power/smartreflex.h>
2929

30-
#include <plat/cpu.h>
31-
3230
#define SMARTREFLEX_NAME_LEN 16
3331
#define NVALUE_NAME_LEN 40
3432
#define SR_DISABLE_TIMEOUT 200

0 commit comments

Comments
 (0)