diff options
| author | Tom Rini <[email protected]> | 2016-06-06 13:24:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-06-06 13:39:43 -0400 |
| commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
| tree | b1116470884e46c0a66c49525771cf9b49c3835d /arch/arm/cpu | |
| parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
| parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <[email protected]>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/s5p-common/timer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 949abb1c8fe..b63036c64eb 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -12,6 +12,9 @@ #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h> + +/* Use the old PWM interface for now */ +#undef CONFIG_DM_PWM #include <pwm.h> DECLARE_GLOBAL_DATA_PTR; |