Skip to content

Commit e9b6128

Browse files
author
Fox Snowpatch
committed
1 parent 2dd0957 commit e9b6128

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+262
-12792
lines changed

CREDITS

+11
Original file line numberDiff line numberDiff line change
@@ -2175,6 +2175,10 @@ D: Various ACPI fixes, keeping correct battery state through suspend
21752175
D: various lockdep annotations, autofs and other random bugfixes
21762176
S: Prague, Czech Republic
21772177

2178+
N: Ishizaki Kou
2179+
2180+
D: Spidernet driver for PowerPC Cell platforms
2181+
21782182
N: Gene Kozin
21792183
21802184
W: https://www.sangoma.com
@@ -2185,6 +2189,9 @@ S: Markham, Ontario
21852189
S: L3R 8B2
21862190
S: Canada
21872191

2192+
N: Christian Krafft
2193+
D: PowerPC Cell support
2194+
21882195
N: Maxim Krasnyansky
21892196
21902197
W: http://vtun.sf.net
@@ -2377,6 +2384,10 @@ S: ICP vortex GmbH
23772384
S: Neckarsulm
23782385
S: Germany
23792386

2387+
N: Geoff Levand
2388+
2389+
D: Spidernet driver for PowerPC Cell platforms
2390+
23802391
N: Phil Lewis
23812392
23822393
D: Promised to send money if I would put his name in the source tree.

Documentation/admin-guide/kernel-per-CPU-kthreads.rst

+1-6
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,7 @@ To reduce its OS jitter, do any of the following:
278278
due to the rtas_event_scan() function.
279279
WARNING: Please check your CPU specifications to
280280
make sure that this is safe on your particular system.
281-
e. If running on Cell Processor, build your kernel with
282-
CBE_CPUFREQ_SPU_GOVERNOR=n to avoid OS jitter from
283-
spu_gov_work().
284-
WARNING: Please check your CPU specifications to
285-
make sure that this is safe on your particular system.
286-
f. If running on PowerMAC, build your kernel with
281+
e. If running on PowerMAC, build your kernel with
287282
CONFIG_PMAC_RACKMETER=n to disable the CPU-meter,
288283
avoiding OS jitter from rackmeter_do_timer().
289284

Documentation/networking/device_drivers/ethernet/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Contents:
5555
ti/cpsw_switchdev
5656
ti/am65_nuss_cpsw_switchdev
5757
ti/tlan
58-
toshiba/spider_net
5958
wangxun/txgbe
6059
wangxun/ngbe
6160

Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst

-202
This file was deleted.

MAINTAINERS

-9
Original file line numberDiff line numberDiff line change
@@ -22113,15 +22113,6 @@ F: include/linux/spi/
2211322113
F: include/uapi/linux/spi/
2211422114
F: tools/spi/
2211522115

22116-
SPIDERNET NETWORK DRIVER for CELL
22117-
M: Ishizaki Kou <[email protected]>
22118-
M: Geoff Levand <[email protected]>
22119-
22120-
22121-
S: Maintained
22122-
F: Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
22123-
F: drivers/net/ethernet/toshiba/spider_net*
22124-
2212522116
SPMI SUBSYSTEM
2212622117
M: Stephen Boyd <[email protected]>
2212722118

arch/powerpc/Kconfig

+1-9
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,9 @@ config ARCH_HAS_ADD_PAGES
407407
config PPC_DCR_NATIVE
408408
bool
409409

410-
config PPC_DCR_MMIO
411-
bool
412-
413410
config PPC_DCR
414411
bool
415-
depends on PPC_DCR_NATIVE || PPC_DCR_MMIO
412+
depends on PPC_DCR_NATIVE
416413
default y
417414

418415
config PPC_PCI_OF_BUS_MAP
@@ -438,11 +435,6 @@ config PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT
438435
PCI domain dependent and each PCI controller on own domain can have
439436
256 PCI buses, like it is on other Linux architectures.
440437

441-
config PPC_OF_PLATFORM_PCI
442-
bool
443-
depends on PCI
444-
depends on PPC64 # not supported on 32 bits yet
445-
446438
config ARCH_SUPPORTS_UPROBES
447439
def_bool y
448440

arch/powerpc/Kconfig.debug

-7
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,6 @@ config PPC_EARLY_DEBUG_RTAS_PANEL
216216
help
217217
Select this to enable early debugging via the RTAS panel.
218218

219-
config PPC_EARLY_DEBUG_RTAS_CONSOLE
220-
bool "RTAS Console"
221-
depends on PPC_RTAS
222-
select UDBG_RTAS_CONSOLE
223-
help
224-
Select this to enable early debugging via the RTAS console.
225-
226219
config PPC_EARLY_DEBUG_PAS_REALMODE
227220
bool "PA Semi real mode"
228221
depends on PPC_PASEMI

arch/powerpc/boot/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
173173
src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
174174
src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
175175
src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
176-
src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
177176
src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
178177

179178
src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
@@ -276,7 +275,6 @@ quiet_cmd_wrap = WRAP $@
276275

277276
image-$(CONFIG_PPC_PSERIES) += zImage.pseries
278277
image-$(CONFIG_PPC_POWERNV) += zImage.pseries
279-
image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
280278
image-$(CONFIG_PPC_PS3) += dtbImage.ps3
281279
image-$(CONFIG_PPC_CHRP) += zImage.chrp
282280
image-$(CONFIG_PPC_EFIKA) += zImage.chrp

arch/powerpc/configs/cell_defconfig

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ CONFIG_PS3_DISK=y
2525
CONFIG_PS3_ROM=m
2626
CONFIG_PS3_FLASH=m
2727
CONFIG_PS3_LPM=m
28-
CONFIG_PPC_IBM_CELL_BLADE=y
2928
CONFIG_RTAS_FLASH=y
3029
CONFIG_CPU_FREQ=y
3130
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -133,7 +132,6 @@ CONFIG_SKGE=m
133132
CONFIG_SKY2=m
134133
CONFIG_GELIC_NET=m
135134
CONFIG_GELIC_WIRELESS=y
136-
CONFIG_SPIDER_NET=y
137135
# CONFIG_INPUT_KEYBOARD is not set
138136
# CONFIG_INPUT_MOUSE is not set
139137
# CONFIG_SERIO_I8042 is not set

arch/powerpc/configs/ppc64_defconfig

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ CONFIG_PS3_DISK=m
5151
CONFIG_PS3_ROM=m
5252
CONFIG_PS3_FLASH=m
5353
CONFIG_PS3_LPM=m
54-
CONFIG_PPC_IBM_CELL_BLADE=y
5554
CONFIG_RTAS_FLASH=m
5655
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
5756
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -228,7 +227,6 @@ CONFIG_NETXEN_NIC=m
228227
CONFIG_SUNGEM=y
229228
CONFIG_GELIC_NET=m
230229
CONFIG_GELIC_WIRELESS=y
231-
CONFIG_SPIDER_NET=m
232230
CONFIG_BROADCOM_PHY=m
233231
CONFIG_MARVELL_PHY=y
234232
CONFIG_PPP=m

0 commit comments

Comments
 (0)