[Feature][T106_eSDK]update from T106-V2.01.01.02P56U09.AP.17.09_CAP.17.09.01 to T106-M42-PLXXXX-P56U11.AP.19.00_CAP.19.00.01 -- code
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I5eb7f586f78a987785b0f9885f1300c42bfd6819
diff --git a/upstream/linux-5.10/include/linux/mfd/zx234290.h b/upstream/linux-5.10/include/linux/mfd/zx234290.h
index ea89815..40e71bf 100755
--- a/upstream/linux-5.10/include/linux/mfd/zx234290.h
+++ b/upstream/linux-5.10/include/linux/mfd/zx234290.h
@@ -1009,24 +1009,6 @@
SINK_CURRENT_MAX
}T_ZDrvZx234297_SINK_CURRENT;
-typedef enum _T_ZDrvZx234290_ResetType
-{
-#if 0
- ZX234290_USER_RST_UNDEFINE = 0,
- ZX234290_USER_RST_TO_NORMAL = 1,
- ZX234290_USER_RST_TO_CHARGER = 2,
- ZX234290_USER_RST_TO_ALARM = 3,
-#else
- ZX234290_USER_RST_UNDEFINE = 3,
- ZX234290_USER_RST_TO_NORMAL = 0,
- ZX234290_USER_RST_TO_CHARGER = 1,
- ZX234290_USER_RST_TO_ALARM = 2,
-#endif
- ZX234290_USER_RST_TO_EXCEPT = 4,
-
- ZX234290_USER_RST_MAX
-}T_ZDrvZx234290_ResetType;
-
int zx234290_get_chip_version(void);
int zx234290_irq_init(struct zx234290 *zx234290);
diff --git a/upstream/linux-5.10/include/linux/mmc/mmc_func.h b/upstream/linux-5.10/include/linux/mmc/mmc_func.h
index b2636ab..911c010 100755
--- a/upstream/linux-5.10/include/linux/mmc/mmc_func.h
+++ b/upstream/linux-5.10/include/linux/mmc/mmc_func.h
@@ -23,7 +23,7 @@
* data_size: the size of data you want to write .defined by byte
* src_buf: data buffer where log or file stored;
*/
-int mmc_bwrite(u32 start_addr, u32 data_size, void *src_buf);
+int mmc_bwrite(u64 start_addr, u32 data_size, void *src_buf);
/*
* start_addr: the address is the emmc address you want to write,and it size is
@@ -32,6 +32,6 @@
* src_buf: data buffer where log or file will store;
*/
-int mmc_bread(u32 start_addr, u32 data_size, void *dst);
+int mmc_bread(u64 start_addr, u32 data_size, void *dst);
#endif /* LINUX_MMC_MMC_FUNC_H */