History

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

Pull ARM SoC updates from Arnd Bergmann: "The SoC specific code updates for 6.13 are fairly minimal. One Broadcom SoC model gains automatic configuration for the debug uarg as we have on many other machines, the remaining changes are trivial cleanups" * tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: imx: Switch to new sys-off handler API ARM: bcm: brcmstb: Drop custom init_irq callback ARM: bcm: Support BCMBCA debug UART ARM: zynq: Remove unused zynq_slcr_init() declaration ASoC: samsung: Remove obsoleted declaration for s3c64xx_ac97_setup_gpio ARM: samsung: Remove obsoleted declaration for s3c_hwmon_set_platdata

Linus Torvalds committed 1 year ago

Commit 43fb83c2 parents 06e47dc 9c6cb038 files · +43 −26Browse files

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

Unified · Split

2 files
  1. include/linux/platform_data/asoc-s3c.h +0 −2
  2. include/linux/platform_data/hwmon-s3c.h +0 −10
include/linux/platform_data/asoc-s3c.h+0−2
@@ -13,8 +13,6 @@ · 12 unmodified lines
13 13
14#include <linux/dmaengine.h>14#include <linux/dmaengine.h>
15 15
16extern void s3c64xx_ac97_setup_gpio(int);
17
18struct samsung_i2s_type {16struct samsung_i2s_type {
19/* If the Primary DAI has 5.1 Channels */17/* If the Primary DAI has 5.1 Channels */
20#define QUIRK_PRI_6CHAN (1 << 0)18#define QUIRK_PRI_6CHAN (1 << 0)
include/linux/platform_data/hwmon-s3c.h+0−10
@@ -33,14 +33,4 @@ struct s3c_hwmon_pdata { · 32 unmodified lines
33 struct s3c_hwmon_chcfg *in[8];33 struct s3c_hwmon_chcfg *in[8];
34};34};
35 35
36/**
37 * s3c_hwmon_set_platdata - Set platform data for S3C HWMON device
38 * @pd: Platform data to register to device.
39 *
40 * Register the given platform data for use with the S3C HWMON device.
41 * The call will copy the platform data, so the board definitions can
42 * make the structure itself __initdata.
43 */
44extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd);
45
46#endif /* __HWMON_S3C_H__ */36#endif /* __HWMON_S3C_H__ */