Unverified Commit be5ea8f3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.12/drivers-signed' of... 

Merge tag 'omap-for-v6.12/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/drivers

ARM: OMAP2+: misc driver updates for v6.12

* tag 'omap-for-v6.12/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: OMAP2+: Remove obsoleted declaration for gpmc_onenand_init
  bus: ti-sysc: Remove excess struct member 'disable_on_idle' description
  bus: ti-sysc: Use of_property_present()

Link: https://lore.kernel.org/r/7hcyljarit.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 742d9808 9aee8262

drivers/bus/ti-sysc.c

+2 −5
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static const char * const clock_names[SYSC_MAX_CLOCKS] = { 
 * @enabled: sysc runtime enabled status

 * @needs_resume: runtime resume needed on resume from suspend

 * @child_needs_resume: runtime resume needed for child on resume from suspend

 * @disable_on_idle: status flag used for disabling modules with resets

 * @idle_work: work structure used to perform delayed idle on a module

 * @pre_reset_quirk: module specific pre-reset quirk

 * @post_reset_quirk: module specific post-reset quirk
@@ -2569,14 +2568,12 @@ static const struct sysc_dts_quirk sysc_dts_quirks[] = { 
static void sysc_parse_dts_quirks(struct sysc *ddata, struct device_node *np,

				  bool is_child)

{

	const struct property *prop;

	int i, len;

	int i;



	for (i = 0; i < ARRAY_SIZE(sysc_dts_quirks); i++) {

		const char *name = sysc_dts_quirks[i].name;



		prop = of_get_property(np, name, &len);

		if (!prop)

		if (!of_property_present(np, name))

			continue;



		ddata->cfg.quirks |= sysc_dts_quirks[i].mask;

include/linux/omap-gpmc.h

+0 −10
Original line number Diff line number Diff line
@@ -84,13 +84,3 @@ extern void gpmc_read_settings_dt(struct device_node *np, 
struct gpmc_timings;

struct omap_nand_platform_data;

struct omap_onenand_platform_data;
 


#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

extern int gpmc_onenand_init(struct omap_onenand_platform_data *d);

#else

#define board_onenand_data	NULL

static inline int gpmc_onenand_init(struct omap_onenand_platform_data *d)

{

	return 0;

}

#endif