android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Reset files to android12-5.10-keystone-qcom-release

Browse Source 
Reset drivers/clocksource/timer-sprd.c and drivers/scsi/ufs/ufshcd.h to
commit 5cdc423319 ("Snap for 7633090 from
08a9789fef to
android12-5.10-keystone-qcom-release").

Change-Id: I6e817ec5e8aa00cedfa6e878196951725867252b
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman 2021-08-12 08:43:58 -07:00 committed by Gerrit - the friendly Code Review server
parent 5972e8baf2
commit d40f79b2d5
2 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/clocksource/timer-sprd.c
View File

@ -5,8 +5,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include "timer-of.h" #include "timer-of.h"
@ -143,7 +141,7 @@ static struct timer_of to = {
}, },
}; };
static int sprd_timer_init(struct device_node *np) static int __init sprd_timer_init(struct device_node *np)
{ {
int ret; int ret;
@ -192,7 +190,7 @@ static struct clocksource suspend_clocksource = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP, .flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP,
}; };
static int sprd_suspend_timer_init(struct device_node *np) static int __init sprd_suspend_timer_init(struct device_node *np)
{ {
int ret; int ret;
@ -206,37 +204,6 @@ static int sprd_suspend_timer_init(struct device_node *np)
return 0; return 0;
} }
#ifdef MODULE
static int sprd_timer_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
if (of_property_read_bool(np, "interrupts"))
return sprd_timer_init(np);
return sprd_suspend_timer_init(np);
}
static const struct of_device_id sprd_timer_match_table[] = {
{ .compatible = "sprd,sc9860-suspend-timer" },
{ .compatible = "sprd,sc9860-timer" },
{ }
};
MODULE_DEVICE_TABLE(of, sprd_timer_match_table);
static struct platform_driver sprd_timer_driver = {
.probe = sprd_timer_probe,
.driver = {
.name = "sprd-timer",
.of_match_table = sprd_timer_match_table,
},
};
module_platform_driver(sprd_timer_driver);
#else
TIMER_OF_DECLARE(sc9860_timer, "sprd,sc9860-timer", sprd_timer_init); TIMER_OF_DECLARE(sc9860_timer, "sprd,sc9860-timer", sprd_timer_init);
TIMER_OF_DECLARE(sc9860_persistent_timer, "sprd,sc9860-suspend-timer", TIMER_OF_DECLARE(sc9860_persistent_timer, "sprd,sc9860-suspend-timer",
sprd_suspend_timer_init); sprd_suspend_timer_init);
#endif
MODULE_LICENSE("GPL v2");

9
drivers/scsi/ufs/ufshcd.h
View File

@ -2,7 +2,7 @@
/* /*
* Universal Flash Storage Host controller driver * Universal Flash Storage Host controller driver
* Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (C) 2011-2013 Samsung India Software Operations
* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
* *
* Authors: * Authors:
* Santosh Yaraganavi <santosh.sy@samsung.com> * Santosh Yaraganavi <santosh.sy@samsung.com>
@ -828,7 +828,6 @@ struct ufs_hba {
int nutrs; int nutrs;
int nutmrs; int nutmrs;
u32 ufs_version; u32 ufs_version;
const struct ufs_hba_variant_ops *vops; const struct ufs_hba_variant_ops *vops;
struct ufs_hba_variant_params *vps; struct ufs_hba_variant_params *vps;
void *priv; void *priv;
@ -1087,6 +1086,7 @@ extern int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
u32 *mib_val, u8 peer); u32 *mib_val, u8 peer);
extern int ufshcd_config_pwr_mode(struct ufs_hba *hba, extern int ufshcd_config_pwr_mode(struct ufs_hba *hba,
struct ufs_pa_layer_attr *desired_pwr_mode); struct ufs_pa_layer_attr *desired_pwr_mode);
/* UIC command interfaces for DME primitives */ /* UIC command interfaces for DME primitives */
#define DME_LOCAL 0 #define DME_LOCAL 0
#define DME_PEER 1 #define DME_PEER 1
@ -1174,6 +1174,8 @@ void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups); void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups);
#define SD_ASCII_STD true #define SD_ASCII_STD true
#define SD_RAW false #define SD_RAW false
int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
u8 **buf, bool ascii);
int ufshcd_hold(struct ufs_hba *hba, bool async); int ufshcd_hold(struct ufs_hba *hba, bool async);
void ufshcd_release(struct ufs_hba *hba); void ufshcd_release(struct ufs_hba *hba);
@ -1392,11 +1394,8 @@ static inline u8 ufshcd_scsi_to_upiu_lun(unsigned int scsi_lun)
return scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID; return scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID;
} }
int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len, int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,
const char *prefix); const char *prefix);
int ufshcd_uic_hibern8_enter(struct ufs_hba *hba); int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
int ufshcd_uic_hibern8_exit(struct ufs_hba *hba); int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
u8 **buf, bool ascii);
#endif /* End of Header */ #endif /* End of Header */