Skip to content

Commit 0bf2d94

Browse files
RobertCNelsonRobertCNelson
committed
v3.8-rc: merge to 414a6750e59b0b687034764c464e9ddecac0f7a6
Signed-off-by: Robert Nelson <[email protected]>
1 parent 47cc7a2 commit 0bf2d94

File tree

4 files changed

+57
-43
lines changed

4 files changed

+57
-43
lines changed

‎patch.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ omap () {
300300
#Status: unknown: only needed when forcing mpurate over 999 using bootargs...
301301
${git} "${DIR}/patches/omap_fixes/0001-omap3-Increase-limit-on-bootarg-mpurate.patch"
302302

303-
echo "dir: omap/thermal"
304-
#Status: https://lkml.org/lkml/2012/11/13/341
305-
${git} "${DIR}/patches/omap_thermal/0001-staging-omap-thermal-fix-compilation.patch"
306-
${git} "${DIR}/patches/omap_thermal/0002-staging-omap-thermal-remove-platform-data-nomenclatu.patch"
307-
${git} "${DIR}/patches/omap_thermal/0003-staging-omap-thermal-remove-freq_clip-table.patch"
308-
${git} "${DIR}/patches/omap_thermal/0004-staging-omap-thermal-add-IRQ-debugging-messaging.patch"
309-
${git} "${DIR}/patches/omap_thermal/0005-staging-omap-thermal-fix-context-restore-function.patch"
303+
# echo "dir: omap/thermal"
304+
# #Status: https://lkml.org/lkml/2012/11/13/341
305+
# ${git} "${DIR}/patches/omap_thermal/0001-staging-omap-thermal-fix-compilation.patch"
306+
# ${git} "${DIR}/patches/omap_thermal/0002-staging-omap-thermal-remove-platform-data-nomenclatu.patch"
307+
# ${git} "${DIR}/patches/omap_thermal/0003-staging-omap-thermal-remove-freq_clip-table.patch"
308+
# ${git} "${DIR}/patches/omap_thermal/0004-staging-omap-thermal-add-IRQ-debugging-messaging.patch"
309+
# ${git} "${DIR}/patches/omap_thermal/0005-staging-omap-thermal-fix-context-restore-function.patch"
310310
}
311311

312312
am33x_after () {

‎patches/defconfig

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,7 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
573573
# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
574574
# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
575575
CONFIG_CPU_IDLE=y
576+
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
576577
CONFIG_CPU_IDLE_GOV_LADDER=y
577578
CONFIG_CPU_IDLE_GOV_MENU=y
578579
CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
@@ -2193,6 +2194,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
21932194
# CONFIG_SERIAL_ALTERA_UART is not set
21942195
# CONFIG_SERIAL_IFX6X60 is not set
21952196
# CONFIG_SERIAL_XILINX_PS_UART is not set
2197+
# CONFIG_SERIAL_ARC is not set
21962198
# CONFIG_TTY_PRINTK is not set
21972199
# CONFIG_HVC_DCC is not set
21982200
# CONFIG_VIRTIO_CONSOLE is not set
@@ -2310,6 +2312,7 @@ CONFIG_GPIO_SYSFS=y
23102312
#
23112313
# CONFIG_GPIO_GENERIC_PLATFORM is not set
23122314
# CONFIG_GPIO_EM is not set
2315+
# CONFIG_GPIO_TS5500 is not set
23132316

23142317
#
23152318
# I2C GPIO expanders:
@@ -3553,7 +3556,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
35533556
CONFIG_USB_STORAGE_KARMA=m
35543557
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
35553558
CONFIG_USB_STORAGE_ENE_UB6250=m
3556-
CONFIG_USB_UAS=m
35573559

35583560
#
35593561
# USB Imaging devices
@@ -3664,6 +3666,7 @@ CONFIG_USB_EZUSB_FX2=m
36643666
#
36653667
# CONFIG_OMAP_USB2 is not set
36663668
CONFIG_USB_ISP1301=m
3669+
CONFIG_USB_RCAR_PHY=m
36673670
CONFIG_USB_ATM=m
36683671
CONFIG_USB_SPEEDTOUCH=m
36693672
CONFIG_USB_CXACRU=m
@@ -3695,7 +3698,6 @@ CONFIG_USB_ETH_EEM=y
36953698
# CONFIG_USB_G_NCM is not set
36963699
# CONFIG_USB_GADGETFS is not set
36973700
# CONFIG_USB_FUNCTIONFS is not set
3698-
# CONFIG_USB_FILE_STORAGE is not set
36993701
# CONFIG_USB_MASS_STORAGE is not set
37003702
# CONFIG_USB_G_SERIAL is not set
37013703
# CONFIG_USB_MIDI_GADGET is not set
@@ -3885,6 +3887,7 @@ CONFIG_DMATEST=m
38853887
CONFIG_UIO=y
38863888
CONFIG_UIO_PDRV=y
38873889
CONFIG_UIO_PDRV_GENIRQ=y
3890+
CONFIG_UIO_DMEM_GENIRQ=y
38883891
# CONFIG_VFIO is not set
38893892
CONFIG_VIRTIO=m
38903893

@@ -3934,22 +3937,16 @@ CONFIG_SCA3000=m
39343937
# Analog to digital converters
39353938
#
39363939
CONFIG_AD7291=m
3937-
CONFIG_AD7298=m
39383940
CONFIG_AD7606=m
39393941
CONFIG_AD7606_IFACE_PARALLEL=m
39403942
CONFIG_AD7606_IFACE_SPI=m
39413943
CONFIG_AD799X=m
39423944
CONFIG_AD799X_RING_BUFFER=y
3943-
CONFIG_AD7887=m
39443945
CONFIG_AD7780=m
3945-
CONFIG_AD7793=m
39463946
CONFIG_AD7816=m
39473947
CONFIG_AD7192=m
3948-
CONFIG_ADT7310=m
39493948
CONFIG_ADT7410=m
39503949
CONFIG_AD7280=m
3951-
CONFIG_MAX1363=m
3952-
CONFIG_MAX1363_RING_BUFFER=y
39533950

39543951
#
39553952
# Analog digital bi-direction converters
@@ -4075,9 +4072,7 @@ CONFIG_ANDROID_TIMED_OUTPUT=y
40754072
CONFIG_ANDROID_TIMED_GPIO=m
40764073
# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
40774074
CONFIG_ANDROID_INTF_ALARM_DEV=y
4078-
CONFIG_PHONE=m
40794075
# CONFIG_USB_WPAN_HCD is not set
4080-
# CONFIG_IPACK_BUS is not set
40814076
# CONFIG_WIMAX_GDM72XX is not set
40824077
CONFIG_CSR_WIFI=m
40834078
CONFIG_OMAP_BANDGAP=m
@@ -4130,8 +4125,9 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y
41304125
# CONFIG_MEMORY is not set
41314126
CONFIG_IIO=y
41324127
CONFIG_IIO_BUFFER=y
4133-
CONFIG_IIO_KFIFO_BUF=m
4134-
CONFIG_IIO_TRIGGERED_BUFFER=m
4128+
CONFIG_IIO_BUFFER_CB=y
4129+
CONFIG_IIO_KFIFO_BUF=y
4130+
CONFIG_IIO_TRIGGERED_BUFFER=y
41354131
CONFIG_IIO_TRIGGER=y
41364132
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
41374133

@@ -4145,34 +4141,24 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
41454141
#
41464142
CONFIG_AD_SIGMA_DELTA=m
41474143
CONFIG_AD7266=m
4144+
CONFIG_AD7298=m
41484145
CONFIG_AD7791=m
4146+
CONFIG_AD7793=m
41494147
CONFIG_AD7476=m
4148+
CONFIG_AD7887=m
4149+
CONFIG_MAX1363=m
4150+
CONFIG_TI_ADC081C=m
41504151

41514152
#
41524153
# Amplifiers
41534154
#
41544155
CONFIG_AD8366=m
41554156

41564157
#
4157-
# Light sensors
4158-
#
4159-
CONFIG_ADJD_S311=m
4160-
CONFIG_VCNL4000=m
4161-
CONFIG_HID_SENSOR_ALS=m
4162-
4163-
#
4164-
# Frequency Synthesizers DDS/PLL
4165-
#
4166-
4167-
#
4168-
# Clock Generator/Distribution
4169-
#
4170-
CONFIG_AD9523=m
4171-
4172-
#
4173-
# Phase-Locked Loop (PLL) frequency synthesizers
4158+
# Hid Sensor IIO Common
41744159
#
4175-
CONFIG_ADF4350=m
4160+
CONFIG_HID_SENSOR_IIO_COMMON=m
4161+
# CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
41764162

41774163
#
41784164
# Digital to analog converters
@@ -4183,6 +4169,7 @@ CONFIG_AD5380=m
41834169
CONFIG_AD5421=m
41844170
CONFIG_AD5624R_SPI=m
41854171
CONFIG_AD5446=m
4172+
CONFIG_AD5449=m
41864173
CONFIG_AD5504=m
41874174
CONFIG_AD5755=m
41884175
CONFIG_AD5764=m
@@ -4192,16 +4179,39 @@ CONFIG_MAX517=m
41924179
CONFIG_MCP4725=m
41934180

41944181
#
4195-
# Hid Sensor IIO Common
4182+
# Frequency Synthesizers DDS/PLL
41964183
#
4197-
CONFIG_HID_SENSOR_IIO_COMMON=m
4198-
CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS=m
4184+
4185+
#
4186+
# Clock Generator/Distribution
4187+
#
4188+
CONFIG_AD9523=m
4189+
4190+
#
4191+
# Phase-Locked Loop (PLL) frequency synthesizers
4192+
#
4193+
CONFIG_ADF4350=m
41994194

42004195
#
42014196
# Digital gyroscope sensors
42024197
#
4198+
CONFIG_ADIS16136=m
42034199
CONFIG_HID_SENSOR_GYRO_3D=m
42044200

4201+
#
4202+
# Inertial measurement units
4203+
#
4204+
CONFIG_ADIS16480=m
4205+
CONFIG_IIO_ADIS_LIB=m
4206+
CONFIG_IIO_ADIS_LIB_BUFFER=y
4207+
4208+
#
4209+
# Light sensors
4210+
#
4211+
CONFIG_ADJD_S311=m
4212+
CONFIG_VCNL4000=m
4213+
CONFIG_HID_SENSOR_ALS=m
4214+
42054215
#
42064216
# Magnetometer sensors
42074217
#
@@ -4210,6 +4220,8 @@ CONFIG_PWM=y
42104220
CONFIG_PWM_TIECAP=y
42114221
CONFIG_PWM_TIEHRPWM=y
42124222
# CONFIG_PWM_TWL6030 is not set
4223+
CONFIG_IPACK_BUS=m
4224+
# CONFIG_SERIAL_IPOCTAL is not set
42134225

42144226
#
42154227
# File systems

‎patches/ref_omap2plus_defconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
13401340
# CONFIG_SERIAL_ALTERA_UART is not set
13411341
# CONFIG_SERIAL_IFX6X60 is not set
13421342
# CONFIG_SERIAL_XILINX_PS_UART is not set
1343+
# CONFIG_SERIAL_ARC is not set
13431344
# CONFIG_TTY_PRINTK is not set
13441345
# CONFIG_HVC_DCC is not set
13451346
# CONFIG_IPMI_HANDLER is not set
@@ -1452,6 +1453,7 @@ CONFIG_GPIO_SYSFS=y
14521453
#
14531454
# CONFIG_GPIO_GENERIC_PLATFORM is not set
14541455
# CONFIG_GPIO_EM is not set
1456+
# CONFIG_GPIO_TS5500 is not set
14551457

14561458
#
14571459
# I2C GPIO expanders:
@@ -2057,7 +2059,6 @@ CONFIG_USB_STORAGE=y
20572059
# CONFIG_USB_STORAGE_KARMA is not set
20582060
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
20592061
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
2060-
# CONFIG_USB_UAS is not set
20612062

20622063
#
20632064
# USB Imaging devices
@@ -2099,6 +2100,7 @@ CONFIG_USB_TEST=y
20992100
#
21002101
# CONFIG_OMAP_USB2 is not set
21012102
# CONFIG_USB_ISP1301 is not set
2103+
# CONFIG_USB_RCAR_PHY is not set
21022104
CONFIG_USB_GADGET=y
21032105
CONFIG_USB_GADGET_DEBUG=y
21042106
CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -2122,7 +2124,6 @@ CONFIG_USB_ZERO=m
21222124
# CONFIG_USB_G_NCM is not set
21232125
# CONFIG_USB_GADGETFS is not set
21242126
# CONFIG_USB_FUNCTIONFS is not set
2125-
# CONFIG_USB_FILE_STORAGE is not set
21262127
# CONFIG_USB_MASS_STORAGE is not set
21272128
# CONFIG_USB_G_SERIAL is not set
21282129
# CONFIG_USB_MIDI_GADGET is not set
@@ -2298,6 +2299,7 @@ CONFIG_OF_IOMMU=y
22982299
# CONFIG_MEMORY is not set
22992300
# CONFIG_IIO is not set
23002301
# CONFIG_PWM is not set
2302+
# CONFIG_IPACK_BUS is not set
23012303

23022304
#
23032305
# File systems

‎version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ KERNEL_TAG=${KERNEL_REL}
2727
BUILD=d0
2828

2929
#v3.X-rcX + upto SHA
30-
KERNEL_SHA="b58ed041a360ed051fab17e4d9b0f451c6fedba7"
30+
KERNEL_SHA="414a6750e59b0b687034764c464e9ddecac0f7a6"
3131

3232
#git branch
3333
#BRANCH="v3.8.x"

0 commit comments

Comments
 (0)