History

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

Pull ARM SoC platform updates from Olof Johansson: "Improved and new platform support for various SoCs: New SoC support: - Broadcom BCM23550 - Freescale i.MX7Solo - Qualcomm MDM9615 - Renesas r8a7792 Improvements: - convert clps711x to multiplatform - debug uart improvements for Atmel platforms - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram - OMAP tweaks and improvements to hwmod - OMAP support for kexec on SMP" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits) ARM: davinci: fix build break because of undeclared dm365_evm_snd_data ARM: s3c64xx: smartq: Avoid sparse warnings ARM: sti: Implement dummy L2 cache's write_sec ARM: STi: Update machine _namestr to be more generic. arm: meson: explicitly select clk drivers ARM: tango: add Suspend-to-RAM support ARM: hisi: consolidate the hisilicon machine entries ARM: tango: fix CONFIG_HOTPLUG_CPU=n build MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry MAINTAINERS: Update BCM63XX entry MAINTAINERS: Add NS2 entry MAINTAINERS: Fix nsp false-positives MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs ARM: clps711x: Switch to MULTIPLATFORM ARM: clps711x: Remove boards support ARM: clps711x: Add basic DT support ARM: clps711x: Reduce static map size ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu ARM: oxnas: Change OX810SE default driver config ...

Linus Torvalds committed 10 years ago

Commit fbae5cb2 parents 6f888fe 4756f88140 files · +1267 −1149Browse files

Showing the changes to include/linux/platform_data (2 of 140 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/asoc-ti-mcbsp.h +3 −1
  2. include/linux/platform_data/omapdss.h +42 −0
include/linux/platform_data/asoc-ti-mcbsp.h+3−1
@@ -44,7 +44,7 @@ struct omap_mcbsp_platform_data { · 43 unmodified lines
44 /* McBSP platform and instance specific features */44 /* McBSP platform and instance specific features */
45 bool has_wakeup; /* Wakeup capability */45 bool has_wakeup; /* Wakeup capability */
46 bool has_ccr; /* Transceiver has configuration control registers */46 bool has_ccr; /* Transceiver has configuration control registers */
47 int (*enable_st_clock)(unsigned int, bool);47 int (*force_ick_on)(struct clk *clk, bool force_on);
48};48};
49 49
50/**50/**
@@ -55,4 +55,6 @@ struct omap_mcbsp_dev_attr { · 4 unmodified lines
55 const char *sidetone;55 const char *sidetone;
56};56};
57 57
58void omap3_mcbsp_init_pdata_callback(struct omap_mcbsp_platform_data *pdata);
59
58#endif60#endif
include/linux/platform_data/omapdss.h+42−0
@@ -0,0 +1,42 @@
1/*
2 * Copyright (C) 2016 Texas Instruments, Inc.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version.
8 */
9
10#ifndef __OMAPDSS_PDATA_H
11#define __OMAPDSS_PDATA_H
12
13enum omapdss_version {
14 OMAPDSS_VER_UNKNOWN = 0,
15 OMAPDSS_VER_OMAP24xx,
16 OMAPDSS_VER_OMAP34xx_ES1, /* OMAP3430 ES1.0, 2.0 */
17 OMAPDSS_VER_OMAP34xx_ES3, /* OMAP3430 ES3.0+ */
18 OMAPDSS_VER_OMAP3630,
19 OMAPDSS_VER_AM35xx,
20 OMAPDSS_VER_OMAP4430_ES1, /* OMAP4430 ES1.0 */
21 OMAPDSS_VER_OMAP4430_ES2, /* OMAP4430 ES2.0, 2.1, 2.2 */
22 OMAPDSS_VER_OMAP4, /* All other OMAP4s */
23 OMAPDSS_VER_OMAP5,
24 OMAPDSS_VER_AM43xx,
25 OMAPDSS_VER_DRA7xx,
26};
27
28struct omap_dss_device;
29
30/* Board specific data */
31struct omap_dss_board_info {
32 int num_devices;
33 struct omap_dss_device **devices;
34 struct omap_dss_device *default_device;
35 const char *default_display_name;
36 int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);
37 void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);
38 int (*set_min_bus_tput)(struct device *dev, unsigned long r);
39 enum omapdss_version version;
40};
41
42#endif /* __OMAPDSS_PDATA_H */

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