Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
8fd3ec63
Commit
8fd3ec63
authored
Jun 25, 2009
by
Russell King
Committed by
Russell King
Jun 25, 2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 's3c-fixes' of
git://aeryn.fluff.org.uk/bjdooks/linux
parents
f9bfccf1
76609a69
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
51 additions
and
21 deletions
+51
-21
MAINTAINERS
MAINTAINERS
+43
-0
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug
+0
-8
arch/arm/configs/s3c2410_defconfig
arch/arm/configs/s3c2410_defconfig
+1
-1
arch/arm/configs/s3c6400_defconfig
arch/arm/configs/s3c6400_defconfig
+0
-1
arch/arm/configs/tct_hammer_defconfig
arch/arm/configs/tct_hammer_defconfig
+0
-1
arch/arm/mach-s3c2440/mach-mini2440.c
arch/arm/mach-s3c2440/mach-mini2440.c
+1
-2
arch/arm/mach-s3c2442/mach-gta02.c
arch/arm/mach-s3c2442/mach-gta02.c
+1
-2
arch/arm/plat-s3c/Makefile
arch/arm/plat-s3c/Makefile
+1
-1
arch/arm/plat-s3c/include/plat/devs.h
arch/arm/plat-s3c/include/plat/devs.h
+1
-0
arch/arm/plat-s3c24xx/Makefile
arch/arm/plat-s3c24xx/Makefile
+1
-1
arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
+1
-2
arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
+1
-2
No files found.
MAINTAINERS
View file @
8fd3ec63
...
@@ -867,12 +867,22 @@ M: alex@shark-linux.de
...
@@ -867,12 +867,22 @@ M: alex@shark-linux.de
W: http://www.shark-linux.de/shark.html
W: http://www.shark-linux.de/shark.html
S: Maintained
S: Maintained
ARM/SAMSUNG ARM ARCHITECTURES
P: Ben Dooks
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/plat-s3c/
F: arch/arm/plat-s3c24xx/
ARM/S3C2410 ARM ARCHITECTURE
ARM/S3C2410 ARM ARCHITECTURE
P: Ben Dooks
P: Ben Dooks
M: ben-linux@fluff.org
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
W: http://www.fluff.org/ben/linux/
S: Maintained
S: Maintained
F: arch/arm/mach-s3c2410/
ARM/S3C2440 ARM ARCHITECTURE
ARM/S3C2440 ARM ARCHITECTURE
P: Ben Dooks
P: Ben Dooks
...
@@ -880,6 +890,39 @@ M: ben-linux@fluff.org
...
@@ -880,6 +890,39 @@ M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
W: http://www.fluff.org/ben/linux/
S: Maintained
S: Maintained
F: arch/arm/mach-s3c2440/
ARM/S3C2442 ARM ARCHITECTURE
P: Ben Dooks
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c2442/
ARM/S3C2443 ARM ARCHITECTURE
P: Ben Dooks
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c2443/
ARM/S3C6400 ARM ARCHITECTURE
P: Ben Dooks
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c6400/
ARM/S3C6410 ARM ARCHITECTURE
P: Ben Dooks
M: ben-linux@fluff.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c6410/
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
P: Lennert Buytenhek
P: Lennert Buytenhek
...
...
arch/arm/Kconfig.debug
View file @
8fd3ec63
...
@@ -99,14 +99,6 @@ config DEBUG_CLPS711X_UART2
...
@@ -99,14 +99,6 @@ config DEBUG_CLPS711X_UART2
output to the second serial port on these devices. Saying N will
output to the second serial port on these devices. Saying N will
cause the debug messages to appear on the first serial port.
cause the debug messages to appear on the first serial port.
config DEBUG_S3C_PORT
depends on DEBUG_LL && PLAT_S3C
bool "Kernel low-level debugging messages via S3C UART"
help
Say Y here if you want debug print routines to go to one of the
S3C internal UARTs. The chosen UART must have been configured
before it is used.
config DEBUG_S3C_UART
config DEBUG_S3C_UART
depends on PLAT_S3C
depends on PLAT_S3C
int "S3C UART to use for low-level debug"
int "S3C UART to use for low-level debug"
...
...
arch/arm/configs/s3c2410_defconfig
View file @
8fd3ec63
...
@@ -260,6 +260,7 @@ CONFIG_MACH_NEXCODER_2440=y
...
@@ -260,6 +260,7 @@ CONFIG_MACH_NEXCODER_2440=y
CONFIG_SMDK2440_CPU2440=y
CONFIG_SMDK2440_CPU2440=y
CONFIG_MACH_AT2440EVB=y
CONFIG_MACH_AT2440EVB=y
CONFIG_CPU_S3C2442=y
CONFIG_CPU_S3C2442=y
CONFIG_MACH_MINI2440=y
#
#
# S3C2442 Machines
# S3C2442 Machines
...
@@ -2298,7 +2299,6 @@ CONFIG_DEBUG_ERRORS=y
...
@@ -2298,7 +2299,6 @@ CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_ICEDCC is not set
CONFIG_DEBUG_S3C_PORT=y
CONFIG_DEBUG_S3C_UART=0
CONFIG_DEBUG_S3C_UART=0
#
#
...
...
arch/arm/configs/s3c6400_defconfig
View file @
8fd3ec63
...
@@ -816,7 +816,6 @@ CONFIG_DEBUG_ERRORS=y
...
@@ -816,7 +816,6 @@ CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_ICEDCC is not set
CONFIG_DEBUG_S3C_PORT=y
CONFIG_DEBUG_S3C_UART=0
CONFIG_DEBUG_S3C_UART=0
#
#
...
...
arch/arm/configs/tct_hammer_defconfig
View file @
8fd3ec63
...
@@ -857,7 +857,6 @@ CONFIG_DEBUG_ERRORS=y
...
@@ -857,7 +857,6 @@ CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_S3C_PORT is not set
CONFIG_DEBUG_S3C_UART=0
CONFIG_DEBUG_S3C_UART=0
#
#
...
...
arch/arm/mach-s3c2440/mach-mini2440.c
View file @
8fd3ec63
...
@@ -48,8 +48,6 @@
...
@@ -48,8 +48,6 @@
#include <plat/mci.h>
#include <plat/mci.h>
#include <plat/udc.h>
#include <plat/udc.h>
#include <plat/regs-serial.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/nand_ecc.h>
#include <linux/mtd/nand_ecc.h>
...
@@ -275,6 +273,7 @@ static struct s3c2410_nand_set mini2440_nand_sets[] __initdata = {
...
@@ -275,6 +273,7 @@ static struct s3c2410_nand_set mini2440_nand_sets[] __initdata = {
.
nr_chips
=
1
,
.
nr_chips
=
1
,
.
nr_partitions
=
ARRAY_SIZE
(
mini2440_default_nand_part
),
.
nr_partitions
=
ARRAY_SIZE
(
mini2440_default_nand_part
),
.
partitions
=
mini2440_default_nand_part
,
.
partitions
=
mini2440_default_nand_part
,
.
flash_bbt
=
1
,
/* we use u-boot to create a BBT */
},
},
};
};
...
...
arch/arm/mach-s3c2442/mach-gta02.c
View file @
8fd3ec63
...
@@ -433,8 +433,7 @@ static struct s3c2410_nand_set gta02_nand_sets[] = {
...
@@ -433,8 +433,7 @@ static struct s3c2410_nand_set gta02_nand_sets[] = {
*/
*/
.
name
=
"neo1973-nand"
,
.
name
=
"neo1973-nand"
,
.
nr_chips
=
1
,
.
nr_chips
=
1
,
.
use_bbt
=
1
,
.
flash_bbt
=
1
,
.
force_soft_ecc
=
1
,
},
},
};
};
...
...
arch/arm/plat-s3c/Makefile
View file @
8fd3ec63
...
@@ -34,7 +34,7 @@ obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
...
@@ -34,7 +34,7 @@ obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
obj-$(CONFIG_S3C_DEV_HSMMC1)
+=
dev-hsmmc1.o
obj-$(CONFIG_S3C_DEV_HSMMC1)
+=
dev-hsmmc1.o
obj-y
+=
dev-i2c0.o
obj-y
+=
dev-i2c0.o
obj-$(CONFIG_S3C_DEV_I2C1)
+=
dev-i2c1.o
obj-$(CONFIG_S3C_DEV_I2C1)
+=
dev-i2c1.o
obj-$(CONFIG_SND_S3C
24XX_SOC
)
+=
dev-audio.o
obj-$(CONFIG_SND_S3C
64XX_SOC_I2S
)
+=
dev-audio.o
obj-$(CONFIG_S3C_DEV_FB)
+=
dev-fb.o
obj-$(CONFIG_S3C_DEV_FB)
+=
dev-fb.o
obj-$(CONFIG_S3C_DEV_USB_HOST)
+=
dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HOST)
+=
dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG)
+=
dev-usb-hsotg.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG)
+=
dev-usb-hsotg.o
arch/arm/plat-s3c/include/plat/devs.h
View file @
8fd3ec63
...
@@ -37,6 +37,7 @@ extern struct platform_device s3c_device_i2c1;
...
@@ -37,6 +37,7 @@ extern struct platform_device s3c_device_i2c1;
extern
struct
platform_device
s3c_device_rtc
;
extern
struct
platform_device
s3c_device_rtc
;
extern
struct
platform_device
s3c_device_adc
;
extern
struct
platform_device
s3c_device_adc
;
extern
struct
platform_device
s3c_device_sdi
;
extern
struct
platform_device
s3c_device_sdi
;
extern
struct
platform_device
s3c_device_iis
;
extern
struct
platform_device
s3c_device_hwmon
;
extern
struct
platform_device
s3c_device_hwmon
;
extern
struct
platform_device
s3c_device_hsmmc0
;
extern
struct
platform_device
s3c_device_hsmmc0
;
extern
struct
platform_device
s3c_device_hsmmc1
;
extern
struct
platform_device
s3c_device_hsmmc1
;
...
...
arch/arm/plat-s3c24xx/Makefile
View file @
8fd3ec63
...
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o
...
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o
obj-$(CONFIG_PM)
+=
pm.o
obj-$(CONFIG_PM)
+=
pm.o
obj-$(CONFIG_PM)
+=
irq-pm.o
obj-$(CONFIG_PM)
+=
irq-pm.o
obj-$(CONFIG_PM)
+=
sleep.o
obj-$(CONFIG_PM)
+=
sleep.o
obj-$(CONFIG_
HAVE_PWM)
+=
pwm.o
obj-$(CONFIG_
S3C24XX_PWM)
+=
pwm.o
obj-$(CONFIG_S3C2410_CLOCK)
+=
s3c2410-clock.o
obj-$(CONFIG_S3C2410_CLOCK)
+=
s3c2410-clock.o
obj-$(CONFIG_S3C2410_DMA)
+=
dma.o
obj-$(CONFIG_S3C2410_DMA)
+=
dma.o
obj-$(CONFIG_S3C24XX_ADC)
+=
adc.o
obj-$(CONFIG_S3C24XX_ADC)
+=
adc.o
...
...
arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
View file @
8fd3ec63
...
@@ -12,8 +12,7 @@
...
@@ -12,8 +12,7 @@
*/
*/
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <mach/hardware.h>
#include <mach/spi.h>
#include <mach/spi.h>
#include <mach/regs-gpio.h>
#include <mach/regs-gpio.h>
...
...
arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
View file @
8fd3ec63
...
@@ -12,8 +12,7 @@
...
@@ -12,8 +12,7 @@
*/
*/
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <mach/hardware.h>
#include <mach/spi.h>
#include <mach/spi.h>
#include <mach/regs-gpio.h>
#include <mach/regs-gpio.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment