Merge tag 'staging-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO driver updates from Greg KH:
"Here is the big staging and IIO driver pull request for 4.20-rc1.
There are lots of things here, we ended up adding more lines than
removing, thanks to a large influx of Comedi National Instrument
device support. Someday soon we need to get comedi out of staging...
Other than the comedi drivers, the "big" things here are:
- new iio drivers
- delete dgnc driver (no one used it and no one had the hardware
anymore)
- vbox driver updates and fixes
- erofs fixes
- tons and tons of tiny checkpatch fixes for almost all staging
drivers
All of these have been in linux-next, with the last few happening a
bit "late" due to them getting stuck on my laptop during travel to the
Mantainers summit"
* tag 'staging-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (690 commits)
staging: gasket: Fix sparse "incorrect type in assignment" warnings.
staging: gasket: remove debug logs for callback invocation
staging: gasket: remove debug logs in page table mapping calls
staging: rtl8188eu: core: Use sizeof(*p) instead of sizeof(struct P) for memory allocation
staging: ks7010: Remove extra blank line
staging: gasket: Remove extra blank line
staging: media: davinci_vpfe: Fix spelling mistake in enum
staging: speakup: Add a pair of braces
staging: wlan-ng: Replace long int with long
staging: MAINTAINERS: remove obsolete IPX staging directory
staging: MAINTAINERS: remove NCP filesystem entry
staging: rtl8188eu: cleanup comparsions to false
staging: gasket: Update device virtual address comment
staging: gasket: sysfs: fix attribute release comment
staging: gasket: apex: fix sysfs_show
staging: gasket: page_table: simplify gasket_components_to_dev_address
staging: gasket: page_table: fix comment in components_to_dev_address
staging: gasket: page table: fixup error path allocating coherent mem
staging: gasket: page_table: rearrange gasket_page_table_entry
staging: gasket: page_table: remove unnecessary PTE status set to free
...
This commit is contained in:
Linus Torvalds
@@ -1,14 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
* only version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* Copyright (c) 2012-2014,2018 The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _DT_BINDINGS_QCOM_SPMI_VADC_H
|
||||
@@ -116,4 +108,117 @@
|
||||
#define VADC_LR_MUX10_PU1_PU2_AMUX_USB_ID 0xf9
|
||||
#define VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM 0xfc
|
||||
|
||||
/* ADC channels for SPMI PMIC5 */
|
||||
|
||||
#define ADC5_REF_GND 0x00
|
||||
#define ADC5_1P25VREF 0x01
|
||||
#define ADC5_VREF_VADC 0x02
|
||||
#define ADC5_VREF_VADC5_DIV_3 0x82
|
||||
#define ADC5_VPH_PWR 0x83
|
||||
#define ADC5_VBAT_SNS 0x84
|
||||
#define ADC5_VCOIN 0x85
|
||||
#define ADC5_DIE_TEMP 0x06
|
||||
#define ADC5_USB_IN_I 0x07
|
||||
#define ADC5_USB_IN_V_16 0x08
|
||||
#define ADC5_CHG_TEMP 0x09
|
||||
#define ADC5_BAT_THERM 0x0a
|
||||
#define ADC5_BAT_ID 0x0b
|
||||
#define ADC5_XO_THERM 0x0c
|
||||
#define ADC5_AMUX_THM1 0x0d
|
||||
#define ADC5_AMUX_THM2 0x0e
|
||||
#define ADC5_AMUX_THM3 0x0f
|
||||
#define ADC5_AMUX_THM4 0x10
|
||||
#define ADC5_AMUX_THM5 0x11
|
||||
#define ADC5_GPIO1 0x12
|
||||
#define ADC5_GPIO2 0x13
|
||||
#define ADC5_GPIO3 0x14
|
||||
#define ADC5_GPIO4 0x15
|
||||
#define ADC5_GPIO5 0x16
|
||||
#define ADC5_GPIO6 0x17
|
||||
#define ADC5_GPIO7 0x18
|
||||
#define ADC5_SBUx 0x99
|
||||
#define ADC5_MID_CHG_DIV6 0x1e
|
||||
#define ADC5_OFF 0xff
|
||||
|
||||
/* 30k pull-up1 */
|
||||
#define ADC5_BAT_THERM_30K_PU 0x2a
|
||||
#define ADC5_BAT_ID_30K_PU 0x2b
|
||||
#define ADC5_XO_THERM_30K_PU 0x2c
|
||||
#define ADC5_AMUX_THM1_30K_PU 0x2d
|
||||
#define ADC5_AMUX_THM2_30K_PU 0x2e
|
||||
#define ADC5_AMUX_THM3_30K_PU 0x2f
|
||||
#define ADC5_AMUX_THM4_30K_PU 0x30
|
||||
#define ADC5_AMUX_THM5_30K_PU 0x31
|
||||
#define ADC5_GPIO1_30K_PU 0x32
|
||||
#define ADC5_GPIO2_30K_PU 0x33
|
||||
#define ADC5_GPIO3_30K_PU 0x34
|
||||
#define ADC5_GPIO4_30K_PU 0x35
|
||||
#define ADC5_GPIO5_30K_PU 0x36
|
||||
#define ADC5_GPIO6_30K_PU 0x37
|
||||
#define ADC5_GPIO7_30K_PU 0x38
|
||||
#define ADC5_SBUx_30K_PU 0x39
|
||||
|
||||
/* 100k pull-up2 */
|
||||
#define ADC5_BAT_THERM_100K_PU 0x4a
|
||||
#define ADC5_BAT_ID_100K_PU 0x4b
|
||||
#define ADC5_XO_THERM_100K_PU 0x4c
|
||||
#define ADC5_AMUX_THM1_100K_PU 0x4d
|
||||
#define ADC5_AMUX_THM2_100K_PU 0x4e
|
||||
#define ADC5_AMUX_THM3_100K_PU 0x4f
|
||||
#define ADC5_AMUX_THM4_100K_PU 0x50
|
||||
#define ADC5_AMUX_THM5_100K_PU 0x51
|
||||
#define ADC5_GPIO1_100K_PU 0x52
|
||||
#define ADC5_GPIO2_100K_PU 0x53
|
||||
#define ADC5_GPIO3_100K_PU 0x54
|
||||
#define ADC5_GPIO4_100K_PU 0x55
|
||||
#define ADC5_GPIO5_100K_PU 0x56
|
||||
#define ADC5_GPIO6_100K_PU 0x57
|
||||
#define ADC5_GPIO7_100K_PU 0x58
|
||||
#define ADC5_SBUx_100K_PU 0x59
|
||||
|
||||
/* 400k pull-up3 */
|
||||
#define ADC5_BAT_THERM_400K_PU 0x6a
|
||||
#define ADC5_BAT_ID_400K_PU 0x6b
|
||||
#define ADC5_XO_THERM_400K_PU 0x6c
|
||||
#define ADC5_AMUX_THM1_400K_PU 0x6d
|
||||
#define ADC5_AMUX_THM2_400K_PU 0x6e
|
||||
#define ADC5_AMUX_THM3_400K_PU 0x6f
|
||||
#define ADC5_AMUX_THM4_400K_PU 0x70
|
||||
#define ADC5_AMUX_THM5_400K_PU 0x71
|
||||
#define ADC5_GPIO1_400K_PU 0x72
|
||||
#define ADC5_GPIO2_400K_PU 0x73
|
||||
#define ADC5_GPIO3_400K_PU 0x74
|
||||
#define ADC5_GPIO4_400K_PU 0x75
|
||||
#define ADC5_GPIO5_400K_PU 0x76
|
||||
#define ADC5_GPIO6_400K_PU 0x77
|
||||
#define ADC5_GPIO7_400K_PU 0x78
|
||||
#define ADC5_SBUx_400K_PU 0x79
|
||||
|
||||
/* 1/3 Divider */
|
||||
#define ADC5_GPIO1_DIV3 0x92
|
||||
#define ADC5_GPIO2_DIV3 0x93
|
||||
#define ADC5_GPIO3_DIV3 0x94
|
||||
#define ADC5_GPIO4_DIV3 0x95
|
||||
#define ADC5_GPIO5_DIV3 0x96
|
||||
#define ADC5_GPIO6_DIV3 0x97
|
||||
#define ADC5_GPIO7_DIV3 0x98
|
||||
#define ADC5_SBUx_DIV3 0x99
|
||||
|
||||
/* Current and combined current/voltage channels */
|
||||
#define ADC5_INT_EXT_ISENSE 0xa1
|
||||
#define ADC5_PARALLEL_ISENSE 0xa5
|
||||
#define ADC5_CUR_REPLICA_VDS 0xa7
|
||||
#define ADC5_CUR_SENS_BATFET_VDS_OFFSET 0xa9
|
||||
#define ADC5_CUR_SENS_REPLICA_VDS_OFFSET 0xab
|
||||
#define ADC5_EXT_SENS_OFFSET 0xad
|
||||
|
||||
#define ADC5_INT_EXT_ISENSE_VBAT_VDATA 0xb0
|
||||
#define ADC5_INT_EXT_ISENSE_VBAT_IDATA 0xb1
|
||||
#define ADC5_EXT_ISENSE_VBAT_VDATA 0xb2
|
||||
#define ADC5_EXT_ISENSE_VBAT_IDATA 0xb3
|
||||
#define ADC5_PARALLEL_ISENSE_VBAT_VDATA 0xb4
|
||||
#define ADC5_PARALLEL_ISENSE_VBAT_IDATA 0xb5
|
||||
|
||||
#define ADC5_MAX_CHANNEL 0xc0
|
||||
|
||||
#endif /* _DT_BINDINGS_QCOM_SPMI_VADC_H */
|
||||
|
||||
Reference in New Issue
Block a user