Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e15d11ea
Commit
e15d11ea
authored
Jul 10, 2016
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'peter/peter/for-4.8_omapdss_part1' into omap-for-v4.8/legacy
parents
79cdad36
f8e0db97
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
35 deletions
+54
-35
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-ldp.c
+2
-1
arch/arm/mach-omap2/board-rx51-video.c
arch/arm/mach-omap2/board-rx51-video.c
+2
-2
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/display.c
+1
-1
arch/arm/mach-omap2/display.h
arch/arm/mach-omap2/display.h
+5
-0
arch/arm/mach-omap2/dss-common.c
arch/arm/mach-omap2/dss-common.c
+1
-1
include/linux/platform_data/omapdss.h
include/linux/platform_data/omapdss.h
+42
-0
include/video/omapdss.h
include/video/omapdss.h
+1
-30
No files found.
arch/arm/mach-omap2/board-ldp.c
View file @
e15d11ea
...
...
@@ -39,7 +39,7 @@
#include "gpmc.h"
#include "gpmc-smsc911x.h"
#include <
video
/omapdss.h>
#include <
linux/platform_data
/omapdss.h>
#include <video/omap-panel-data.h>
#include "board-flash.h"
...
...
@@ -47,6 +47,7 @@
#include "hsmmc.h"
#include "control.h"
#include "common-board-devices.h"
#include "display.h"
#define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152
...
...
arch/arm/mach-omap2/board-rx51-video.c
View file @
e15d11ea
...
...
@@ -15,13 +15,14 @@
#include <linux/spi/spi.h>
#include <linux/mm.h>
#include <asm/mach-types.h>
#include <
video
/omapdss.h>
#include <
linux/platform_data
/omapdss.h>
#include <video/omap-panel-data.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "soc.h"
#include "board-rx51.h"
#include "display.h"
#include "mux.h"
...
...
@@ -32,7 +33,6 @@
static
struct
connector_atv_platform_data
rx51_tv_pdata
=
{
.
name
=
"tv"
,
.
source
=
"venc.0"
,
.
connector_type
=
OMAP_DSS_VENC_TYPE_COMPOSITE
,
.
invert_polarity
=
false
,
};
...
...
arch/arm/mach-omap2/display.c
View file @
e15d11ea
...
...
@@ -29,7 +29,7 @@
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#include <
video
/omapdss.h>
#include <
linux/platform_data
/omapdss.h>
#include "omap_hwmod.h"
#include "omap_device.h"
#include "omap-pm.h"
...
...
arch/arm/mach-omap2/display.h
View file @
e15d11ea
...
...
@@ -33,4 +33,9 @@ int omap_init_vout(void);
struct
device_node
*
__init
omapdss_find_dss_of_node
(
void
);
struct
omap_dss_board_info
;
/* Init with the board info */
int
omap_display_init
(
struct
omap_dss_board_info
*
board_data
);
#endif
arch/arm/mach-omap2/dss-common.c
View file @
e15d11ea
...
...
@@ -27,7 +27,7 @@
#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <
video
/omapdss.h>
#include <
linux/platform_data
/omapdss.h>
#include <video/omap-panel-data.h>
#include "soc.h"
...
...
include/linux/platform_data/omapdss.h
0 → 100644
View file @
e15d11ea
/*
* Copyright (C) 2016 Texas Instruments, Inc.
*
* 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.
*/
#ifndef __OMAPDSS_PDATA_H
#define __OMAPDSS_PDATA_H
enum
omapdss_version
{
OMAPDSS_VER_UNKNOWN
=
0
,
OMAPDSS_VER_OMAP24xx
,
OMAPDSS_VER_OMAP34xx_ES1
,
/* OMAP3430 ES1.0, 2.0 */
OMAPDSS_VER_OMAP34xx_ES3
,
/* OMAP3430 ES3.0+ */
OMAPDSS_VER_OMAP3630
,
OMAPDSS_VER_AM35xx
,
OMAPDSS_VER_OMAP4430_ES1
,
/* OMAP4430 ES1.0 */
OMAPDSS_VER_OMAP4430_ES2
,
/* OMAP4430 ES2.0, 2.1, 2.2 */
OMAPDSS_VER_OMAP4
,
/* All other OMAP4s */
OMAPDSS_VER_OMAP5
,
OMAPDSS_VER_AM43xx
,
OMAPDSS_VER_DRA7xx
,
};
struct
omap_dss_device
;
/* Board specific data */
struct
omap_dss_board_info
{
int
num_devices
;
struct
omap_dss_device
**
devices
;
struct
omap_dss_device
*
default_device
;
const
char
*
default_display_name
;
int
(
*
dsi_enable_pads
)(
int
dsi_id
,
unsigned
int
lane_mask
);
void
(
*
dsi_disable_pads
)(
int
dsi_id
,
unsigned
int
lane_mask
);
int
(
*
set_min_bus_tput
)(
struct
device
*
dev
,
unsigned
long
r
);
enum
omapdss_version
version
;
};
#endif
/* __OMAPDSS_PDATA_H */
include/video/omapdss.h
View file @
e15d11ea
...
...
@@ -22,6 +22,7 @@
#include <linux/kobject.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/platform_data/omapdss.h>
#include <video/videomode.h>
...
...
@@ -303,36 +304,6 @@ struct omap_dss_dsi_config {
enum
omap_dss_dsi_trans_mode
trans_mode
;
};
enum
omapdss_version
{
OMAPDSS_VER_UNKNOWN
=
0
,
OMAPDSS_VER_OMAP24xx
,
OMAPDSS_VER_OMAP34xx_ES1
,
/* OMAP3430 ES1.0, 2.0 */
OMAPDSS_VER_OMAP34xx_ES3
,
/* OMAP3430 ES3.0+ */
OMAPDSS_VER_OMAP3630
,
OMAPDSS_VER_AM35xx
,
OMAPDSS_VER_OMAP4430_ES1
,
/* OMAP4430 ES1.0 */
OMAPDSS_VER_OMAP4430_ES2
,
/* OMAP4430 ES2.0, 2.1, 2.2 */
OMAPDSS_VER_OMAP4
,
/* All other OMAP4s */
OMAPDSS_VER_OMAP5
,
OMAPDSS_VER_AM43xx
,
OMAPDSS_VER_DRA7xx
,
};
/* Board specific data */
struct
omap_dss_board_info
{
int
num_devices
;
struct
omap_dss_device
**
devices
;
struct
omap_dss_device
*
default_device
;
const
char
*
default_display_name
;
int
(
*
dsi_enable_pads
)(
int
dsi_id
,
unsigned
lane_mask
);
void
(
*
dsi_disable_pads
)(
int
dsi_id
,
unsigned
lane_mask
);
int
(
*
set_min_bus_tput
)(
struct
device
*
dev
,
unsigned
long
r
);
enum
omapdss_version
version
;
};
/* Init with the board info */
extern
int
omap_display_init
(
struct
omap_dss_board_info
*
board_data
);
struct
omap_video_timings
{
/* Unit: pixels */
u16
x_res
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment