Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 91159
b: refs/heads/master
c: 184dd48
h: refs/heads/master
i:
  91157: 7202cc7
  91155: e4b2936
  91151: e2bd8d5
v: v3
  • Loading branch information
Russell King authored and Russell King committed Apr 19, 2008
1 parent 00e9c4e commit caf00de
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 128 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fdb72fd84c26438a7dd754a1cc74890aca7f1b77
refs/heads/master: 184dd48102425467fbbb209765894b04f668a9de
3 changes: 0 additions & 3 deletions trunk/arch/arm/mach-ks8695/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@ obj- :=
# PCI support is optional
obj-$(CONFIG_PCI) += pci.o

# LEDs
obj-$(CONFIG_LEDS) += leds.o

# Board-specific support
obj-$(CONFIG_MACH_KS8695) += board-micrel.o
21 changes: 0 additions & 21 deletions trunk/arch/arm/mach-ks8695/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,27 +176,6 @@ static void __init ks8695_add_device_watchdog(void) {}
#endif


/* --------------------------------------------------------------------
* LEDs
* -------------------------------------------------------------------- */

#if defined(CONFIG_LEDS)
short ks8695_leds_cpu = -1;
short ks8695_leds_timer = -1;

void __init ks8695_init_leds(u8 cpu_led, u8 timer_led)
{
/* Enable GPIO to access the LEDs */
gpio_direction_output(cpu_led, 1);
gpio_direction_output(timer_led, 1);

ks8695_leds_cpu = cpu_led;
ks8695_leds_timer = timer_led;
}
#else
void __init ks8695_init_leds(u8 cpu_led, u8 timer_led) {}
#endif

/* -------------------------------------------------------------------- */

/*
Expand Down
94 changes: 0 additions & 94 deletions trunk/arch/arm/mach-ks8695/leds.c
View file

This file was deleted.

117 changes: 113 additions & 4 deletions trunk/arch/arm/tools/mach-types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
# Last update: Sat Jan 26 14:45:34 2008
# Last update: Sat Apr 19 11:23:38 2008
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
Expand Down Expand Up @@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363
se4000 ARCH_SE4000 SE4000 364
quadriceps ARCH_QUADRICEPS QUADRICEPS 365
bronco ARCH_BRONCO BRONCO 366
esl_wireless_tab ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET 367
esl_wireless_tab ARCH_ESL_WIRELESS_TAB ESL_WIRELESS_TAB 367
esl_sofcomp ARCH_ESL_SOFCOMP ESL_SOFCOMP 368
s5c7375 ARCH_S5C7375 S5C7375 369
spearhead ARCH_SPEARHEAD SPEARHEAD 370
pantera ARCH_PANTERA PANTERA 371
prayoglite ARCH_PRAYOGLITE PRAYOGLITE 372
gumstix ARCH_GUMSTIK GUMSTIK 373
gumstix ARCH_GUMSTIX GUMSTIX 373
rcube ARCH_RCUBE RCUBE 374
rea_olv ARCH_REA_OLV REA_OLV 375
pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376
Expand Down Expand Up @@ -1463,7 +1463,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462
htctitan MACH_HTCTITAN HTCTITAN 1463
qranium MACH_QRANIUM QRANIUM 1464
adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465
adx_medinet MACH_ADX_MEDINET ADX_MEDINET 1466
adx_medcom MACH_ADX_MEDINET ADX_MEDINET 1466
bboard MACH_BBOARD BBOARD 1467
cambria MACH_CAMBRIA CAMBRIA 1468
mt7xxx MACH_MT7XXX MT7XXX 1469
Expand Down Expand Up @@ -1611,3 +1611,112 @@ kb9263 MACH_KB9263 KB9263 1612
mt7108 MACH_MT7108 MT7108 1613
smtr2440 MACH_SMTR2440 SMTR2440 1614
manao MACH_MANAO MANAO 1615
cm_x300 MACH_CM_X300 CM_X300 1616
gulfstream_kp MACH_GULFSTREAM_KP GULFSTREAM_KP 1617
lanreadyfn522 MACH_LANREADYFN522 LANREADYFN522 1618
arma37 MACH_ARMA37 ARMA37 1619
mendel MACH_MENDEL MENDEL 1620
pelco_iliad MACH_PELCO_ILIAD PELCO_ILIAD 1621
unit2p MACH_UNIT2P UNIT2P 1622
inc20otter MACH_INC20OTTER INC20OTTER 1623
at91sam9g20ek MACH_AT91SAM9G20EK AT91SAM9G20EK 1624
sc_ge2 MACH_STORCENTER STORCENTER 1625
smdk6410 MACH_SMDK6410 SMDK6410 1626
u300 MACH_U300 U300 1627
u500 MACH_U500 U500 1628
ds9260 MACH_DS9260 DS9260 1629
riverrock MACH_RIVERROCK RIVERROCK 1630
scibath MACH_SCIBATH SCIBATH 1631
at91sam7se MACH_AT91SAM7SE512EK AT91SAM7SE512EK 1632
wrt350n_v2 MACH_WRT350N_V2 WRT350N_V2 1633
multimedia MACH_MULTIMEDIA MULTIMEDIA 1634
marvin MACH_MARVIN MARVIN 1635
x500 MACH_X500 X500 1636
awlug4lcu MACH_AWLUG4LCU AWLUG4LCU 1637
palermoc MACH_PALERMOC PALERMOC 1638
omap_ldp MACH_OMAP_LDP OMAP_LDP 1639
ip500 MACH_IP500 IP500 1640
mx35ads MACH_MACH_MX35ADS MACH_MX35ADS 1641
ase2 MACH_ASE2 ASE2 1642
mx35evb MACH_MX35EVB MX35EVB 1643
aml_m8050 MACH_AML_M8050 AML_M8050 1644
mx35_3ds MACH_MX35_3DS MX35_3DS 1645
mars MACH_MARS MARS 1646
ntosd_644xa MACH_NTOSD_644XA NTOSD_644XA 1647
badger MACH_BADGER BADGER 1648
trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649
trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650
marlin MACH_MARLIN MARLIN 1651
ts7800 MACH_TS7800 TS7800 1652
hpipaq214 MACH_HPIPAQ214 HPIPAQ214 1653
at572d940dcm MACH_AT572D940DCM AT572D940DCM 1654
ne1board MACH_NE1BOARD NE1BOARD 1655
zante MACH_ZANTE ZANTE 1656
sffsdr MACH_SFFSDR SFFSDR 1657
tw2662 MACH_TW2662 TW2662 1658
vf10xx MACH_VF10XX VF10XX 1659
zoran43xx MACH_ZORAN43XX ZORAN43XX 1660
sonix926 MACH_SONIX926 SONIX926 1661
celestialsemi MACH_CELESTIALSEMI CELESTIALSEMI 1662
cc9m2443 MACH_CC9M2443 CC9M2443 1663
tw5334 MACH_TW5334 TW5334 1664
omap_htcartemis MACH_HTCARTEMIS HTCARTEMIS 1665
nal_hlite MACH_NAL_HLITE NAL_HLITE 1666
htcvogue MACH_HTCVOGUE HTCVOGUE 1667
smartweb MACH_SMARTWEB SMARTWEB 1668
mv86xx MACH_MV86XX MV86XX 1669
mv87xx MACH_MV87XX MV87XX 1670
songyoungho MACH_SONGYOUNGHO SONGYOUNGHO 1671
younghotema MACH_YOUNGHOTEMA YOUNGHOTEMA 1672
pcm037 MACH_PCM037 PCM037 1673
mmvp MACH_MMVP MMVP 1674
mmap MACH_MMAP MMAP 1675
ptid2410 MACH_PTID2410 PTID2410 1676
james_926 MACH_JAMES_926 JAMES_926 1677
fm6000 MACH_FM6000 FM6000 1678
db88f6281_bp MACH_DB88F6281_BP DB88F6281_BP 1680
rd88f6192_nas MACH_RD88F6192_NAS RD88F6192_NAS 1681
rd88f6281 MACH_RD88F6281 RD88F6281 1682
db78x00_bp MACH_DB78X00_BP DB78X00_BP 1683
smdk2416 MACH_SMDK2416 SMDK2416 1685
oce_spider_si MACH_OCE_SPIDER_SI OCE_SPIDER_SI 1686
oce_spider_sk MACH_OCE_SPIDER_SK OCE_SPIDER_SK 1687
rovern6 MACH_ROVERN6 ROVERN6 1688
pelco_evolution MACH_PELCO_EVOLUTION PELCO_EVOLUTION 1689
wbd111 MACH_WBD111 WBD111 1690
elaracpe MACH_ELARACPE ELARACPE 1691
mabv3 MACH_MABV3 MABV3 1692
mv2120 MACH_MV2120 MV2120 1693
csb737 MACH_CSB737 CSB737 1695
mx51_3ds MACH_MX51_3DS MX51_3DS 1696
g900 MACH_G900 G900 1697
apf27 MACH_APF27 APF27 1698
ggus2000 MACH_GGUS2000 GGUS2000 1699
omap_2430_mimic MACH_OMAP_2430_MIMIC OMAP_2430_MIMIC 1700
imx27lite MACH_IMX27LITE IMX27LITE 1701
almex MACH_ALMEX ALMEX 1702
control MACH_CONTROL CONTROL 1703
mba2410 MACH_MBA2410 MBA2410 1704
volcano MACH_VOLCANO VOLCANO 1705
zenith MACH_ZENITH ZENITH 1706
muchip MACH_MUCHIP MUCHIP 1707
magellan MACH_MAGELLAN MAGELLAN 1708
usb_a9260 MACH_USB_A9260 USB_A9260 1709
usb_a9263 MACH_USB_A9263 USB_A9263 1710
qil_a9260 MACH_QIL_A9260 QIL_A9260 1711
cme9210 MACH_CME9210 CME9210 1712
hczh4 MACH_HCZH4 HCZH4 1713
spearbasic MACH_SPEARBASIC SPEARBASIC 1714
dep2440 MACH_DEP2440 DEP2440 1715
hdl_gxr MACH_HDL_GXR HDL_GXR 1716
hdl_gt MACH_HDL_GT HDL_GT 1717
hdl_4g MACH_HDL_4G HDL_4G 1718
s3c6000 MACH_S3C6000 S3C6000 1719
mmsp2_mdk MACH_MMSP2_MDK MMSP2_MDK 1720
mpx220 MACH_MPX220 MPX220 1721
kzm_arm11_01 MACH_KZM_ARM11_01 KZM_ARM11_01 1722
htc_polaris MACH_HTC_POLARIS HTC_POLARIS 1723
htc_kaiser MACH_HTC_KAISER HTC_KAISER 1724
lg_ks20 MACH_LG_KS20 LG_KS20 1725
hhgps MACH_HHGPS HHGPS 1726
nokia_n810_wimax MACH_NOKIA_N810_WIMAX NOKIA_N810_WIMAX 1727
5 changes: 0 additions & 5 deletions trunk/include/asm-arm/arch-ks8695/devices.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ extern void __init ks8695_add_device_wan(void);
extern void __init ks8695_add_device_lan(void);
extern void __init ks8695_add_device_hpna(void);

/* LEDs */
extern short ks8695_leds_cpu;
extern short ks8695_leds_timer;
extern void __init ks8695_init_leds(u8 cpu_led, u8 timer_led);

/* PCI */
#define KS8695_MODE_PCI 0
#define KS8695_MODE_MINIPCI 1
Expand Down

0 comments on commit caf00de

Please sign in to comment.