Skip to content

Commit 311d846

Browse files
committed
sync with angstrom
Signed-off-by: Robert Nelson <[email protected]>
1 parent 528af62 commit 311d846

File tree

5 files changed

+380
-4
lines changed

5 files changed

+380
-4
lines changed

patch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ pwm () {
243243
${git} "${DIR}/patches/pwm/0014-dts-support-for-config-space.patch"
244244
${git} "${DIR}/patches/pwm/0015-pwm-pwm-tiehrpwm-Fix-conflicting-channel-period-sett.patch"
245245
${git} "${DIR}/patches/pwm/0016-PWM-ti-ehrpwm-fix-up-merge-conflict.patch"
246+
${git} "${DIR}/patches/pwm/0017-pwm-pwm_test-Driver-support-for-PWM-module-testing.patch"
246247
}
247248

248249
st7735 () {

patches/defconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm 3.6.0-rc7 Kernel Configuration
3+
# Linux/arm 3.6.0 Kernel Configuration
44
#
55
CONFIG_ARM=y
66
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -347,7 +347,8 @@ CONFIG_ARCH_OMAP2PLUS=y
347347
#
348348
# OMAP Feature Selections
349349
#
350-
# CONFIG_POWER_AVS_OMAP is not set
350+
CONFIG_POWER_AVS_OMAP=y
351+
CONFIG_POWER_AVS_OMAP_CLASS3=y
351352
CONFIG_OMAP_RESET_CLOCKS=y
352353
CONFIG_OMAP_MUX=y
353354
CONFIG_OMAP_MUX_DEBUG=y
@@ -4124,6 +4125,7 @@ CONFIG_MCP4725=m
41244125
CONFIG_PWM=y
41254126
CONFIG_PWM_TIECAP=y
41264127
CONFIG_PWM_TIEHRPWM=y
4128+
# CONFIG_EHRPWM_TEST is not set
41274129

41284130
#
41294131
# File systems

0 commit comments

Comments
 (0)