History

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

Pull first batch of arm-soc cleanups from Olof Johansson: "These cleanups are basically all over the place. The idea is to collect changes with minimal impact but large number of changes so we can avoid them from distracting in the diffstat in the other series. A significant number of lines get removed here, in particular because the ixp2000 and ixp23xx platforms get removed. These have never been extremely popular and have fallen into disuse over time with no active maintainer taking care of them. The u5500 soc never made it into a product, so we are removing it from the ux500 platform. Many good cleanups also went into the at91 and omap platforms, as has been the case for a number of releases." Trivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx} * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits) ARM: clps711x: Cleanup IRQ handling ARM clps711x: Removed unused header mach/time.h ARM: clps711x: Added note about support EP731x CPU to Kconfig ARM: clps711x: Added missing register definitions ARM: clps711x: Used own subarch directory for store header file Dove: Fix Section mismatch warnings ARM: orion5x: ts78xx debugging changes ARM: orion5x: remove PM dependency from ts78xx ARM: orion5x: ts78xx fix NAND resource off by one ARM: orion5x: ts78xx whitespace cleanups Orion5x: Fix Section mismatch warnings Orion5x: Fix warning: struct pci_dev declared inside paramter list ARM: clps711x: Combine header files into one for clps711x-targets ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c ARM: S3C24XX: Use common macro to define resources on mach-osiris.c ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c ARM: S5PV210: Use common macro to define resources on dev-audio.c ARM: S5PC100: Use common macro to define resources on dev-audio.c ARM: S5P64X0: Use common macro to define resources on dev-audio.c ...

Linus Torvalds committed 14 years ago

Commit 9bc747b2 parents 32b908e 0e896b1335 files · +8951 −25241Browse files

Showing the changes to include (7 of 335 files). Show all

Unified · Split

7 files
  1. include/linux/mfd/abx500.h +1 −4
  2. include/linux/mfd/abx500/ab5500.h +0 −140
  3. include/linux/mfd/db5500-prcmu.h +0 −105
  4. include/linux/mfd/dbx500-prcmu.h +43 −199
  5. include/video/omap-panel-nokia-dsi.h +3 −0
  6. include/video/omap-panel-tfp410.h +8 −10
  7. include/video/omapdss.h +17 −11
include/linux/mfd/abx500.h+1−4
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 *
77 * ABX500 core access functions.
88 * The abx500 interface is used for the Analog Baseband chip
9− * ab3100, ab5500, and ab8500.
9+ * ab3100 and ab8500.
1010 *
1111 * Author: Mattias Wallin <mattias.wallin@stericsson.com>
1212 * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
@@ -30,9 +30,6 @@ struct device; · 17 unmodified lines
3030 #define AB3100_P1G 0xc6
3131 #define AB3100_R2A 0xc7
3232 #define AB3100_R2B 0xc8
33−#define AB5500_1_0 0x20
34−#define AB5500_1_1 0x21
35−#define AB5500_2_0 0x24
3633
3734 /*
3835 * AB3100, EVENTA1, A2 and A3 event register flags
include/linux/mfd/abx500/ab5500.h+0−140
@@ -1,140 +0,0 @@
1−/*
2− * Copyright (C) ST-Ericsson 2011
3− *
4− * License Terms: GNU General Public License v2
5− */
6−#ifndef MFD_AB5500_H
7−#define MFD_AB5500_H
8−
9−struct device;
10−
11−enum ab5500_devid {
12− AB5500_DEVID_ADC,
13− AB5500_DEVID_LEDS,
14− AB5500_DEVID_POWER,
15− AB5500_DEVID_REGULATORS,
16− AB5500_DEVID_SIM,
17− AB5500_DEVID_RTC,
18− AB5500_DEVID_CHARGER,
19− AB5500_DEVID_FUELGAUGE,
20− AB5500_DEVID_VIBRATOR,
21− AB5500_DEVID_CODEC,
22− AB5500_DEVID_USB,
23− AB5500_DEVID_OTP,
24− AB5500_DEVID_VIDEO,
25− AB5500_DEVID_DBIECI,
26− AB5500_DEVID_ONSWA,
27− AB5500_NUM_DEVICES,
28−};
29−
30−enum ab5500_banks {
31− AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP = 0,
32− AB5500_BANK_VDDDIG_IO_I2C_CLK_TST = 1,
33− AB5500_BANK_VDENC = 2,
34− AB5500_BANK_SIM_USBSIM = 3,
35− AB5500_BANK_LED = 4,
36− AB5500_BANK_ADC = 5,
37− AB5500_BANK_RTC = 6,
38− AB5500_BANK_STARTUP = 7,
39− AB5500_BANK_DBI_ECI = 8,
40− AB5500_BANK_CHG = 9,
41− AB5500_BANK_FG_BATTCOM_ACC = 10,
42− AB5500_BANK_USB = 11,
43− AB5500_BANK_IT = 12,
44− AB5500_BANK_VIBRA = 13,
45− AB5500_BANK_AUDIO_HEADSETUSB = 14,
46− AB5500_NUM_BANKS = 15,
47−};
48−
49−enum ab5500_banks_addr {
50− AB5500_ADDR_VIT_IO_I2C_CLK_TST_OTP = 0x4A,
51− AB5500_ADDR_VDDDIG_IO_I2C_CLK_TST = 0x4B,
52− AB5500_ADDR_VDENC = 0x06,
53− AB5500_ADDR_SIM_USBSIM = 0x04,
54− AB5500_ADDR_LED = 0x10,
55− AB5500_ADDR_ADC = 0x0A,
56− AB5500_ADDR_RTC = 0x0F,
57− AB5500_ADDR_STARTUP = 0x03,
58− AB5500_ADDR_DBI_ECI = 0x07,
59− AB5500_ADDR_CHG = 0x0B,
60− AB5500_ADDR_FG_BATTCOM_ACC = 0x0C,
61− AB5500_ADDR_USB = 0x05,
62− AB5500_ADDR_IT = 0x0E,
63− AB5500_ADDR_VIBRA = 0x02,
64− AB5500_ADDR_AUDIO_HEADSETUSB = 0x0D,
65−};
66−
67−/*
68− * Interrupt register offsets
69− * Bank : 0x0E
70− */
71−#define AB5500_IT_SOURCE0_REG 0x20
72−#define AB5500_IT_SOURCE1_REG 0x21
73−#define AB5500_IT_SOURCE2_REG 0x22
74−#define AB5500_IT_SOURCE3_REG 0x23
75−#define AB5500_IT_SOURCE4_REG 0x24
76−#define AB5500_IT_SOURCE5_REG 0x25
77−#define AB5500_IT_SOURCE6_REG 0x26
78−#define AB5500_IT_SOURCE7_REG 0x27
79−#define AB5500_IT_SOURCE8_REG 0x28
80−#define AB5500_IT_SOURCE9_REG 0x29
81−#define AB5500_IT_SOURCE10_REG 0x2A
82−#define AB5500_IT_SOURCE11_REG 0x2B
83−#define AB5500_IT_SOURCE12_REG 0x2C
84−#define AB5500_IT_SOURCE13_REG 0x2D
85−#define AB5500_IT_SOURCE14_REG 0x2E
86−#define AB5500_IT_SOURCE15_REG 0x2F
87−#define AB5500_IT_SOURCE16_REG 0x30
88−#define AB5500_IT_SOURCE17_REG 0x31
89−#define AB5500_IT_SOURCE18_REG 0x32
90−#define AB5500_IT_SOURCE19_REG 0x33
91−#define AB5500_IT_SOURCE20_REG 0x34
92−#define AB5500_IT_SOURCE21_REG 0x35
93−#define AB5500_IT_SOURCE22_REG 0x36
94−#define AB5500_IT_SOURCE23_REG 0x37
95−
96−#define AB5500_NUM_IRQ_REGS 23
97−
98−/**
99− * struct ab5500
100− * @access_mutex: lock out concurrent accesses to the AB registers
101− * @dev: a pointer to the device struct for this chip driver
102− * @ab5500_irq: the analog baseband irq
103− * @irq_base: the platform configuration irq base for subdevices
104− * @chip_name: name of this chip variant
105− * @chip_id: 8 bit chip ID for this chip variant
106− * @irq_lock: a lock to protect the mask
107− * @abb_events: a local bit mask of the prcmu wakeup events
108− * @event_mask: a local copy of the mask event registers
109− * @last_event_mask: a copy of the last event_mask written to hardware
110− * @startup_events: a copy of the first reading of the event registers
111− * @startup_events_read: whether the first events have been read
112− */
113−struct ab5500 {
114− struct mutex access_mutex;
115− struct device *dev;
116− unsigned int ab5500_irq;
117− unsigned int irq_base;
118− char chip_name[32];
119− u8 chip_id;
120− struct mutex irq_lock;
121− u32 abb_events;
122− u8 mask[AB5500_NUM_IRQ_REGS];
123− u8 oldmask[AB5500_NUM_IRQ_REGS];
124− u8 startup_events[AB5500_NUM_IRQ_REGS];
125− bool startup_events_read;
126−#ifdef CONFIG_DEBUG_FS
127− unsigned int debug_bank;
128− unsigned int debug_address;
129−#endif
130−};
131−
132−struct ab5500_platform_data {
133− struct {unsigned int base; unsigned int count; } irq;
134− void *dev_data[AB5500_NUM_DEVICES];
135− struct abx500_init_settings *init_settings;
136− unsigned int init_settings_sz;
137− bool pm_power_off;
138−};
139−
140−#endif /* MFD_AB5500_H */
include/linux/mfd/db5500-prcmu.h+0−105
@@ -1,105 +0,0 @@
1−/*
2− * Copyright (C) ST-Ericsson SA 2010
3− *
4− * License Terms: GNU General Public License v2
5− *
6− * U5500 PRCMU API.
7− */
8−#ifndef __MFD_DB5500_PRCMU_H
9−#define __MFD_DB5500_PRCMU_H
10−
11−static inline int prcmu_resetout(u8 resoutn, u8 state)
12−{
13− return 0;
14−}
15−
16−static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state)
17−{
18− return 0;
19−}
20−
21−static inline int db5500_prcmu_request_clock(u8 clock, bool enable)
22−{
23− return 0;
24−}
25−
26−static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk,
27− bool keep_ap_pll)
28−{
29− return 0;
30−}
31−
32−static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state)
33−{
34− return 0;
35−}
36−
37−static inline u16 db5500_prcmu_get_reset_code(void)
38−{
39− return 0;
40−}
41−
42−static inline bool db5500_prcmu_is_ac_wake_requested(void)
43−{
44− return 0;
45−}
46−
47−static inline int db5500_prcmu_set_arm_opp(u8 opp)
48−{
49− return 0;
50−}
51−
52−static inline int db5500_prcmu_get_arm_opp(void)
53−{
54− return 0;
55−}
56−
57−static inline void db5500_prcmu_config_abb_event_readout(u32 abb_events) {}
58−
59−static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {}
60−
61−static inline void db5500_prcmu_system_reset(u16 reset_code) {}
62−
63−static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {}
64−
65−#ifdef CONFIG_MFD_DB5500_PRCMU
66−
67−void db5500_prcmu_early_init(void);
68−int db5500_prcmu_set_display_clocks(void);
69−int db5500_prcmu_disable_dsipll(void);
70−int db5500_prcmu_enable_dsipll(void);
71−int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
72−int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
73−
74−#else /* !CONFIG_UX500_SOC_DB5500 */
75−
76−static inline void db5500_prcmu_early_init(void) {}
77−
78−static inline int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
79−{
80− return -ENOSYS;
81−}
82−
83−static inline int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
84−{
85− return -ENOSYS;
86−}
87−
88−static inline int db5500_prcmu_set_display_clocks(void)
89−{
90− return 0;
91−}
92−
93−static inline int db5500_prcmu_disable_dsipll(void)
94−{
95− return 0;
96−}
97−
98−static inline int db5500_prcmu_enable_dsipll(void)
99−{
100− return 0;
101−}
102−
103−#endif /* CONFIG_MFD_DB5500_PRCMU */
104−
105−#endif /* __MFD_DB5500_PRCMU_H */
include/linux/mfd/dbx500-prcmu.h+43−199
@@ -54,17 +54,6 @@ enum prcmu_wakeup_index { · 53 unmodified lines
5454 #define EPOD_ID_ESRAM34 7
5555 #define NUM_EPOD_ID 8
5656
57−/*
58− * DB5500 EPODs
59− */
60−#define DB5500_EPOD_ID_BASE 0x0100
61−#define DB5500_EPOD_ID_SGA (DB5500_EPOD_ID_BASE + 0)
62−#define DB5500_EPOD_ID_HVA (DB5500_EPOD_ID_BASE + 1)
63−#define DB5500_EPOD_ID_SIA (DB5500_EPOD_ID_BASE + 2)
64−#define DB5500_EPOD_ID_DISP (DB5500_EPOD_ID_BASE + 3)
65−#define DB5500_EPOD_ID_ESRAM12 (DB5500_EPOD_ID_BASE + 6)
66−#define DB5500_NUM_EPOD_ID 7
67−
6857 /*
6958 * state definition for EPOD (power domain)
7059 * - EPOD_STATE_NO_CHANGE: The EPOD should remain unchanged
@@ -80,29 +69,6 @@ enum prcmu_wakeup_index { · 9 unmodified lines
8069 #define EPOD_STATE_ON_CLK_OFF 0x03
8170 #define EPOD_STATE_ON 0x04
8271
83−/* DB5500 CLKOUT IDs */
84−enum {
85− DB5500_CLKOUT0 = 0,
86− DB5500_CLKOUT1,
87−};
88−
89−/* DB5500 CLKOUTx sources */
90−enum {
91− DB5500_CLKOUT_REF_CLK_SEL0,
92− DB5500_CLKOUT_RTC_CLK0_SEL0,
93− DB5500_CLKOUT_ULP_CLK_SEL0,
94− DB5500_CLKOUT_STATIC0,
95− DB5500_CLKOUT_REFCLK,
96− DB5500_CLKOUT_ULPCLK,
97− DB5500_CLKOUT_ARMCLK,
98− DB5500_CLKOUT_SYSACC0CLK,
99− DB5500_CLKOUT_SOC0PLLCLK,
100− DB5500_CLKOUT_SOC1PLLCLK,
101− DB5500_CLKOUT_DDRPLLCLK,
102− DB5500_CLKOUT_TVCLK,
103− DB5500_CLKOUT_IRDACLK,
104−};
105−
10672 /*
10773 * CLKOUT sources
10874 */
@@ -248,101 +214,66 @@ enum ddr_pwrst { · 139 unmodified lines
248214 };
249215
250216 #include <linux/mfd/db8500-prcmu.h>
251−#include <linux/mfd/db5500-prcmu.h>
252217
253−#if defined(CONFIG_UX500_SOC_DB8500) || defined(CONFIG_UX500_SOC_DB5500)
218+#if defined(CONFIG_UX500_SOC_DB8500)
254219
255220 #include <mach/id.h>
256221
257222 static inline void __init prcmu_early_init(void)
258223 {
259− if (cpu_is_u5500())
260− return db5500_prcmu_early_init();
261− else
262− return db8500_prcmu_early_init();
224+ return db8500_prcmu_early_init();
263225 }
264226
265227 static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
266228 bool keep_ap_pll)
267229 {
268− if (cpu_is_u5500())
269− return db5500_prcmu_set_power_state(state, keep_ulp_clk,
270− keep_ap_pll);
271− else
272− return db8500_prcmu_set_power_state(state, keep_ulp_clk,
273− keep_ap_pll);
230+ return db8500_prcmu_set_power_state(state, keep_ulp_clk,
231+ keep_ap_pll);
274232 }
275233
276234 static inline u8 prcmu_get_power_state_result(void)
277235 {
278− if (cpu_is_u5500())
279− return -EINVAL;
280− else
281− return db8500_prcmu_get_power_state_result();
236+ return db8500_prcmu_get_power_state_result();
282237 }
283238
284239 static inline int prcmu_gic_decouple(void)
285240 {
286− if (cpu_is_u5500())
287− return -EINVAL;
288− else
289− return db8500_prcmu_gic_decouple();
241+ return db8500_prcmu_gic_decouple();
290242 }
291243
292244 static inline int prcmu_gic_recouple(void)
293245 {
294− if (cpu_is_u5500())
295− return -EINVAL;
296− else
297− return db8500_prcmu_gic_recouple();
246+ return db8500_prcmu_gic_recouple();
298247 }
299248
300249 static inline bool prcmu_gic_pending_irq(void)
301250 {
302− if (cpu_is_u5500())
303− return -EINVAL;
304− else
305− return db8500_prcmu_gic_pending_irq();
251+ return db8500_prcmu_gic_pending_irq();
306252 }
307253
308254 static inline bool prcmu_is_cpu_in_wfi(int cpu)
309255 {
310− if (cpu_is_u5500())
311− return -EINVAL;
312− else
313− return db8500_prcmu_is_cpu_in_wfi(cpu);
256+ return db8500_prcmu_is_cpu_in_wfi(cpu);
314257 }
315258
316259 static inline int prcmu_copy_gic_settings(void)
317260 {
318− if (cpu_is_u5500())
319− return -EINVAL;
320− else
321− return db8500_prcmu_copy_gic_settings();
261+ return db8500_prcmu_copy_gic_settings();
322262 }
323263
324264 static inline bool prcmu_pending_irq(void)
325265 {
326− if (cpu_is_u5500())
327− return -EINVAL;
328− else
329− return db8500_prcmu_pending_irq();
266+ return db8500_prcmu_pending_irq();
330267 }
331268
332269 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
333270 {
334− if (cpu_is_u5500())
335− return -EINVAL;
336− else
337− return db8500_prcmu_set_epod(epod_id, epod_state);
271+ return db8500_prcmu_set_epod(epod_id, epod_state);
338272 }
339273
340274 static inline void prcmu_enable_wakeups(u32 wakeups)
341275 {
342− if (cpu_is_u5500())
343− db5500_prcmu_enable_wakeups(wakeups);
344− else
345− db8500_prcmu_enable_wakeups(wakeups);
276+ db8500_prcmu_enable_wakeups(wakeups);
346277 }
347278
348279 static inline void prcmu_disable_wakeups(void)
@@ -352,18 +283,12 @@ static inline void prcmu_disable_wakeups(void) · 3 unmodified lines
352283
353284 static inline void prcmu_config_abb_event_readout(u32 abb_events)
354285 {
355− if (cpu_is_u5500())
356− db5500_prcmu_config_abb_event_readout(abb_events);
357− else
358− db8500_prcmu_config_abb_event_readout(abb_events);
286+ db8500_prcmu_config_abb_event_readout(abb_events);
359287 }
360288
361289 static inline void prcmu_get_abb_event_buffer(void __iomem **buf)
362290 {
363− if (cpu_is_u5500())
364− db5500_prcmu_get_abb_event_buffer(buf);
365− else
366− db8500_prcmu_get_abb_event_buffer(buf);
291+ db8500_prcmu_get_abb_event_buffer(buf);
367292 }
368293
369294 int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
@@ -374,10 +299,7 @@ int prcmu_config_clkout(u8 clkout, u8 source, u8 div); · 4 unmodified lines
374299
375300 static inline int prcmu_request_clock(u8 clock, bool enable)
376301 {
377− if (cpu_is_u5500())
378− return db5500_prcmu_request_clock(clock, enable);
379− else
380− return db8500_prcmu_request_clock(clock, enable);
302+ return db8500_prcmu_request_clock(clock, enable);
381303 }
382304
383305 unsigned long prcmu_clock_rate(u8 clock);
@@ -386,211 +308,133 @@ int prcmu_set_clock_rate(u8 clock, unsigned long rate); · 2 unmodified lines
386308
387309 static inline int prcmu_set_ddr_opp(u8 opp)
388310 {
389− if (cpu_is_u5500())
390− return -EINVAL;
391− else
392− return db8500_prcmu_set_ddr_opp(opp);
311+ return db8500_prcmu_set_ddr_opp(opp);
393312 }
394313 static inline int prcmu_get_ddr_opp(void)
395314 {
396− if (cpu_is_u5500())
397− return -EINVAL;
398− else
399− return db8500_prcmu_get_ddr_opp();
315+ return db8500_prcmu_get_ddr_opp();
400316 }
401317
402318 static inline int prcmu_set_arm_opp(u8 opp)
403319 {
404− if (cpu_is_u5500())
405− return -EINVAL;
406− else
407− return db8500_prcmu_set_arm_opp(opp);
320+ return db8500_prcmu_set_arm_opp(opp);
408321 }
409322
410323 static inline int prcmu_get_arm_opp(void)
411324 {
412− if (cpu_is_u5500())
413− return -EINVAL;
414− else
415− return db8500_prcmu_get_arm_opp();
325+ return db8500_prcmu_get_arm_opp();
416326 }
417327
418328 static inline int prcmu_set_ape_opp(u8 opp)
419329 {
420− if (cpu_is_u5500())
421− return -EINVAL;
422− else
423− return db8500_prcmu_set_ape_opp(opp);
330+ return db8500_prcmu_set_ape_opp(opp);
424331 }
425332
426333 static inline int prcmu_get_ape_opp(void)
427334 {
428− if (cpu_is_u5500())
429− return -EINVAL;
430− else
431− return db8500_prcmu_get_ape_opp();
335+ return db8500_prcmu_get_ape_opp();
432336 }
433337
434338 static inline void prcmu_system_reset(u16 reset_code)
435339 {
436− if (cpu_is_u5500())
437− return db5500_prcmu_system_reset(reset_code);
438− else
439− return db8500_prcmu_system_reset(reset_code);
340+ return db8500_prcmu_system_reset(reset_code);
440341 }
441342
442343 static inline u16 prcmu_get_reset_code(void)
443344 {
444− if (cpu_is_u5500())
445− return db5500_prcmu_get_reset_code();
446− else
447− return db8500_prcmu_get_reset_code();
345+ return db8500_prcmu_get_reset_code();
448346 }
449347
450348 void prcmu_ac_wake_req(void);
451349 void prcmu_ac_sleep_req(void);
452350 static inline void prcmu_modem_reset(void)
453351 {
454− if (cpu_is_u5500())
455− return;
456− else
457− return db8500_prcmu_modem_reset();
352+ return db8500_prcmu_modem_reset();
458353 }
459354
460355 static inline bool prcmu_is_ac_wake_requested(void)
461356 {
462− if (cpu_is_u5500())
463− return db5500_prcmu_is_ac_wake_requested();
464− else
465− return db8500_prcmu_is_ac_wake_requested();
357+ return db8500_prcmu_is_ac_wake_requested();
466358 }
467359
468360 static inline int prcmu_set_display_clocks(void)
469361 {
470− if (cpu_is_u5500())
471− return db5500_prcmu_set_display_clocks();
472− else
473− return db8500_prcmu_set_display_clocks();
362+ return db8500_prcmu_set_display_clocks();
474363 }
475364
476365 static inline int prcmu_disable_dsipll(void)
477366 {
478− if (cpu_is_u5500())
479− return db5500_prcmu_disable_dsipll();
480− else
481− return db8500_prcmu_disable_dsipll();
367+ return db8500_prcmu_disable_dsipll();
482368 }
483369
484370 static inline int prcmu_enable_dsipll(void)
485371 {
486− if (cpu_is_u5500())
487− return db5500_prcmu_enable_dsipll();
488− else
489− return db8500_prcmu_enable_dsipll();
372+ return db8500_prcmu_enable_dsipll();
490373 }
491374
492375 static inline int prcmu_config_esram0_deep_sleep(u8 state)
493376 {
494− if (cpu_is_u5500())
495− return -EINVAL;
496− else
497− return db8500_prcmu_config_esram0_deep_sleep(state);
377+ return db8500_prcmu_config_esram0_deep_sleep(state);
498378 }
499379
500380 static inline int prcmu_config_hotdog(u8 threshold)
501381 {
502− if (cpu_is_u5500())
503− return -EINVAL;
504− else
505− return db8500_prcmu_config_hotdog(threshold);
382+ return db8500_prcmu_config_hotdog(threshold);
506383 }
507384
508385 static inline int prcmu_config_hotmon(u8 low, u8 high)
509386 {
510− if (cpu_is_u5500())
511− return -EINVAL;
512− else
513− return db8500_prcmu_config_hotmon(low, high);
387+ return db8500_prcmu_config_hotmon(low, high);
514388 }
515389
516390 static inline int prcmu_start_temp_sense(u16 cycles32k)
517391 {
518− if (cpu_is_u5500())
519− return -EINVAL;
520− else
521− return db8500_prcmu_start_temp_sense(cycles32k);
392+ return db8500_prcmu_start_temp_sense(cycles32k);
522393 }
523394
524395 static inline int prcmu_stop_temp_sense(void)
525396 {
526− if (cpu_is_u5500())
527− return -EINVAL;
528− else
529− return db8500_prcmu_stop_temp_sense();
397+ return db8500_prcmu_stop_temp_sense();
530398 }
531399
532400 static inline u32 prcmu_read(unsigned int reg)
533401 {
534− if (cpu_is_u5500())
535− return -EINVAL;
536− else
537− return db8500_prcmu_read(reg);
402+ return db8500_prcmu_read(reg);
538403 }
539404
540405 static inline void prcmu_write(unsigned int reg, u32 value)
541406 {
542− if (cpu_is_u5500())
543− return;
544− else
545− db8500_prcmu_write(reg, value);
407+ db8500_prcmu_write(reg, value);
546408 }
547409
548410 static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value)
549411 {
550− if (cpu_is_u5500())
551− return;
552− else
553− db8500_prcmu_write_masked(reg, mask, value);
412+ db8500_prcmu_write_masked(reg, mask, value);
554413 }
555414
556415 static inline int prcmu_enable_a9wdog(u8 id)
557416 {
558− if (cpu_is_u5500())
559− return -EINVAL;
560− else
561− return db8500_prcmu_enable_a9wdog(id);
417+ return db8500_prcmu_enable_a9wdog(id);
562418 }
563419
564420 static inline int prcmu_disable_a9wdog(u8 id)
565421 {
566− if (cpu_is_u5500())
567− return -EINVAL;
568− else
569− return db8500_prcmu_disable_a9wdog(id);
422+ return db8500_prcmu_disable_a9wdog(id);
570423 }
571424
572425 static inline int prcmu_kick_a9wdog(u8 id)
573426 {
574− if (cpu_is_u5500())
575− return -EINVAL;
576− else
577− return db8500_prcmu_kick_a9wdog(id);
427+ return db8500_prcmu_kick_a9wdog(id);
578428 }
579429
580430 static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
581431 {
582− if (cpu_is_u5500())
583− return -EINVAL;
584− else
585− return db8500_prcmu_load_a9wdog(id, timeout);
432+ return db8500_prcmu_load_a9wdog(id, timeout);
586433 }
587434
588435 static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
589436 {
590− if (cpu_is_u5500())
591− return -EINVAL;
592− else
593− return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
437+ return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
594438 }
595439 #else
596440
@@ -768,7 +612,7 @@ static inline void prcmu_clear(unsigned int reg, u32 bits) · 171 unmodified lines
768612 prcmu_write_masked(reg, bits, 0);
769613 }
770614
771−#if defined(CONFIG_UX500_SOC_DB8500) || defined(CONFIG_UX500_SOC_DB5500)
615+#if defined(CONFIG_UX500_SOC_DB8500)
772616
773617 /**
774618 * prcmu_enable_spi2 - Enables pin muxing for SPI2 on OtherAlternateC1.
include/video/omap-panel-nokia-dsi.h+3−0
@@ -11,6 +11,7 @@ struct omap_dss_device; · 10 unmodified lines
1111 * @esd_interval: interval of ESD checks, 0 = disabled (ms)
1212 * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
1313 * @use_dsi_backlight: true if panel uses DSI command to control backlight
14+ * @pin_config: DSI pin configuration
1415 */
1516 struct nokia_dsi_panel_data {
1617 const char *name;
@@ -24,6 +25,8 @@ struct nokia_dsi_panel_data { · 7 unmodified lines
2425 unsigned ulps_timeout;
2526
2627 bool use_dsi_backlight;
28+
29+ struct omap_dsi_pin_config pin_config;
2730 };
2831
2932 #endif /* __OMAP_NOKIA_DSI_PANEL_H */
include/video/omap-panel-tfp410.hrenamed from include/video/omap-panel-dvi.h+8−10
@@ -1,5 +1,5 @@
11 /*
2− * Header for DVI output driver
2+ * Header for TFP410 chip driver
33 *
44 * Copyright (C) 2011 Texas Instruments Inc
55 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
@@ -17,21 +17,19 @@ · 11 unmodified lines
1717 * this program. If not, see <http://www.gnu.org/licenses/>.
1818 */
1919
20−#ifndef __OMAP_PANEL_DVI_H
21−#define __OMAP_PANEL_DVI_H
20+#ifndef __OMAP_PANEL_TFP410_H
21+#define __OMAP_PANEL_TFP410_H
2222
2323 struct omap_dss_device;
2424
2525 /**
26− * struct panel_dvi_platform_data - panel driver configuration data
27− * @platform_enable: platform specific panel enable function
28− * @platform_disable: platform specific panel disable function
26+ * struct tfp410_platform_data - panel driver configuration data
2927 * @i2c_bus_num: i2c bus id for the panel
28+ * @power_down_gpio: gpio number for PD pin (or -1 if not available)
3029 */
31−struct panel_dvi_platform_data {
32− int (*platform_enable)(struct omap_dss_device *dssdev);
33− void (*platform_disable)(struct omap_dss_device *dssdev);
30+struct tfp410_platform_data {
3431 u16 i2c_bus_num;
32+ int power_down_gpio;
3533 };
3634
37−#endif /* __OMAP_PANEL_DVI_H */
35+#endif /* __OMAP_PANEL_TFP410_H */
include/video/omapdss.h+17−11
@@ -468,6 +468,21 @@ struct omap_overlay_manager { · 467 unmodified lines
468468 int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
469469 };
470470
471+/* 22 pins means 1 clk lane and 10 data lanes */
472+#define OMAP_DSS_MAX_DSI_PINS 22
473+
474+struct omap_dsi_pin_config {
475+ int num_pins;
476+ /*
477+ * pin numbers in the following order:
478+ * clk+, clk-
479+ * data1+, data1-
480+ * data2+, data2-
481+ * ...
482+ */
483+ int pins[OMAP_DSS_MAX_DSI_PINS];
484+};
485+
471486 struct omap_dss_device {
472487 struct device dev;
473488
@@ -490,17 +505,6 @@ struct omap_dss_device { · 16 unmodified lines
490505 } sdi;
491506
492507 struct {
493− u8 clk_lane;
494− u8 clk_pol;
495− u8 data1_lane;
496− u8 data1_pol;
497− u8 data2_lane;
498− u8 data2_pol;
499− u8 data3_lane;
500− u8 data3_pol;
501− u8 data4_lane;
502− u8 data4_pol;
503−
504508 int module;
505509
506510 bool ext_te;
@@ -687,6 +691,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel, · 180 unmodified lines
687691 int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
688692 int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
689693 void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
694+int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
695+ const struct omap_dsi_pin_config *pin_cfg);
690696
691697 int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
692698 void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t