History

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

Pull ARM SoC updates from Arnd Bergmann: "These are mostly minor cleanups and bugfixes that address harmless problems. The largest branch is a conversion of the omap platform to use GPIO descriptors throughout the tree, for any devices that are not fully converted to devicetree. The Samsung Exynos platform gains back support for the Exynos4212 chip that was previously unused and removed but is now used for the Samsung Galaxy Tab3" * tag 'soc-arm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits) ARM: omap2: Fix copy/paste bug MAINTAINERS: Replace my email address Input: ads7846 - fix pointer cast warning Input: ads7846 - Fix usage of match data ARM: omap2: Fix checkpatch issues arm: omap1: replace printk() with pr_err macro ARM: omap: Fix checkpatch issues ARM: s3c: Switch i2c drivers back to use .probe() ARM: versatile: mark mmc_status() static ARM: spear: include "pl080.h" for pl080_get_signal() prototype ARM: sa1100: address missing prototype warnings ARM: pxa: fix missing-prototypes warnings ARM: orion5x: fix d2net gpio initialization ARM: omap2: fix missing tick_broadcast() prototype ARM: omap1: add missing include ARM: lpc32xx: add missing include ARM: imx: add missing include ARM: highbank: add missing include ARM: ep93xx: fix missing-prototype warnings ARM: davinci: fix davinci_cpufreq_init() declaration ...

Linus Torvalds committed 3 years ago

Commit bf1fa6f2 parents 0873694 c1d57ee50 files · +135 −99Browse files

Showing the changes to include/linux/platform_data (3 of 50 files). Show all

Unified · Split

3 files
  1. include/linux/platform_data/asoc-pxa.h +1 −0
  2. include/linux/platform_data/davinci-cpufreq.h +6 −0
  3. include/linux/platform_data/pxa2xx_udc.h +6 −0
include/linux/platform_data/asoc-pxa.h+1−0
@@ -27,5 +27,6 @@ typedef struct { · 26 unmodified lines
27} pxa2xx_audio_ops_t;27} pxa2xx_audio_ops_t;
28 28
29extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);29extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);
30extern void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio);
30 31
31#endif32#endif
include/linux/platform_data/davinci-cpufreq.h+6−0
@@ -16,4 +16,10 @@ struct davinci_cpufreq_config { · 15 unmodified lines
16 int (*init)(void);16 int (*init)(void);
17};17};
18 18
19#ifdef CONFIG_CPU_FREQ
20int davinci_cpufreq_init(void);
21#else
22static inline int davinci_cpufreq_init(void) { return 0; }
23#endif
24
19#endif /* _MACH_DAVINCI_CPUFREQ_H */25#endif /* _MACH_DAVINCI_CPUFREQ_H */
include/linux/platform_data/pxa2xx_udc.h+6−0
@@ -25,4 +25,10 @@ struct pxa2xx_udc_mach_info { · 24 unmodified lines
25 int gpio_pullup; /* high == pullup activated */25 int gpio_pullup; /* high == pullup activated */
26};26};
27 27
28#ifdef CONFIG_PXA27x
29extern void pxa27x_clear_otgph(void);
30#else
31#define pxa27x_clear_otgph() do {} while (0)
32#endif
33
28#endif34#endif

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