diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-03-01 04:47:08 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-03-05 00:13:26 -0500 |
commit | c87a7111349891043cb0a62b0ba745264d4b600a (patch) | |
tree | b91a9d87de80d99c9d5cb3fe9aec884fff1d215e | |
parent | 87e29cacb7d09c81b09224bec395f970df958af4 (diff) |
sh: Enable SM501 support for RTS7751R2D.
This enables the SM501 drivers for the R2D board. Additional
work needs to be done to migrate off of the VoyagerGX cchip
code to make use of the rest of the mfd infrastructure.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/setup.c | 26 | ||||
-rw-r--r-- | arch/sh/configs/rts7751r2d_defconfig | 110 |
2 files changed, 126 insertions, 10 deletions
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index 44b42082a0af..593f26a85e9c 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
13 | #include <linux/pata_platform.h> | 13 | #include <linux/pata_platform.h> |
14 | #include <linux/serial_8250.h> | 14 | #include <linux/serial_8250.h> |
15 | #include <linux/sm501.h> | ||
15 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
16 | #include <asm/machvec.h> | 17 | #include <asm/machvec.h> |
17 | #include <asm/rts7751r2d.h> | 18 | #include <asm/rts7751r2d.h> |
@@ -111,10 +112,35 @@ static struct platform_device heartbeat_device = { | |||
111 | .resource = heartbeat_resources, | 112 | .resource = heartbeat_resources, |
112 | }; | 113 | }; |
113 | 114 | ||
115 | static struct resource sm501_resources[] = { | ||
116 | [0] = { | ||
117 | .start = 0x10000000, | ||
118 | .end = 0x13e00000 - 1, | ||
119 | .flags = IORESOURCE_MEM, | ||
120 | }, | ||
121 | [1] = { | ||
122 | .start = 0x13e00000, | ||
123 | .end = 0x13ffffff, | ||
124 | .flags = IORESOURCE_MEM, | ||
125 | }, | ||
126 | [2] = { | ||
127 | .start = 32, | ||
128 | .flags = IORESOURCE_IRQ, | ||
129 | }, | ||
130 | }; | ||
131 | |||
132 | static struct platform_device sm501_device = { | ||
133 | .name = "sm501", | ||
134 | .id = -1, | ||
135 | .num_resources = ARRAY_SIZE(sm501_resources), | ||
136 | .resource = sm501_resources, | ||
137 | }; | ||
138 | |||
114 | static struct platform_device *rts7751r2d_devices[] __initdata = { | 139 | static struct platform_device *rts7751r2d_devices[] __initdata = { |
115 | &uart_device, | 140 | &uart_device, |
116 | &heartbeat_device, | 141 | &heartbeat_device, |
117 | &cf_ide_device, | 142 | &cf_ide_device, |
143 | &sm501_device, | ||
118 | }; | 144 | }; |
119 | 145 | ||
120 | static int __init rts7751r2d_devices_setup(void) | 146 | static int __init rts7751r2d_devices_setup(void) |
diff --git a/arch/sh/configs/rts7751r2d_defconfig b/arch/sh/configs/rts7751r2d_defconfig index db6a02df5af6..a59bb78bd071 100644 --- a/arch/sh/configs/rts7751r2d_defconfig +++ b/arch/sh/configs/rts7751r2d_defconfig | |||
@@ -1,14 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.21-rc1 |
4 | # Thu Feb 15 17:17:29 2007 | 4 | # Thu Mar 1 16:42:40 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
8 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 8 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
9 | CONFIG_GENERIC_HWEIGHT=y | 9 | CONFIG_GENERIC_HWEIGHT=y |
10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
11 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
12 | CONFIG_GENERIC_IRQ_PROBE=y | 11 | CONFIG_GENERIC_IRQ_PROBE=y |
13 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
14 | # CONFIG_GENERIC_TIME is not set | 13 | # CONFIG_GENERIC_TIME is not set |
@@ -33,6 +32,7 @@ CONFIG_LOCALVERSION_AUTO=y | |||
33 | CONFIG_SWAP=y | 32 | CONFIG_SWAP=y |
34 | CONFIG_SYSVIPC=y | 33 | CONFIG_SYSVIPC=y |
35 | # CONFIG_IPC_NS is not set | 34 | # CONFIG_IPC_NS is not set |
35 | CONFIG_SYSVIPC_SYSCTL=y | ||
36 | # CONFIG_POSIX_MQUEUE is not set | 36 | # CONFIG_POSIX_MQUEUE is not set |
37 | # CONFIG_BSD_PROCESS_ACCT is not set | 37 | # CONFIG_BSD_PROCESS_ACCT is not set |
38 | # CONFIG_TASKSTATS is not set | 38 | # CONFIG_TASKSTATS is not set |
@@ -119,7 +119,6 @@ CONFIG_SH_RTS7751R2D=y | |||
119 | # CONFIG_SH_SHMIN is not set | 119 | # CONFIG_SH_SHMIN is not set |
120 | # CONFIG_SH_7206_SOLUTION_ENGINE is not set | 120 | # CONFIG_SH_7206_SOLUTION_ENGINE is not set |
121 | # CONFIG_SH_7619_SOLUTION_ENGINE is not set | 121 | # CONFIG_SH_7619_SOLUTION_ENGINE is not set |
122 | # CONFIG_SH_ASDAP310 is not set | ||
123 | # CONFIG_SH_UNKNOWN is not set | 122 | # CONFIG_SH_UNKNOWN is not set |
124 | 123 | ||
125 | # | 124 | # |
@@ -281,7 +280,7 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000 | |||
281 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
282 | # CONFIG_UBC_WAKEUP is not set | 281 | # CONFIG_UBC_WAKEUP is not set |
283 | CONFIG_CMDLINE_BOOL=y | 282 | CONFIG_CMDLINE_BOOL=y |
284 | CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" | 283 | CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1" |
285 | 284 | ||
286 | # | 285 | # |
287 | # Bus options | 286 | # Bus options |
@@ -433,6 +432,7 @@ CONFIG_FW_LOADER=m | |||
433 | # | 432 | # |
434 | # Plug and Play support | 433 | # Plug and Play support |
435 | # | 434 | # |
435 | # CONFIG_PNPACPI is not set | ||
436 | 436 | ||
437 | # | 437 | # |
438 | # Block devices | 438 | # Block devices |
@@ -770,7 +770,26 @@ CONFIG_NET_WIRELESS=y | |||
770 | # | 770 | # |
771 | # Input device support | 771 | # Input device support |
772 | # | 772 | # |
773 | # CONFIG_INPUT is not set | 773 | CONFIG_INPUT=y |
774 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
775 | |||
776 | # | ||
777 | # Userland interfaces | ||
778 | # | ||
779 | # CONFIG_INPUT_MOUSEDEV is not set | ||
780 | # CONFIG_INPUT_JOYDEV is not set | ||
781 | # CONFIG_INPUT_TSDEV is not set | ||
782 | # CONFIG_INPUT_EVDEV is not set | ||
783 | # CONFIG_INPUT_EVBUG is not set | ||
784 | |||
785 | # | ||
786 | # Input Device Drivers | ||
787 | # | ||
788 | # CONFIG_INPUT_KEYBOARD is not set | ||
789 | # CONFIG_INPUT_MOUSE is not set | ||
790 | # CONFIG_INPUT_JOYSTICK is not set | ||
791 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
792 | # CONFIG_INPUT_MISC is not set | ||
774 | 793 | ||
775 | # | 794 | # |
776 | # Hardware I/O ports | 795 | # Hardware I/O ports |
@@ -781,7 +800,10 @@ CONFIG_NET_WIRELESS=y | |||
781 | # | 800 | # |
782 | # Character devices | 801 | # Character devices |
783 | # | 802 | # |
784 | # CONFIG_VT is not set | 803 | CONFIG_VT=y |
804 | CONFIG_VT_CONSOLE=y | ||
805 | CONFIG_HW_CONSOLE=y | ||
806 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
785 | # CONFIG_SERIAL_NONSTANDARD is not set | 807 | # CONFIG_SERIAL_NONSTANDARD is not set |
786 | 808 | ||
787 | # | 809 | # |
@@ -857,6 +879,11 @@ CONFIG_HWMON=y | |||
857 | # CONFIG_HWMON_DEBUG_CHIP is not set | 879 | # CONFIG_HWMON_DEBUG_CHIP is not set |
858 | 880 | ||
859 | # | 881 | # |
882 | # Multifunction device drivers | ||
883 | # | ||
884 | CONFIG_MFD_SM501=y | ||
885 | |||
886 | # | ||
860 | # Multimedia devices | 887 | # Multimedia devices |
861 | # | 888 | # |
862 | # CONFIG_VIDEO_DEV is not set | 889 | # CONFIG_VIDEO_DEV is not set |
@@ -869,9 +896,66 @@ CONFIG_HWMON=y | |||
869 | # | 896 | # |
870 | # Graphics support | 897 | # Graphics support |
871 | # | 898 | # |
872 | CONFIG_FIRMWARE_EDID=y | ||
873 | # CONFIG_FB is not set | ||
874 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 899 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
900 | CONFIG_FB=y | ||
901 | # CONFIG_FIRMWARE_EDID is not set | ||
902 | # CONFIG_FB_DDC is not set | ||
903 | CONFIG_FB_CFB_FILLRECT=y | ||
904 | CONFIG_FB_CFB_COPYAREA=y | ||
905 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
906 | # CONFIG_FB_SVGALIB is not set | ||
907 | # CONFIG_FB_MACMODES is not set | ||
908 | # CONFIG_FB_BACKLIGHT is not set | ||
909 | # CONFIG_FB_MODE_HELPERS is not set | ||
910 | # CONFIG_FB_TILEBLITTING is not set | ||
911 | |||
912 | # | ||
913 | # Frambuffer hardware drivers | ||
914 | # | ||
915 | # CONFIG_FB_CIRRUS is not set | ||
916 | # CONFIG_FB_PM2 is not set | ||
917 | # CONFIG_FB_CYBER2000 is not set | ||
918 | # CONFIG_FB_ASILIANT is not set | ||
919 | # CONFIG_FB_IMSTT is not set | ||
920 | # CONFIG_FB_EPSON1355 is not set | ||
921 | # CONFIG_FB_S1D13XXX is not set | ||
922 | # CONFIG_FB_NVIDIA is not set | ||
923 | # CONFIG_FB_RIVA is not set | ||
924 | # CONFIG_FB_MATROX is not set | ||
925 | # CONFIG_FB_RADEON is not set | ||
926 | # CONFIG_FB_ATY128 is not set | ||
927 | # CONFIG_FB_ATY is not set | ||
928 | # CONFIG_FB_S3 is not set | ||
929 | # CONFIG_FB_SAVAGE is not set | ||
930 | # CONFIG_FB_SIS is not set | ||
931 | # CONFIG_FB_NEOMAGIC is not set | ||
932 | # CONFIG_FB_KYRO is not set | ||
933 | # CONFIG_FB_3DFX is not set | ||
934 | # CONFIG_FB_VOODOO1 is not set | ||
935 | # CONFIG_FB_TRIDENT is not set | ||
936 | CONFIG_FB_SM501=y | ||
937 | # CONFIG_FB_VIRTUAL is not set | ||
938 | |||
939 | # | ||
940 | # Console display driver support | ||
941 | # | ||
942 | CONFIG_DUMMY_CONSOLE=y | ||
943 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
944 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
945 | # CONFIG_FONTS is not set | ||
946 | CONFIG_FONT_8x8=y | ||
947 | CONFIG_FONT_8x16=y | ||
948 | |||
949 | # | ||
950 | # Logo configuration | ||
951 | # | ||
952 | CONFIG_LOGO=y | ||
953 | # CONFIG_LOGO_LINUX_MONO is not set | ||
954 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
955 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
956 | # CONFIG_LOGO_SUPERH_MONO is not set | ||
957 | # CONFIG_LOGO_SUPERH_VGA16 is not set | ||
958 | CONFIG_LOGO_SUPERH_CLUT224=y | ||
875 | 959 | ||
876 | # | 960 | # |
877 | # Sound | 961 | # Sound |
@@ -985,6 +1069,12 @@ CONFIG_SOUND_PRIME=m | |||
985 | CONFIG_AC97_BUS=m | 1069 | CONFIG_AC97_BUS=m |
986 | 1070 | ||
987 | # | 1071 | # |
1072 | # HID Devices | ||
1073 | # | ||
1074 | CONFIG_HID=y | ||
1075 | # CONFIG_HID_DEBUG is not set | ||
1076 | |||
1077 | # | ||
988 | # USB support | 1078 | # USB support |
989 | # | 1079 | # |
990 | CONFIG_USB_ARCH_HAS_HCD=y | 1080 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -1237,7 +1327,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
1237 | CONFIG_EARLY_SCIF_CONSOLE=y | 1327 | CONFIG_EARLY_SCIF_CONSOLE=y |
1238 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 | 1328 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 |
1239 | CONFIG_EARLY_PRINTK=y | 1329 | CONFIG_EARLY_PRINTK=y |
1240 | # CONFIG_KGDB is not set | 1330 | # CONFIG_SH_KGDB is not set |
1241 | 1331 | ||
1242 | # | 1332 | # |
1243 | # Security options | 1333 | # Security options |