1 From 149545df26169d257b144ff78934ce9cb5b6818b Mon Sep 17 00:00:00 2001
2 From: Otavio Salvador <otavio@ossystems.com.br>
3 Date: Sat, 19 Oct 2013 10:55:11 -0300
4 Subject: [PATCH] epdc: Rename mxcfb_epdc_kernel.h to mxc_epdc.h
5 Organization: O.S. Systems Software LTDA.
7 This allow for forward compatibility with imx-test >= 3.10.9-1.0.0.
9 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11 drivers/video/mxc/mxc_epdc_fb.c | 2 +-
12 include/linux/mxcfb_epdc.h | 49 +++++++++++++++++++++++++++++++++++++++
13 include/linux/mxcfb_epdc_kernel.h | 49 ---------------------------------------
14 3 files changed, 50 insertions(+), 50 deletions(-)
15 create mode 100644 include/linux/mxcfb_epdc.h
16 delete mode 100644 include/linux/mxcfb_epdc_kernel.h
18 diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c
19 index 4103498..b3ef8ea 100644
20 --- a/drivers/video/mxc/mxc_epdc_fb.c
21 +++ b/drivers/video/mxc/mxc_epdc_fb.c
23 #include <linux/dmaengine.h>
24 #include <linux/pxp_dma.h>
25 #include <linux/mxcfb.h>
26 -#include <linux/mxcfb_epdc_kernel.h>
27 +#include <linux/mxcfb_epdc.h>
28 #include <linux/gpio.h>
29 #include <linux/regulator/driver.h>
30 #include <linux/fsl_devices.h>
31 diff --git a/include/linux/mxcfb_epdc.h b/include/linux/mxcfb_epdc.h
33 index 0000000..06fea6f
35 +++ b/include/linux/mxcfb_epdc.h
38 + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved.
40 + * This program is free software; you can redistribute it and/or modify
41 + * it under the terms of the GNU General Public License as published by
42 + * the Free Software Foundation; either version 2 of the License, or
43 + * (at your option) any later version.
45 + * This program is distributed in the hope that it will be useful,
46 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
47 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
48 + * GNU General Public License for more details.
50 + * You should have received a copy of the GNU General Public License
51 + * along with this program; if not, write to the Free Software
52 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
55 +#ifndef _MXCFB_EPDC_KERNEL
56 +#define _MXCFB_EPDC_KERNEL
58 +void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
59 + struct fb_info *info);
60 +int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info);
61 +int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
62 +int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data,
63 + struct fb_info *info);
64 +int mxc_epdc_fb_wait_update_complete(
65 + struct mxcfb_update_marker_data *marker_data,
66 + struct fb_info *info);
67 +int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
68 + struct fb_info *info);
69 +int mxc_epdc_get_pwrdown_delay(struct fb_info *info);
70 +int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
72 +void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
73 + struct fb_info *info);
74 +int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info);
75 +int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
76 +int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data,
77 + struct fb_info *info);
78 +int mxc_spdc_fb_wait_update_complete(
79 + struct mxcfb_update_marker_data *marker_data,
80 + struct fb_info *info);
81 +int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
82 + struct fb_info *info);
83 +int mxc_spdc_get_pwrdown_delay(struct fb_info *info);
84 +int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
86 diff --git a/include/linux/mxcfb_epdc_kernel.h b/include/linux/mxcfb_epdc_kernel.h
87 deleted file mode 100644
88 index 06fea6f..0000000
89 --- a/include/linux/mxcfb_epdc_kernel.h
93 - * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved.
95 - * This program is free software; you can redistribute it and/or modify
96 - * it under the terms of the GNU General Public License as published by
97 - * the Free Software Foundation; either version 2 of the License, or
98 - * (at your option) any later version.
100 - * This program is distributed in the hope that it will be useful,
101 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
102 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
103 - * GNU General Public License for more details.
105 - * You should have received a copy of the GNU General Public License
106 - * along with this program; if not, write to the Free Software
107 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
110 -#ifndef _MXCFB_EPDC_KERNEL
111 -#define _MXCFB_EPDC_KERNEL
113 -void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
114 - struct fb_info *info);
115 -int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info);
116 -int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
117 -int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data,
118 - struct fb_info *info);
119 -int mxc_epdc_fb_wait_update_complete(
120 - struct mxcfb_update_marker_data *marker_data,
121 - struct fb_info *info);
122 -int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
123 - struct fb_info *info);
124 -int mxc_epdc_get_pwrdown_delay(struct fb_info *info);
125 -int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
127 -void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
128 - struct fb_info *info);
129 -int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info);
130 -int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
131 -int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data,
132 - struct fb_info *info);
133 -int mxc_spdc_fb_wait_update_complete(
134 - struct mxcfb_update_marker_data *marker_data,
135 - struct fb_info *info);
136 -int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
137 - struct fb_info *info);
138 -int mxc_spdc_get_pwrdown_delay(struct fb_info *info);
139 -int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
