M7350v3_en_gpl
This commit is contained in:
@ -549,14 +549,7 @@ struct nand_chip {
|
||||
/*
|
||||
* NAND Flash Manufacturer ID Codes
|
||||
*/
|
||||
#if 0
|
||||
#ifdef CONFIG_FLASH_TYPE_ETRON
|
||||
#define NAND_MFR_ETRON 0x98
|
||||
#else
|
||||
#define NAND_MFR_TOSHIBA 0x98
|
||||
#endif
|
||||
#endif
|
||||
#define NAND_MFR_ETRON 0x98
|
||||
#define NAND_MFR_SAMSUNG 0xec
|
||||
#define NAND_MFR_FUJITSU 0x04
|
||||
#define NAND_MFR_NATIONAL 0x8f
|
||||
@ -566,10 +559,6 @@ struct nand_chip {
|
||||
#define NAND_MFR_MICRON 0x2c
|
||||
#define NAND_MFR_AMD 0x01
|
||||
#define NAND_MFR_MACRONIX 0xc2
|
||||
#define NAND_MFR_ESMT 0xc8
|
||||
|
||||
#define ETRON_2G1G_MANID 0x98
|
||||
#define ETRON_2G1G_DEVID 0xaa
|
||||
|
||||
/**
|
||||
* struct nand_flash_dev - NAND Flash Device ID Structure
|
||||
|
5
kernel/include/linux/power_supply.h
Executable file → Normal file
5
kernel/include/linux/power_supply.h
Executable file → Normal file
@ -55,7 +55,6 @@ enum {
|
||||
POWER_SUPPLY_HEALTH_OVERVOLTAGE,
|
||||
POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
|
||||
POWER_SUPPLY_HEALTH_COLD,
|
||||
POWER_SUPPLY_HEALTH_DEAD_OVERCOLD,
|
||||
};
|
||||
|
||||
enum {
|
||||
@ -129,10 +128,6 @@ enum power_supply_property {
|
||||
POWER_SUPPLY_PROP_SCOPE,
|
||||
POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,
|
||||
POWER_SUPPLY_PROP_RESISTANCE,
|
||||
POWER_SUPPLY_PROP_CHG_OK, /* [linyunfeng] Charge ok gpio level */
|
||||
#ifdef CONFIG_POWER_BANK_DETECT_SUPPORT
|
||||
POWER_SUPPLY_PROP_VOLTAGE_DROP,
|
||||
#endif
|
||||
/* Properties of type `const char *' */
|
||||
POWER_SUPPLY_PROP_MODEL_NAME,
|
||||
POWER_SUPPLY_PROP_MANUFACTURER,
|
||||
|
@ -95,19 +95,8 @@ extern int printk_needs_cpu(int cpu);
|
||||
extern void printk_tick(void);
|
||||
|
||||
#ifdef CONFIG_PRINTK
|
||||
asmlinkage __printf(5, 0)
|
||||
int vprintk_emit(int facility, int level,
|
||||
const char *dict, size_t dictlen,
|
||||
const char *fmt, va_list args);
|
||||
|
||||
asmlinkage __printf(1, 0)
|
||||
int vprintk(const char *fmt, va_list args);
|
||||
|
||||
asmlinkage __printf(5, 6) __cold
|
||||
asmlinkage int printk_emit(int facility, int level,
|
||||
const char *dict, size_t dictlen,
|
||||
const char *fmt, ...);
|
||||
|
||||
asmlinkage __printf(1, 2) __cold
|
||||
int printk(const char *fmt, ...);
|
||||
|
||||
@ -300,8 +289,6 @@ extern void dump_stack(void) __cold;
|
||||
no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#endif
|
||||
|
||||
extern const struct file_operations kmsg_fops;
|
||||
|
||||
enum {
|
||||
DUMP_PREFIX_NONE,
|
||||
DUMP_PREFIX_ADDRESS,
|
||||
@ -329,12 +316,4 @@ static inline void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_OOPS_LOG_BUFFER)
|
||||
extern void oops_printk_start(void);
|
||||
#else
|
||||
static inline void oops_printk_start(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
10
kernel/include/linux/usb/msm_hsusb.h
Executable file → Normal file
10
kernel/include/linux/usb/msm_hsusb.h
Executable file → Normal file
@ -2,7 +2,7 @@
|
||||
*
|
||||
* Copyright (C) 2008 Google, Inc.
|
||||
* Author: Brian Swetland <swetland@google.com>
|
||||
* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This software is licensed under the terms of the GNU General Public
|
||||
* License version 2, as published by the Free Software Foundation, and
|
||||
@ -87,11 +87,11 @@ enum msm_usb_phy_type {
|
||||
SNPS_28NM_INTEGRATED_PHY,
|
||||
};
|
||||
|
||||
#define IDEV_CHG_MAX 1000
|
||||
#define IDEV_CHG_MAX 1500
|
||||
#define IDEV_CHG_MIN 500
|
||||
#define IUNIT 100
|
||||
|
||||
#define IDEV_ACA_CHG_MAX 1000
|
||||
#define IDEV_ACA_CHG_MAX 1500
|
||||
#define IDEV_ACA_CHG_LIMIT 500
|
||||
|
||||
/**
|
||||
@ -531,8 +531,6 @@ void msm_bam_set_hsic_host_dev(struct device *dev);
|
||||
void msm_bam_wait_for_hsic_prod_granted(void);
|
||||
bool msm_bam_hsic_lpm_ok(void);
|
||||
void msm_bam_hsic_notify_on_resume(void);
|
||||
bool msm_bam_hsic_host_pipe_empty(void);
|
||||
void msm_bam_hsic_reset(void);
|
||||
#else
|
||||
static inline bool msm_bam_lpm_ok(void) { return true; }
|
||||
static inline void msm_bam_notify_lpm_resume(void) {}
|
||||
@ -540,8 +538,6 @@ static inline void msm_bam_set_hsic_host_dev(struct device *dev) {}
|
||||
static inline void msm_bam_wait_for_hsic_prod_granted(void) {}
|
||||
static inline bool msm_bam_hsic_lpm_ok(void) { return true; }
|
||||
static inline void msm_bam_hsic_notify_on_resume(void) {}
|
||||
static inline bool msm_bam_hsic_host_pipe_empty(void) { return true; }
|
||||
static inline void msm_bam_hsic_reset(void) {}
|
||||
#endif
|
||||
#ifdef CONFIG_USB_CI13XXX_MSM
|
||||
void msm_hw_bam_disable(bool bam_disable);
|
||||
|
Reference in New Issue
Block a user