Skip to content

Commit be5ea8f

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents 742d980 + 9aee826 commit be5ea8f

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

drivers/bus/ti-sysc.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ static const char * const clock_names[SYSC_MAX_CLOCKS] = {
126126
* @enabled: sysc runtime enabled status
127127
* @needs_resume: runtime resume needed on resume from suspend
128128
* @child_needs_resume: runtime resume needed for child on resume from suspend
129-
* @disable_on_idle: status flag used for disabling modules with resets
130129
* @idle_work: work structure used to perform delayed idle on a module
131130
* @pre_reset_quirk: module specific pre-reset quirk
132131
* @post_reset_quirk: module specific post-reset quirk
@@ -2569,14 +2568,12 @@ static const struct sysc_dts_quirk sysc_dts_quirks[] = {
25692568
static void sysc_parse_dts_quirks(struct sysc *ddata, struct device_node *np,
25702569
bool is_child)
25712570
{
2572-
const struct property *prop;
2573-
int i, len;
2571+
int i;
25742572

25752573
for (i = 0; i < ARRAY_SIZE(sysc_dts_quirks); i++) {
25762574
const char *name = sysc_dts_quirks[i].name;
25772575

2578-
prop = of_get_property(np, name, &len);
2579-
if (!prop)
2576+
if (!of_property_present(np, name))
25802577
continue;
25812578

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

include/linux/omap-gpmc.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,3 @@ extern void gpmc_read_settings_dt(struct device_node *np,
8484
struct gpmc_timings;
8585
struct omap_nand_platform_data;
8686
struct omap_onenand_platform_data;
87-
88-
#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
89-
extern int gpmc_onenand_init(struct omap_onenand_platform_data *d);
90-
#else
91-
#define board_onenand_data NULL
92-
static inline int gpmc_onenand_init(struct omap_onenand_platform_data *d)
93-
{
94-
return 0;
95-
}
96-
#endif

0 commit comments

Comments
 (0)