Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmbY9nMACgkQWTcYmtP7
 xmV87RAAmvj2+vIABiN4jvKXIPSjPO0OkqrOsCSlKS0+ZMtZSqZihA2RXAtn3609
 PIKDv1iunMDi3PJ6ehxLR2x3XgfwBoW53A0VN+3B0NvLi3OLzJ6pIu3zfdz1rlsY
 zvwm2kB4HDNVTnLHqD9Pc8yT4ynV8WdoLJwhG/PJniNIFg9zznpN+4POBKzZs2El
 3OXVJxPnVKk1MqSWHh51Xd09J6ccRS77R4uX8LGxmIefIq/ZvHllC5G2vgl+Qk7F
 4hz9r7/IgK+Cn75BxqK1/UM487i3Twbjgov+RwX5AuSdrTK0wuqb1B+pj63GMsOP
 Q32cDwXm/yIlduBuTxfm7BHkO2y4tL/DmuS8Cvk77X5QnUHuR9pB8xL7z7eXpVdq
 3yai9vlcfWaT5Oyuslbxr7f4QOhKLuWt0E75FIJweRhZJN7fyHMIQyVDHRa7hI/3
 NMI91jgXC2Oy+j0GAPViOMiHD+6JI667lPWyn1xWVKsjM7uw7pu7QhYugc7vHvaY
 D/HyZP/WvW1z7fZBP4pleIw3Ds2XaYSgJEmYP9OYhBRHjY/p55sSvYIeYaThNGJ/
 /wpu/tFLluRK1GZtr7qZ4nl2Lw9u/VLumhvjAzDCFmHb0uWMTYPqNNcREtcSzfAo
 RiJcCRftoTnCDezzAajan2+3yMF2+2wHurGD8z+FGlkxYmSJuyk=
 =41Q6
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbZvBoACgkQYKtH/8kJ
 UieDvRAAqweRsOocf8ZZfXYX/bVadR/HnDG/CRAOVDOTqA12+G0k/4DEWo9KK0y+
 7w+wQtfeZ1mR67bGnwvNkJFuIY6teIhI6ms6jp77qS0aw6x9MwI4dDVU5V3d5Ipg
 z7d7YintxRg21FRaRy3aSUUs4K2RL7KjVdFUdoTEMkf/eDJDJeT59O5iHlXgm+Je
 DiVlIlVFYKp0SWmI3yswj7mbiGa8CdSDLJs8vpsay/ldsTPgGOZ7nwoe0LuA7x8G
 qtYK4Uj8c5En/PFv0QH5V0eICejg4nNNpr5BylYcJcO5YseEj/r+lAaojvZDr9tw
 2T4+wOqgCEe6ALoKaWfKfPANBvMAC17otRccbQTgZbFRHpPcSSYKt2kNMebQxLPJ
 xhmz7eQp22PZF/ludIGohJwvvu0wsO0v+QT2B9Al8nDkdNDOvGtPYfuixplnbnAQ
 T8A327jmTsDLLusULIVxT2vZADOWOMdo9g5kJrSqtKSphd8og5nf7mCR1hY5eGdS
 3PxzBAQwowMINDoga3WhAUr3loQ1Wl2wUyuFwdOVK/rpumGKyKzoYmCyCSXxBOwb
 2PsDXiECVZA9rTf6Pl65pv8uEPdaK7ZxRq5pqkRogaTKvYshdTMbcMneYC5JvGCC
 a9Xo2GITdi/ORHQ0DdOetlD4e4FGlbvf/KOf4i0YW/uX9LyttNs=
 =BgRh
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2024-09-05 14:11:37 +00:00
commit be5ea8f3e3
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/bus/ti-sysc.c
View File

@ -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;

10
include/linux/omap-gpmc.h
View File

@ -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