Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4bcac20a7a01d49dffb5e88a8140efa34927c383

Authored by Andriy Skulysh
Committed by Paul Mundt
1 parent e4c2cfee5d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sh: hp6xx mach-type cleanups. 

Some minor cleanups for the updated consolidated hp6xx
mach-type.

Signed-off-by: Andriy Skulysh <askulysh@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 3 changed files with 17 additions and 34 deletions Side-by-side Diff

... ... @@ -113,7 +113,7 @@
113 113 incdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) := se7751
114 114 incdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) := se7300
115 115 incdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) := se73180
116   -incdir-$(CONFIG_SH_HP600) := hp6xx
  116 +incdir-$(CONFIG_SH_HP6XX) := hp6xx
117 117  
118 118 ifneq ($(machdir-y),)
119 119 core-y += arch/sh/boards/$(machdir-y)/
drivers/video/hitfb.c
Diff comments   View file @ 4bcac20
... ... @@ -28,10 +28,8 @@
28 28 #include <asm/io.h>
29 29 #include <asm/hd64461/hd64461.h>
30 30  
31   -#ifdef MACH_HP600
32 31 #include <asm/cpu/dac.h>
33 32 #include <asm/hp6xx/hp6xx.h>
34   -#endif
35 33  
36 34 #define WIDTH 640
37 35  
... ... @@ -192,12 +190,6 @@
192 190 unsigned short v;
193 191  
194 192 if (blank_mode) {
195   -#ifdef MACH_HP600
196   - sh_dac_disable(DAC_LCD_BRIGHTNESS);
197   - v = fb_readw(HD64461_GPBDR);
198   - v |= HD64461_GPBDR_LCDOFF;
199   - fb_writew(v, HD64461_GPBDR);
200   -#endif
201 193 v = fb_readw(HD64461_LDR1);
202 194 v &= ~HD64461_LDR1_DON;
203 195 fb_writew(v, HD64461_LDR1);
... ... @@ -213,12 +205,7 @@
213 205 v = fb_readw(HD64461_STBCR);
214 206 v &= ~HD64461_STBCR_SLCDST;
215 207 fb_writew(v, HD64461_STBCR);
216   -#ifdef MACH_HP600
217   - sh_dac_enable(DAC_LCD_BRIGHTNESS);
218   - v = fb_readw(HD64461_GPBDR);
219   - v &= ~HD64461_GPBDR_LCDOFF;
220   - fb_writew(v, HD64461_GPBDR);
221   -#endif
  208 +
222 209 v = fb_readw(HD64461_LDR1);
223 210 v |= HD64461_LDR1_DON;
224 211 fb_writew(v, HD64461_LDR1);
sound/oss/sh_dac_audio.c
Diff comments   View file @ 4bcac20
... ... @@ -6,18 +6,15 @@
6 6 #include <linux/fs.h>
7 7 #include <linux/sound.h>
8 8 #include <linux/soundcard.h>
  9 +#include <linux/interrupt.h>
9 10 #include <asm/io.h>
10 11 #include <asm/uaccess.h>
11 12 #include <asm/irq.h>
12 13 #include <asm/delay.h>
13   -#include <linux/interrupt.h>
14   -
15 14 #include <asm/cpu/dac.h>
16   -
17   -#ifdef MACH_HP600
  15 +#include <asm/machvec.h>
18 16 #include <asm/hp6xx/hp6xx.h>
19 17 #include <asm/hd64461/hd64461.h>
20   -#endif
21 18  
22 19 #define MODNAME "sh_dac_audio"
23 20  
24 21  
25 22  
... ... @@ -71,26 +68,25 @@
71 68  
72 69 static void dac_audio_start(void)
73 70 {
74   -#ifdef MACH_HP600
75   - u16 v;
76   - v = inw(HD64461_GPADR);
77   - v &= ~HD64461_GPADR_SPEAKER;
78   - outw(v, HD64461_GPADR);
79   -#endif
  71 + if (mach_is_hp6xx()) {
  72 + u16 v = inw(HD64461_GPADR);
  73 + v &= ~HD64461_GPADR_SPEAKER;
  74 + outw(v, HD64461_GPADR);
  75 + }
  76 +
80 77 sh_dac_enable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
81 78 ctrl_outw(TMU1_TCR_INIT, TMU1_TCR);
82 79 }
83 80 static void dac_audio_stop(void)
84 81 {
85   -#ifdef MACH_HP600
86   - u16 v;
87   -#endif
88 82 dac_audio_stop_timer();
89   -#ifdef MACH_HP600
90   - v = inw(HD64461_GPADR);
91   - v |= HD64461_GPADR_SPEAKER;
92   - outw(v, HD64461_GPADR);
93   -#endif
  83 +
  84 + if (mach_is_hp6xx()) {
  85 + u16 v = inw(HD64461_GPADR);
  86 + v |= HD64461_GPADR_SPEAKER;
  87 + outw(v, HD64461_GPADR);
  88 + }
  89 +
94 90 sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
95 91 }
96 92