diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 35 | ||||
-rw-r--r-- | arch/arm/configs/s3c6400_defconfig | 390 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/clock.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-u300/i2c.c | 57 | ||||
-rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 109 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/db8500-regs.h | 12 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-ux500/ste-dma40-db8500.h | 154 | ||||
-rw-r--r-- | arch/arm/plat-s5p/clock.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-cfg.h | 23 |
15 files changed, 797 insertions, 27 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 43af89c027d9..44cea2ddd22b 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.34 | 3 | # Linux kernel version: 2.6.34 |
4 | # Wed May 26 19:04:29 2010 | 4 | # Fri May 28 19:15:48 2010 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | 7 | CONFIG_HAVE_PWM=y |
@@ -250,12 +250,15 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y | |||
250 | CONFIG_S3C_LOWLEVEL_UART_PORT=0 | 250 | CONFIG_S3C_LOWLEVEL_UART_PORT=0 |
251 | CONFIG_SAMSUNG_CLKSRC=y | 251 | CONFIG_SAMSUNG_CLKSRC=y |
252 | CONFIG_S3C_GPIO_CFG_S3C24XX=y | 252 | CONFIG_S3C_GPIO_CFG_S3C24XX=y |
253 | CONFIG_S3C_GPIO_PULL_UPDOWN=y | ||
253 | CONFIG_S3C_GPIO_PULL_UP=y | 254 | CONFIG_S3C_GPIO_PULL_UP=y |
254 | CONFIG_SAMSUNG_GPIO_EXTRA=0 | 255 | CONFIG_SAMSUNG_GPIO_EXTRA=0 |
255 | CONFIG_S3C_GPIO_SPACE=0 | 256 | CONFIG_S3C_GPIO_SPACE=0 |
256 | CONFIG_S3C_ADC=y | 257 | CONFIG_S3C_ADC=y |
257 | CONFIG_S3C_DEV_HSMMC=y | 258 | CONFIG_S3C_DEV_HSMMC=y |
259 | CONFIG_S3C_DEV_HSMMC1=y | ||
258 | CONFIG_S3C_DEV_HWMON=y | 260 | CONFIG_S3C_DEV_HWMON=y |
261 | CONFIG_S3C_DEV_FB=y | ||
259 | CONFIG_S3C_DEV_USB_HOST=y | 262 | CONFIG_S3C_DEV_USB_HOST=y |
260 | CONFIG_S3C_DEV_WDT=y | 263 | CONFIG_S3C_DEV_WDT=y |
261 | CONFIG_S3C_DEV_NAND=y | 264 | CONFIG_S3C_DEV_NAND=y |
@@ -322,11 +325,13 @@ CONFIG_MACH_SMDK2413=y | |||
322 | CONFIG_MACH_S3C2413=y | 325 | CONFIG_MACH_S3C2413=y |
323 | CONFIG_MACH_SMDK2412=y | 326 | CONFIG_MACH_SMDK2412=y |
324 | CONFIG_MACH_VSTMS=y | 327 | CONFIG_MACH_VSTMS=y |
328 | CONFIG_CPU_S3C2416=y | ||
329 | CONFIG_S3C2416_DMA=y | ||
325 | 330 | ||
326 | # | 331 | # |
327 | # S3C2416 Machines | 332 | # S3C2416 Machines |
328 | # | 333 | # |
329 | # CONFIG_MACH_SMDK2416 is not set | 334 | CONFIG_MACH_SMDK2416=y |
330 | CONFIG_CPU_S3C2440=y | 335 | CONFIG_CPU_S3C2440=y |
331 | CONFIG_CPU_S3C2442=y | 336 | CONFIG_CPU_S3C2442=y |
332 | CONFIG_CPU_S3C244X=y | 337 | CONFIG_CPU_S3C244X=y |
@@ -338,9 +343,9 @@ CONFIG_S3C2440_DMA=y | |||
338 | # S3C2440 and S3C2442 Machines | 343 | # S3C2440 and S3C2442 Machines |
339 | # | 344 | # |
340 | CONFIG_MACH_ANUBIS=y | 345 | CONFIG_MACH_ANUBIS=y |
341 | # CONFIG_MACH_NEO1973_GTA02 is not set | 346 | CONFIG_MACH_NEO1973_GTA02=y |
342 | CONFIG_MACH_OSIRIS=y | 347 | CONFIG_MACH_OSIRIS=y |
343 | # CONFIG_MACH_OSIRIS_DVS is not set | 348 | CONFIG_MACH_OSIRIS_DVS=m |
344 | CONFIG_MACH_RX3715=y | 349 | CONFIG_MACH_RX3715=y |
345 | CONFIG_ARCH_S3C2440=y | 350 | CONFIG_ARCH_S3C2440=y |
346 | CONFIG_MACH_NEXCODER_2440=y | 351 | CONFIG_MACH_NEXCODER_2440=y |
@@ -348,7 +353,7 @@ CONFIG_SMDK2440_CPU2440=y | |||
348 | CONFIG_SMDK2440_CPU2442=y | 353 | CONFIG_SMDK2440_CPU2442=y |
349 | CONFIG_MACH_AT2440EVB=y | 354 | CONFIG_MACH_AT2440EVB=y |
350 | CONFIG_MACH_MINI2440=y | 355 | CONFIG_MACH_MINI2440=y |
351 | # CONFIG_MACH_RX1950 is not set | 356 | CONFIG_MACH_RX1950=y |
352 | CONFIG_CPU_S3C2443=y | 357 | CONFIG_CPU_S3C2443=y |
353 | CONFIG_S3C2443_DMA=y | 358 | CONFIG_S3C2443_DMA=y |
354 | 359 | ||
@@ -1302,6 +1307,7 @@ CONFIG_INPUT_POWERMATE=m | |||
1302 | CONFIG_INPUT_YEALINK=m | 1307 | CONFIG_INPUT_YEALINK=m |
1303 | CONFIG_INPUT_CM109=m | 1308 | CONFIG_INPUT_CM109=m |
1304 | CONFIG_INPUT_UINPUT=m | 1309 | CONFIG_INPUT_UINPUT=m |
1310 | # CONFIG_INPUT_PCF50633_PMU is not set | ||
1305 | # CONFIG_INPUT_PCF8574 is not set | 1311 | # CONFIG_INPUT_PCF8574 is not set |
1306 | CONFIG_INPUT_GPIO_ROTARY_ENCODER=m | 1312 | CONFIG_INPUT_GPIO_ROTARY_ENCODER=m |
1307 | 1313 | ||
@@ -1490,7 +1496,16 @@ CONFIG_GPIOLIB=y | |||
1490 | # AC97 GPIO expanders: | 1496 | # AC97 GPIO expanders: |
1491 | # | 1497 | # |
1492 | # CONFIG_W1 is not set | 1498 | # CONFIG_W1 is not set |
1493 | # CONFIG_POWER_SUPPLY is not set | 1499 | CONFIG_POWER_SUPPLY=y |
1500 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
1501 | # CONFIG_PDA_POWER is not set | ||
1502 | # CONFIG_APM_POWER is not set | ||
1503 | # CONFIG_TEST_POWER is not set | ||
1504 | # CONFIG_BATTERY_DS2760 is not set | ||
1505 | # CONFIG_BATTERY_DS2782 is not set | ||
1506 | # CONFIG_BATTERY_BQ27x00 is not set | ||
1507 | # CONFIG_BATTERY_MAX17040 is not set | ||
1508 | # CONFIG_CHARGER_PCF50633 is not set | ||
1494 | CONFIG_HWMON=y | 1509 | CONFIG_HWMON=y |
1495 | CONFIG_HWMON_VID=m | 1510 | CONFIG_HWMON_VID=m |
1496 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1511 | # CONFIG_HWMON_DEBUG_CHIP is not set |
@@ -1607,7 +1622,7 @@ CONFIG_MFD_SM501=y | |||
1607 | # CONFIG_HTC_PASIC3 is not set | 1622 | # CONFIG_HTC_PASIC3 is not set |
1608 | # CONFIG_HTC_I2CPLD is not set | 1623 | # CONFIG_HTC_I2CPLD is not set |
1609 | # CONFIG_UCB1400_CORE is not set | 1624 | # CONFIG_UCB1400_CORE is not set |
1610 | # CONFIG_TPS65010 is not set | 1625 | CONFIG_TPS65010=m |
1611 | # CONFIG_TWL4030_CORE is not set | 1626 | # CONFIG_TWL4030_CORE is not set |
1612 | # CONFIG_MFD_TMIO is not set | 1627 | # CONFIG_MFD_TMIO is not set |
1613 | # CONFIG_MFD_T7L66XB is not set | 1628 | # CONFIG_MFD_T7L66XB is not set |
@@ -1620,8 +1635,10 @@ CONFIG_MFD_SM501=y | |||
1620 | # CONFIG_MFD_WM831X is not set | 1635 | # CONFIG_MFD_WM831X is not set |
1621 | # CONFIG_MFD_WM8350_I2C is not set | 1636 | # CONFIG_MFD_WM8350_I2C is not set |
1622 | # CONFIG_MFD_WM8994 is not set | 1637 | # CONFIG_MFD_WM8994 is not set |
1623 | # CONFIG_MFD_PCF50633 is not set | 1638 | CONFIG_MFD_PCF50633=y |
1624 | # CONFIG_MFD_MC13783 is not set | 1639 | # CONFIG_MFD_MC13783 is not set |
1640 | # CONFIG_PCF50633_ADC is not set | ||
1641 | CONFIG_PCF50633_GPIO=y | ||
1625 | # CONFIG_AB3100_CORE is not set | 1642 | # CONFIG_AB3100_CORE is not set |
1626 | # CONFIG_EZX_PCAP is not set | 1643 | # CONFIG_EZX_PCAP is not set |
1627 | # CONFIG_AB4500_CORE is not set | 1644 | # CONFIG_AB4500_CORE is not set |
@@ -1737,6 +1754,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=y | |||
1737 | CONFIG_SND_S3C_I2SV2_SOC=m | 1754 | CONFIG_SND_S3C_I2SV2_SOC=m |
1738 | CONFIG_SND_S3C2412_SOC_I2S=m | 1755 | CONFIG_SND_S3C2412_SOC_I2S=m |
1739 | CONFIG_SND_S3C_SOC_AC97=m | 1756 | CONFIG_SND_S3C_SOC_AC97=m |
1757 | # CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set | ||
1740 | CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m | 1758 | CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m |
1741 | CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m | 1759 | CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m |
1742 | CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m | 1760 | CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m |
@@ -2045,6 +2063,7 @@ CONFIG_RTC_INTF_DEV=y | |||
2045 | # CONFIG_RTC_DRV_BQ4802 is not set | 2063 | # CONFIG_RTC_DRV_BQ4802 is not set |
2046 | # CONFIG_RTC_DRV_RP5C01 is not set | 2064 | # CONFIG_RTC_DRV_RP5C01 is not set |
2047 | # CONFIG_RTC_DRV_V3020 is not set | 2065 | # CONFIG_RTC_DRV_V3020 is not set |
2066 | # CONFIG_RTC_DRV_PCF50633 is not set | ||
2048 | 2067 | ||
2049 | # | 2068 | # |
2050 | # on-CPU RTC drivers | 2069 | # on-CPU RTC drivers |
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index 7d8b4cf3858c..2b642386f030 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig | |||
@@ -1,9 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.34 | 3 | # Linux kernel version: 2.6.34 |
4 | # Wed May 26 19:04:30 2010 | 4 | # Fri May 28 19:05:39 2010 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 8 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 9 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 10 | CONFIG_GENERIC_TIME=y |
@@ -253,12 +254,15 @@ CONFIG_S3C_GPIO_TRACK=y | |||
253 | # CONFIG_S3C_ADC is not set | 254 | # CONFIG_S3C_ADC is not set |
254 | CONFIG_S3C_DEV_HSMMC=y | 255 | CONFIG_S3C_DEV_HSMMC=y |
255 | CONFIG_S3C_DEV_HSMMC1=y | 256 | CONFIG_S3C_DEV_HSMMC1=y |
257 | CONFIG_S3C_DEV_HSMMC2=y | ||
258 | CONFIG_S3C_DEV_HWMON=y | ||
256 | CONFIG_S3C_DEV_I2C1=y | 259 | CONFIG_S3C_DEV_I2C1=y |
257 | CONFIG_S3C_DEV_FB=y | 260 | CONFIG_S3C_DEV_FB=y |
258 | CONFIG_S3C_DEV_USB_HOST=y | 261 | CONFIG_S3C_DEV_USB_HOST=y |
259 | CONFIG_S3C_DEV_USB_HSOTG=y | 262 | CONFIG_S3C_DEV_USB_HSOTG=y |
260 | CONFIG_S3C_DEV_WDT=y | 263 | CONFIG_S3C_DEV_WDT=y |
261 | CONFIG_S3C_DEV_NAND=y | 264 | CONFIG_S3C_DEV_NAND=y |
265 | CONFIG_S3C_DEV_RTC=y | ||
262 | CONFIG_SAMSUNG_DEV_ADC=y | 266 | CONFIG_SAMSUNG_DEV_ADC=y |
263 | CONFIG_SAMSUNG_DEV_TS=y | 267 | CONFIG_SAMSUNG_DEV_TS=y |
264 | CONFIG_S3C_DMA=y | 268 | CONFIG_S3C_DMA=y |
@@ -271,6 +275,7 @@ CONFIG_S3C_DMA=y | |||
271 | # CONFIG_SAMSUNG_PM_CHECK is not set | 275 | # CONFIG_SAMSUNG_PM_CHECK is not set |
272 | CONFIG_SAMSUNG_WAKEMASK=y | 276 | CONFIG_SAMSUNG_WAKEMASK=y |
273 | CONFIG_PLAT_S3C64XX=y | 277 | CONFIG_PLAT_S3C64XX=y |
278 | CONFIG_CPU_S3C6400=y | ||
274 | CONFIG_CPU_S3C6410=y | 279 | CONFIG_CPU_S3C6410=y |
275 | CONFIG_S3C64XX_DMA=y | 280 | CONFIG_S3C64XX_DMA=y |
276 | CONFIG_S3C64XX_SETUP_SDHCI=y | 281 | CONFIG_S3C64XX_SETUP_SDHCI=y |
@@ -278,17 +283,18 @@ CONFIG_S3C64XX_SETUP_I2C0=y | |||
278 | CONFIG_S3C64XX_SETUP_I2C1=y | 283 | CONFIG_S3C64XX_SETUP_I2C1=y |
279 | CONFIG_S3C64XX_SETUP_FB_24BPP=y | 284 | CONFIG_S3C64XX_SETUP_FB_24BPP=y |
280 | CONFIG_S3C64XX_SETUP_SDHCI_GPIO=y | 285 | CONFIG_S3C64XX_SETUP_SDHCI_GPIO=y |
281 | # CONFIG_MACH_SMDK6400 is not set | 286 | CONFIG_MACH_SMDK6400=y |
282 | # CONFIG_MACH_ANW6410 is not set | 287 | CONFIG_MACH_ANW6410=y |
283 | CONFIG_MACH_SMDK6410=y | 288 | CONFIG_MACH_SMDK6410=y |
284 | CONFIG_SMDK6410_SD_CH0=y | 289 | CONFIG_SMDK6410_SD_CH0=y |
285 | # CONFIG_SMDK6410_SD_CH1 is not set | 290 | # CONFIG_SMDK6410_SD_CH1 is not set |
286 | # CONFIG_SMDK6410_WM1190_EV1 is not set | 291 | # CONFIG_SMDK6410_WM1190_EV1 is not set |
287 | # CONFIG_SMDK6410_WM1192_EV1 is not set | 292 | # CONFIG_SMDK6410_WM1192_EV1 is not set |
288 | # CONFIG_MACH_NCP is not set | 293 | CONFIG_MACH_NCP=y |
289 | # CONFIG_MACH_HMT is not set | 294 | CONFIG_MACH_HMT=y |
290 | # CONFIG_MACH_SMARTQ5 is not set | 295 | CONFIG_MACH_SMARTQ=y |
291 | # CONFIG_MACH_SMARTQ7 is not set | 296 | CONFIG_MACH_SMARTQ5=y |
297 | CONFIG_MACH_SMARTQ7=y | ||
292 | 298 | ||
293 | # | 299 | # |
294 | # Processor Type | 300 | # Processor Type |
@@ -475,6 +481,9 @@ CONFIG_MTD_CFI_I2=y | |||
475 | # | 481 | # |
476 | # Self-contained MTD device drivers | 482 | # Self-contained MTD device drivers |
477 | # | 483 | # |
484 | # CONFIG_MTD_DATAFLASH is not set | ||
485 | # CONFIG_MTD_M25P80 is not set | ||
486 | # CONFIG_MTD_SST25L is not set | ||
478 | # CONFIG_MTD_SLRAM is not set | 487 | # CONFIG_MTD_SLRAM is not set |
479 | # CONFIG_MTD_PHRAM is not set | 488 | # CONFIG_MTD_PHRAM is not set |
480 | # CONFIG_MTD_MTDRAM is not set | 489 | # CONFIG_MTD_MTDRAM is not set |
@@ -501,6 +510,7 @@ CONFIG_MTD_NAND_S3C2410=y | |||
501 | # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set | 510 | # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set |
502 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 511 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
503 | # CONFIG_MTD_NAND_PLATFORM is not set | 512 | # CONFIG_MTD_NAND_PLATFORM is not set |
513 | # CONFIG_MTD_ALAUDA is not set | ||
504 | # CONFIG_MTD_ONENAND is not set | 514 | # CONFIG_MTD_ONENAND is not set |
505 | 515 | ||
506 | # | 516 | # |
@@ -521,6 +531,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
521 | # | 531 | # |
522 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | 532 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected |
523 | # | 533 | # |
534 | # CONFIG_BLK_DEV_UB is not set | ||
524 | CONFIG_BLK_DEV_RAM=y | 535 | CONFIG_BLK_DEV_RAM=y |
525 | CONFIG_BLK_DEV_RAM_COUNT=16 | 536 | CONFIG_BLK_DEV_RAM_COUNT=16 |
526 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 537 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
@@ -534,12 +545,14 @@ CONFIG_MISC_DEVICES=y | |||
534 | # CONFIG_ISL29003 is not set | 545 | # CONFIG_ISL29003 is not set |
535 | # CONFIG_SENSORS_TSL2550 is not set | 546 | # CONFIG_SENSORS_TSL2550 is not set |
536 | # CONFIG_DS1682 is not set | 547 | # CONFIG_DS1682 is not set |
548 | # CONFIG_TI_DAC7512 is not set | ||
537 | # CONFIG_C2PORT is not set | 549 | # CONFIG_C2PORT is not set |
538 | 550 | ||
539 | # | 551 | # |
540 | # EEPROM support | 552 | # EEPROM support |
541 | # | 553 | # |
542 | CONFIG_EEPROM_AT24=y | 554 | CONFIG_EEPROM_AT24=y |
555 | # CONFIG_EEPROM_AT25 is not set | ||
543 | # CONFIG_EEPROM_LEGACY is not set | 556 | # CONFIG_EEPROM_LEGACY is not set |
544 | # CONFIG_EEPROM_MAX6875 is not set | 557 | # CONFIG_EEPROM_MAX6875 is not set |
545 | # CONFIG_EEPROM_93CX6 is not set | 558 | # CONFIG_EEPROM_93CX6 is not set |
@@ -654,6 +667,7 @@ CONFIG_SERIAL_SAMSUNG_UARTS=4 | |||
654 | # CONFIG_SERIAL_SAMSUNG_DEBUG is not set | 667 | # CONFIG_SERIAL_SAMSUNG_DEBUG is not set |
655 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y | 668 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y |
656 | CONFIG_SERIAL_S3C6400=y | 669 | CONFIG_SERIAL_S3C6400=y |
670 | # CONFIG_SERIAL_MAX3100 is not set | ||
657 | CONFIG_SERIAL_CORE=y | 671 | CONFIG_SERIAL_CORE=y |
658 | CONFIG_SERIAL_CORE_CONSOLE=y | 672 | CONFIG_SERIAL_CORE_CONSOLE=y |
659 | # CONFIG_SERIAL_TIMBERDALE is not set | 673 | # CONFIG_SERIAL_TIMBERDALE is not set |
@@ -694,6 +708,7 @@ CONFIG_I2C_S3C2410=y | |||
694 | # | 708 | # |
695 | # CONFIG_I2C_PARPORT_LIGHT is not set | 709 | # CONFIG_I2C_PARPORT_LIGHT is not set |
696 | # CONFIG_I2C_TAOS_EVM is not set | 710 | # CONFIG_I2C_TAOS_EVM is not set |
711 | # CONFIG_I2C_TINY_USB is not set | ||
697 | 712 | ||
698 | # | 713 | # |
699 | # Other I2C/SMBus bus drivers | 714 | # Other I2C/SMBus bus drivers |
@@ -703,7 +718,24 @@ CONFIG_I2C_S3C2410=y | |||
703 | # CONFIG_I2C_DEBUG_CORE is not set | 718 | # CONFIG_I2C_DEBUG_CORE is not set |
704 | # CONFIG_I2C_DEBUG_ALGO is not set | 719 | # CONFIG_I2C_DEBUG_ALGO is not set |
705 | # CONFIG_I2C_DEBUG_BUS is not set | 720 | # CONFIG_I2C_DEBUG_BUS is not set |
706 | # CONFIG_SPI is not set | 721 | CONFIG_SPI=y |
722 | # CONFIG_SPI_DEBUG is not set | ||
723 | CONFIG_SPI_MASTER=y | ||
724 | |||
725 | # | ||
726 | # SPI Master Controller Drivers | ||
727 | # | ||
728 | CONFIG_SPI_BITBANG=m | ||
729 | CONFIG_SPI_GPIO=m | ||
730 | CONFIG_SPI_S3C64XX=m | ||
731 | # CONFIG_SPI_XILINX is not set | ||
732 | # CONFIG_SPI_DESIGNWARE is not set | ||
733 | |||
734 | # | ||
735 | # SPI Protocol Masters | ||
736 | # | ||
737 | # CONFIG_SPI_SPIDEV is not set | ||
738 | # CONFIG_SPI_TLE62X0 is not set | ||
707 | 739 | ||
708 | # | 740 | # |
709 | # PPS support | 741 | # PPS support |
@@ -735,6 +767,9 @@ CONFIG_GPIOLIB=y | |||
735 | # | 767 | # |
736 | # SPI GPIO expanders: | 768 | # SPI GPIO expanders: |
737 | # | 769 | # |
770 | # CONFIG_GPIO_MAX7301 is not set | ||
771 | # CONFIG_GPIO_MCP23S08 is not set | ||
772 | # CONFIG_GPIO_MC33880 is not set | ||
738 | 773 | ||
739 | # | 774 | # |
740 | # AC97 GPIO expanders: | 775 | # AC97 GPIO expanders: |
@@ -750,6 +785,7 @@ CONFIG_HWMON=y | |||
750 | # | 785 | # |
751 | # CONFIG_SENSORS_AD7414 is not set | 786 | # CONFIG_SENSORS_AD7414 is not set |
752 | # CONFIG_SENSORS_AD7418 is not set | 787 | # CONFIG_SENSORS_AD7418 is not set |
788 | # CONFIG_SENSORS_ADCXX is not set | ||
753 | # CONFIG_SENSORS_ADM1021 is not set | 789 | # CONFIG_SENSORS_ADM1021 is not set |
754 | # CONFIG_SENSORS_ADM1025 is not set | 790 | # CONFIG_SENSORS_ADM1025 is not set |
755 | # CONFIG_SENSORS_ADM1026 is not set | 791 | # CONFIG_SENSORS_ADM1026 is not set |
@@ -771,6 +807,7 @@ CONFIG_HWMON=y | |||
771 | # CONFIG_SENSORS_GL520SM is not set | 807 | # CONFIG_SENSORS_GL520SM is not set |
772 | # CONFIG_SENSORS_IT87 is not set | 808 | # CONFIG_SENSORS_IT87 is not set |
773 | # CONFIG_SENSORS_LM63 is not set | 809 | # CONFIG_SENSORS_LM63 is not set |
810 | # CONFIG_SENSORS_LM70 is not set | ||
774 | # CONFIG_SENSORS_LM73 is not set | 811 | # CONFIG_SENSORS_LM73 is not set |
775 | # CONFIG_SENSORS_LM75 is not set | 812 | # CONFIG_SENSORS_LM75 is not set |
776 | # CONFIG_SENSORS_LM77 is not set | 813 | # CONFIG_SENSORS_LM77 is not set |
@@ -785,6 +822,7 @@ CONFIG_HWMON=y | |||
785 | # CONFIG_SENSORS_LTC4215 is not set | 822 | # CONFIG_SENSORS_LTC4215 is not set |
786 | # CONFIG_SENSORS_LTC4245 is not set | 823 | # CONFIG_SENSORS_LTC4245 is not set |
787 | # CONFIG_SENSORS_LM95241 is not set | 824 | # CONFIG_SENSORS_LM95241 is not set |
825 | # CONFIG_SENSORS_MAX1111 is not set | ||
788 | # CONFIG_SENSORS_MAX1619 is not set | 826 | # CONFIG_SENSORS_MAX1619 is not set |
789 | # CONFIG_SENSORS_MAX6650 is not set | 827 | # CONFIG_SENSORS_MAX6650 is not set |
790 | # CONFIG_SENSORS_PC87360 is not set | 828 | # CONFIG_SENSORS_PC87360 is not set |
@@ -796,6 +834,7 @@ CONFIG_HWMON=y | |||
796 | # CONFIG_SENSORS_SMSC47M192 is not set | 834 | # CONFIG_SENSORS_SMSC47M192 is not set |
797 | # CONFIG_SENSORS_SMSC47B397 is not set | 835 | # CONFIG_SENSORS_SMSC47B397 is not set |
798 | # CONFIG_SENSORS_ADS7828 is not set | 836 | # CONFIG_SENSORS_ADS7828 is not set |
837 | # CONFIG_SENSORS_ADS7871 is not set | ||
799 | # CONFIG_SENSORS_AMC6821 is not set | 838 | # CONFIG_SENSORS_AMC6821 is not set |
800 | # CONFIG_SENSORS_THMC50 is not set | 839 | # CONFIG_SENSORS_THMC50 is not set |
801 | # CONFIG_SENSORS_TMP401 is not set | 840 | # CONFIG_SENSORS_TMP401 is not set |
@@ -809,6 +848,7 @@ CONFIG_HWMON=y | |||
809 | # CONFIG_SENSORS_W83L786NG is not set | 848 | # CONFIG_SENSORS_W83L786NG is not set |
810 | # CONFIG_SENSORS_W83627HF is not set | 849 | # CONFIG_SENSORS_W83627HF is not set |
811 | # CONFIG_SENSORS_W83627EHF is not set | 850 | # CONFIG_SENSORS_W83627EHF is not set |
851 | # CONFIG_SENSORS_LIS3_SPI is not set | ||
812 | # CONFIG_SENSORS_LIS3_I2C is not set | 852 | # CONFIG_SENSORS_LIS3_I2C is not set |
813 | # CONFIG_THERMAL is not set | 853 | # CONFIG_THERMAL is not set |
814 | # CONFIG_WATCHDOG is not set | 854 | # CONFIG_WATCHDOG is not set |
@@ -845,7 +885,10 @@ CONFIG_SSB_POSSIBLE=y | |||
845 | # CONFIG_MFD_WM8350_I2C is not set | 885 | # CONFIG_MFD_WM8350_I2C is not set |
846 | # CONFIG_MFD_WM8994 is not set | 886 | # CONFIG_MFD_WM8994 is not set |
847 | # CONFIG_MFD_PCF50633 is not set | 887 | # CONFIG_MFD_PCF50633 is not set |
888 | # CONFIG_MFD_MC13783 is not set | ||
848 | # CONFIG_AB3100_CORE is not set | 889 | # CONFIG_AB3100_CORE is not set |
890 | # CONFIG_EZX_PCAP is not set | ||
891 | # CONFIG_AB4500_CORE is not set | ||
849 | # CONFIG_REGULATOR is not set | 892 | # CONFIG_REGULATOR is not set |
850 | # CONFIG_MEDIA_SUPPORT is not set | 893 | # CONFIG_MEDIA_SUPPORT is not set |
851 | 894 | ||
@@ -854,8 +897,47 @@ CONFIG_SSB_POSSIBLE=y | |||
854 | # | 897 | # |
855 | # CONFIG_VGASTATE is not set | 898 | # CONFIG_VGASTATE is not set |
856 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 899 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
857 | # CONFIG_FB is not set | 900 | CONFIG_FB=y |
858 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 901 | # CONFIG_FIRMWARE_EDID is not set |
902 | # CONFIG_FB_DDC is not set | ||
903 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
904 | CONFIG_FB_CFB_FILLRECT=y | ||
905 | CONFIG_FB_CFB_COPYAREA=y | ||
906 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
907 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
908 | # CONFIG_FB_SYS_FILLRECT is not set | ||
909 | # CONFIG_FB_SYS_COPYAREA is not set | ||
910 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
911 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
912 | # CONFIG_FB_SYS_FOPS is not set | ||
913 | # CONFIG_FB_SVGALIB is not set | ||
914 | # CONFIG_FB_MACMODES is not set | ||
915 | # CONFIG_FB_BACKLIGHT is not set | ||
916 | # CONFIG_FB_MODE_HELPERS is not set | ||
917 | # CONFIG_FB_TILEBLITTING is not set | ||
918 | |||
919 | # | ||
920 | # Frame buffer hardware drivers | ||
921 | # | ||
922 | # CONFIG_FB_S1D13XXX is not set | ||
923 | CONFIG_FB_S3C=y | ||
924 | # CONFIG_FB_S3C_DEBUG_REGWRITE is not set | ||
925 | # CONFIG_FB_VIRTUAL is not set | ||
926 | # CONFIG_FB_METRONOME is not set | ||
927 | # CONFIG_FB_MB862XX is not set | ||
928 | # CONFIG_FB_BROADSHEET is not set | ||
929 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
930 | CONFIG_LCD_CLASS_DEVICE=y | ||
931 | # CONFIG_LCD_L4F00242T03 is not set | ||
932 | # CONFIG_LCD_LMS283GF05 is not set | ||
933 | CONFIG_LCD_LTV350QV=y | ||
934 | # CONFIG_LCD_ILI9320 is not set | ||
935 | # CONFIG_LCD_TDO24M is not set | ||
936 | # CONFIG_LCD_VGG2432A4 is not set | ||
937 | # CONFIG_LCD_PLATFORM is not set | ||
938 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
939 | CONFIG_BACKLIGHT_GENERIC=y | ||
940 | CONFIG_BACKLIGHT_PWM=y | ||
859 | 941 | ||
860 | # | 942 | # |
861 | # Display device support | 943 | # Display device support |
@@ -867,6 +949,8 @@ CONFIG_SSB_POSSIBLE=y | |||
867 | # | 949 | # |
868 | # CONFIG_VGA_CONSOLE is not set | 950 | # CONFIG_VGA_CONSOLE is not set |
869 | CONFIG_DUMMY_CONSOLE=y | 951 | CONFIG_DUMMY_CONSOLE=y |
952 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
953 | # CONFIG_LOGO is not set | ||
870 | CONFIG_SOUND=y | 954 | CONFIG_SOUND=y |
871 | CONFIG_SOUND_OSS_CORE=y | 955 | CONFIG_SOUND_OSS_CORE=y |
872 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | 956 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y |
@@ -895,6 +979,11 @@ CONFIG_SND_DRIVERS=y | |||
895 | # CONFIG_SND_SERIAL_U16550 is not set | 979 | # CONFIG_SND_SERIAL_U16550 is not set |
896 | # CONFIG_SND_MPU401 is not set | 980 | # CONFIG_SND_MPU401 is not set |
897 | CONFIG_SND_ARM=y | 981 | CONFIG_SND_ARM=y |
982 | CONFIG_SND_SPI=y | ||
983 | CONFIG_SND_USB=y | ||
984 | # CONFIG_SND_USB_AUDIO is not set | ||
985 | # CONFIG_SND_USB_UA101 is not set | ||
986 | # CONFIG_SND_USB_CAIAQ is not set | ||
898 | CONFIG_SND_SOC=m | 987 | CONFIG_SND_SOC=m |
899 | CONFIG_SND_SOC_AC97_BUS=y | 988 | CONFIG_SND_SOC_AC97_BUS=y |
900 | CONFIG_SND_S3C24XX_SOC=m | 989 | CONFIG_SND_S3C24XX_SOC=m |
@@ -909,29 +998,197 @@ CONFIG_AC97_BUS=m | |||
909 | CONFIG_HID_SUPPORT=y | 998 | CONFIG_HID_SUPPORT=y |
910 | CONFIG_HID=y | 999 | CONFIG_HID=y |
911 | # CONFIG_HIDRAW is not set | 1000 | # CONFIG_HIDRAW is not set |
1001 | |||
1002 | # | ||
1003 | # USB Input Devices | ||
1004 | # | ||
1005 | CONFIG_USB_HID=y | ||
912 | # CONFIG_HID_PID is not set | 1006 | # CONFIG_HID_PID is not set |
1007 | # CONFIG_USB_HIDDEV is not set | ||
913 | 1008 | ||
914 | # | 1009 | # |
915 | # Special HID drivers | 1010 | # Special HID drivers |
916 | # | 1011 | # |
1012 | # CONFIG_HID_3M_PCT is not set | ||
1013 | CONFIG_HID_A4TECH=y | ||
1014 | CONFIG_HID_APPLE=y | ||
1015 | CONFIG_HID_BELKIN=y | ||
1016 | # CONFIG_HID_CANDO is not set | ||
1017 | CONFIG_HID_CHERRY=y | ||
1018 | CONFIG_HID_CHICONY=y | ||
1019 | # CONFIG_HID_PRODIKEYS is not set | ||
1020 | CONFIG_HID_CYPRESS=y | ||
1021 | # CONFIG_HID_DRAGONRISE is not set | ||
1022 | # CONFIG_HID_EGALAX is not set | ||
1023 | CONFIG_HID_EZKEY=y | ||
1024 | CONFIG_HID_KYE=y | ||
1025 | # CONFIG_HID_GYRATION is not set | ||
1026 | # CONFIG_HID_TWINHAN is not set | ||
1027 | CONFIG_HID_KENSINGTON=y | ||
1028 | CONFIG_HID_LOGITECH=y | ||
1029 | # CONFIG_LOGITECH_FF is not set | ||
1030 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1031 | # CONFIG_LOGIG940_FF is not set | ||
1032 | CONFIG_HID_MICROSOFT=y | ||
1033 | # CONFIG_HID_MOSART is not set | ||
1034 | CONFIG_HID_MONTEREY=y | ||
1035 | # CONFIG_HID_NTRIG is not set | ||
1036 | # CONFIG_HID_ORTEK is not set | ||
1037 | # CONFIG_HID_PANTHERLORD is not set | ||
1038 | # CONFIG_HID_PETALYNX is not set | ||
1039 | # CONFIG_HID_PICOLCD is not set | ||
1040 | # CONFIG_HID_QUANTA is not set | ||
1041 | # CONFIG_HID_ROCCAT_KONE is not set | ||
1042 | # CONFIG_HID_SAMSUNG is not set | ||
1043 | # CONFIG_HID_SONY is not set | ||
1044 | # CONFIG_HID_STANTUM is not set | ||
1045 | # CONFIG_HID_SUNPLUS is not set | ||
1046 | # CONFIG_HID_GREENASIA is not set | ||
1047 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1048 | # CONFIG_HID_TOPSEED is not set | ||
1049 | # CONFIG_HID_THRUSTMASTER is not set | ||
1050 | # CONFIG_HID_ZEROPLUS is not set | ||
1051 | # CONFIG_HID_ZYDACRON is not set | ||
917 | CONFIG_USB_SUPPORT=y | 1052 | CONFIG_USB_SUPPORT=y |
918 | CONFIG_USB_ARCH_HAS_HCD=y | 1053 | CONFIG_USB_ARCH_HAS_HCD=y |
919 | CONFIG_USB_ARCH_HAS_OHCI=y | 1054 | CONFIG_USB_ARCH_HAS_OHCI=y |
920 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1055 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
921 | # CONFIG_USB is not set | 1056 | CONFIG_USB=y |
1057 | # CONFIG_USB_DEBUG is not set | ||
1058 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
922 | 1059 | ||
923 | # | 1060 | # |
924 | # Enable Host or Gadget support to see Inventra options | 1061 | # Miscellaneous USB options |
925 | # | 1062 | # |
1063 | CONFIG_USB_DEVICEFS=y | ||
1064 | CONFIG_USB_DEVICE_CLASS=y | ||
1065 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
1066 | # CONFIG_USB_MON is not set | ||
1067 | # CONFIG_USB_WUSB is not set | ||
1068 | # CONFIG_USB_WUSB_CBAF is not set | ||
1069 | |||
1070 | # | ||
1071 | # USB Host Controller Drivers | ||
1072 | # | ||
1073 | # CONFIG_USB_C67X00_HCD is not set | ||
1074 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1075 | # CONFIG_USB_ISP116X_HCD is not set | ||
1076 | # CONFIG_USB_ISP1760_HCD is not set | ||
1077 | # CONFIG_USB_ISP1362_HCD is not set | ||
1078 | CONFIG_USB_OHCI_HCD=y | ||
1079 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
1080 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
1081 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
1082 | # CONFIG_USB_SL811_HCD is not set | ||
1083 | # CONFIG_USB_R8A66597_HCD is not set | ||
1084 | # CONFIG_USB_HWA_HCD is not set | ||
1085 | # CONFIG_USB_MUSB_HDRC is not set | ||
1086 | |||
1087 | # | ||
1088 | # USB Device Class drivers | ||
1089 | # | ||
1090 | CONFIG_USB_ACM=m | ||
1091 | CONFIG_USB_PRINTER=m | ||
1092 | # CONFIG_USB_WDM is not set | ||
1093 | # CONFIG_USB_TMC is not set | ||
926 | 1094 | ||
927 | # | 1095 | # |
928 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may | 1096 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
929 | # | 1097 | # |
1098 | |||
1099 | # | ||
1100 | # also be needed; see USB_STORAGE Help for more info | ||
1101 | # | ||
1102 | # CONFIG_USB_LIBUSUAL is not set | ||
1103 | |||
1104 | # | ||
1105 | # USB Imaging devices | ||
1106 | # | ||
1107 | # CONFIG_USB_MDC800 is not set | ||
1108 | |||
1109 | # | ||
1110 | # USB port drivers | ||
1111 | # | ||
1112 | CONFIG_USB_SERIAL=m | ||
1113 | # CONFIG_USB_EZUSB is not set | ||
1114 | CONFIG_USB_SERIAL_GENERIC=y | ||
1115 | # CONFIG_USB_SERIAL_AIRCABLE is not set | ||
1116 | # CONFIG_USB_SERIAL_ARK3116 is not set | ||
1117 | # CONFIG_USB_SERIAL_BELKIN is not set | ||
1118 | # CONFIG_USB_SERIAL_CH341 is not set | ||
1119 | # CONFIG_USB_SERIAL_WHITEHEAT is not set | ||
1120 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | ||
1121 | # CONFIG_USB_SERIAL_CP210X is not set | ||
1122 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set | ||
1123 | CONFIG_USB_SERIAL_EMPEG=m | ||
1124 | CONFIG_USB_SERIAL_FTDI_SIO=m | ||
1125 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
1126 | # CONFIG_USB_SERIAL_VISOR is not set | ||
1127 | # CONFIG_USB_SERIAL_IPAQ is not set | ||
1128 | # CONFIG_USB_SERIAL_IR is not set | ||
1129 | # CONFIG_USB_SERIAL_EDGEPORT is not set | ||
1130 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | ||
1131 | # CONFIG_USB_SERIAL_GARMIN is not set | ||
1132 | # CONFIG_USB_SERIAL_IPW is not set | ||
1133 | # CONFIG_USB_SERIAL_IUU is not set | ||
1134 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | ||
1135 | # CONFIG_USB_SERIAL_KEYSPAN is not set | ||
1136 | # CONFIG_USB_SERIAL_KLSI is not set | ||
1137 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | ||
1138 | # CONFIG_USB_SERIAL_MCT_U232 is not set | ||
1139 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
1140 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
1141 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1142 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
1143 | CONFIG_USB_SERIAL_PL2303=m | ||
1144 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
1145 | # CONFIG_USB_SERIAL_QCAUX is not set | ||
1146 | # CONFIG_USB_SERIAL_QUALCOMM is not set | ||
1147 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1148 | # CONFIG_USB_SERIAL_HP4X is not set | ||
1149 | # CONFIG_USB_SERIAL_SAFE is not set | ||
1150 | # CONFIG_USB_SERIAL_SIEMENS_MPI is not set | ||
1151 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | ||
1152 | # CONFIG_USB_SERIAL_SYMBOL is not set | ||
1153 | # CONFIG_USB_SERIAL_TI is not set | ||
1154 | # CONFIG_USB_SERIAL_CYBERJACK is not set | ||
1155 | # CONFIG_USB_SERIAL_XIRCOM is not set | ||
1156 | # CONFIG_USB_SERIAL_OPTION is not set | ||
1157 | # CONFIG_USB_SERIAL_OMNINET is not set | ||
1158 | # CONFIG_USB_SERIAL_OPTICON is not set | ||
1159 | # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set | ||
1160 | # CONFIG_USB_SERIAL_ZIO is not set | ||
1161 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
1162 | |||
1163 | # | ||
1164 | # USB Miscellaneous drivers | ||
1165 | # | ||
1166 | # CONFIG_USB_EMI62 is not set | ||
1167 | # CONFIG_USB_EMI26 is not set | ||
1168 | # CONFIG_USB_ADUTUX is not set | ||
1169 | # CONFIG_USB_SEVSEG is not set | ||
1170 | # CONFIG_USB_RIO500 is not set | ||
1171 | # CONFIG_USB_LEGOTOWER is not set | ||
1172 | # CONFIG_USB_LCD is not set | ||
1173 | # CONFIG_USB_LED is not set | ||
1174 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
1175 | # CONFIG_USB_CYTHERM is not set | ||
1176 | # CONFIG_USB_IDMOUSE is not set | ||
1177 | # CONFIG_USB_FTDI_ELAN is not set | ||
1178 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1179 | # CONFIG_USB_LD is not set | ||
1180 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1181 | # CONFIG_USB_IOWARRIOR is not set | ||
1182 | # CONFIG_USB_TEST is not set | ||
1183 | # CONFIG_USB_ISIGHTFW is not set | ||
930 | # CONFIG_USB_GADGET is not set | 1184 | # CONFIG_USB_GADGET is not set |
931 | 1185 | ||
932 | # | 1186 | # |
933 | # OTG and related infrastructure | 1187 | # OTG and related infrastructure |
934 | # | 1188 | # |
1189 | # CONFIG_USB_GPIO_VBUS is not set | ||
1190 | # CONFIG_USB_ULPI is not set | ||
1191 | # CONFIG_NOP_USB_XCEIV is not set | ||
935 | CONFIG_MMC=y | 1192 | CONFIG_MMC=y |
936 | CONFIG_MMC_DEBUG=y | 1193 | CONFIG_MMC_DEBUG=y |
937 | CONFIG_MMC_UNSAFE_RESUME=y | 1194 | CONFIG_MMC_UNSAFE_RESUME=y |
@@ -951,11 +1208,77 @@ CONFIG_MMC_SDHCI=y | |||
951 | # CONFIG_MMC_SDHCI_PLTFM is not set | 1208 | # CONFIG_MMC_SDHCI_PLTFM is not set |
952 | CONFIG_MMC_SDHCI_S3C=y | 1209 | CONFIG_MMC_SDHCI_S3C=y |
953 | # CONFIG_MMC_SDHCI_S3C_DMA is not set | 1210 | # CONFIG_MMC_SDHCI_S3C_DMA is not set |
1211 | # CONFIG_MMC_SPI is not set | ||
954 | # CONFIG_MEMSTICK is not set | 1212 | # CONFIG_MEMSTICK is not set |
955 | # CONFIG_NEW_LEDS is not set | 1213 | # CONFIG_NEW_LEDS is not set |
956 | # CONFIG_ACCESSIBILITY is not set | 1214 | # CONFIG_ACCESSIBILITY is not set |
957 | CONFIG_RTC_LIB=y | 1215 | CONFIG_RTC_LIB=y |
958 | # CONFIG_RTC_CLASS is not set | 1216 | CONFIG_RTC_CLASS=y |
1217 | CONFIG_RTC_HCTOSYS=y | ||
1218 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1219 | # CONFIG_RTC_DEBUG is not set | ||
1220 | |||
1221 | # | ||
1222 | # RTC interfaces | ||
1223 | # | ||
1224 | CONFIG_RTC_INTF_SYSFS=y | ||
1225 | CONFIG_RTC_INTF_PROC=y | ||
1226 | CONFIG_RTC_INTF_DEV=y | ||
1227 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1228 | # CONFIG_RTC_DRV_TEST is not set | ||
1229 | |||
1230 | # | ||
1231 | # I2C RTC drivers | ||
1232 | # | ||
1233 | # CONFIG_RTC_DRV_DS1307 is not set | ||
1234 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1235 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1236 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1237 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1238 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1239 | # CONFIG_RTC_DRV_X1205 is not set | ||
1240 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1241 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1242 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1243 | # CONFIG_RTC_DRV_BQ32K is not set | ||
1244 | # CONFIG_RTC_DRV_S35390A is not set | ||
1245 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1246 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1247 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1248 | |||
1249 | # | ||
1250 | # SPI RTC drivers | ||
1251 | # | ||
1252 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1253 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1254 | # CONFIG_RTC_DRV_DS1390 is not set | ||
1255 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
1256 | # CONFIG_RTC_DRV_R9701 is not set | ||
1257 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
1258 | # CONFIG_RTC_DRV_DS3234 is not set | ||
1259 | # CONFIG_RTC_DRV_PCF2123 is not set | ||
1260 | |||
1261 | # | ||
1262 | # Platform RTC drivers | ||
1263 | # | ||
1264 | # CONFIG_RTC_DRV_CMOS is not set | ||
1265 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1266 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1267 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1268 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1269 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1270 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1271 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1272 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1273 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
1274 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1275 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
1276 | # CONFIG_RTC_DRV_V3020 is not set | ||
1277 | |||
1278 | # | ||
1279 | # on-CPU RTC drivers | ||
1280 | # | ||
1281 | CONFIG_RTC_DRV_S3C=y | ||
959 | # CONFIG_DMADEVICES is not set | 1282 | # CONFIG_DMADEVICES is not set |
960 | # CONFIG_AUXDISPLAY is not set | 1283 | # CONFIG_AUXDISPLAY is not set |
961 | # CONFIG_UIO is not set | 1284 | # CONFIG_UIO is not set |
@@ -1052,7 +1375,46 @@ CONFIG_ROMFS_ON_BLOCK=y | |||
1052 | # | 1375 | # |
1053 | # CONFIG_PARTITION_ADVANCED is not set | 1376 | # CONFIG_PARTITION_ADVANCED is not set |
1054 | CONFIG_MSDOS_PARTITION=y | 1377 | CONFIG_MSDOS_PARTITION=y |
1055 | # CONFIG_NLS is not set | 1378 | CONFIG_NLS=y |
1379 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1380 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1381 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1382 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1383 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1384 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1385 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1386 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1387 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1388 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1389 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1390 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1391 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1392 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1393 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1394 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1395 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1396 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1397 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1398 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1399 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1400 | # CONFIG_NLS_ISO8859_8 is not set | ||
1401 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1402 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1403 | # CONFIG_NLS_ASCII is not set | ||
1404 | # CONFIG_NLS_ISO8859_1 is not set | ||
1405 | # CONFIG_NLS_ISO8859_2 is not set | ||
1406 | # CONFIG_NLS_ISO8859_3 is not set | ||
1407 | # CONFIG_NLS_ISO8859_4 is not set | ||
1408 | # CONFIG_NLS_ISO8859_5 is not set | ||
1409 | # CONFIG_NLS_ISO8859_6 is not set | ||
1410 | # CONFIG_NLS_ISO8859_7 is not set | ||
1411 | # CONFIG_NLS_ISO8859_9 is not set | ||
1412 | # CONFIG_NLS_ISO8859_13 is not set | ||
1413 | # CONFIG_NLS_ISO8859_14 is not set | ||
1414 | # CONFIG_NLS_ISO8859_15 is not set | ||
1415 | # CONFIG_NLS_KOI8_R is not set | ||
1416 | # CONFIG_NLS_KOI8_U is not set | ||
1417 | # CONFIG_NLS_UTF8 is not set | ||
1056 | 1418 | ||
1057 | # | 1419 | # |
1058 | # Kernel hacking | 1420 | # Kernel hacking |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index abd04932917b..2ec3095ffb7b 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
18 | #include <linux/i2c/at24.h> | 18 | #include <linux/i2c/at24.h> |
19 | #include <linux/i2c/pca953x.h> | 19 | #include <linux/i2c/pca953x.h> |
20 | #include <linux/mfd/tps6507x.h> | ||
20 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
21 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
22 | #include <linux/mtd/mtd.h> | 23 | #include <linux/mtd/mtd.h> |
@@ -24,6 +25,8 @@ | |||
24 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
25 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
26 | #include <linux/regulator/machine.h> | 27 | #include <linux/regulator/machine.h> |
28 | #include <linux/mfd/tps6507x.h> | ||
29 | #include <linux/input/tps6507x-ts.h> | ||
27 | 30 | ||
28 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
@@ -533,10 +536,24 @@ struct regulator_init_data tps65070_regulator_data[] = { | |||
533 | }, | 536 | }, |
534 | }; | 537 | }; |
535 | 538 | ||
539 | static struct touchscreen_init_data tps6507x_touchscreen_data = { | ||
540 | .poll_period = 30, /* ms between touch samples */ | ||
541 | .min_pressure = 0x30, /* minimum pressure to trigger touch */ | ||
542 | .vref = 0, /* turn off vref when not using A/D */ | ||
543 | .vendor = 0, /* /sys/class/input/input?/id/vendor */ | ||
544 | .product = 65070, /* /sys/class/input/input?/id/product */ | ||
545 | .version = 0x100, /* /sys/class/input/input?/id/version */ | ||
546 | }; | ||
547 | |||
548 | static struct tps6507x_board tps_board = { | ||
549 | .tps6507x_pmic_init_data = &tps65070_regulator_data[0], | ||
550 | .tps6507x_ts_init_data = &tps6507x_touchscreen_data, | ||
551 | }; | ||
552 | |||
536 | static struct i2c_board_info __initdata da850evm_tps65070_info[] = { | 553 | static struct i2c_board_info __initdata da850evm_tps65070_info[] = { |
537 | { | 554 | { |
538 | I2C_BOARD_INFO("tps6507x", 0x48), | 555 | I2C_BOARD_INFO("tps6507x", 0x48), |
539 | .platform_data = &tps65070_regulator_data[0], | 556 | .platform_data = &tps_board, |
540 | }, | 557 | }, |
541 | }; | 558 | }; |
542 | 559 | ||
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 7a4138beb665..fbd85a9b7bbf 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c | |||
@@ -259,6 +259,12 @@ static struct clk init_clocks[] = { | |||
259 | .enable = s3c64xx_hclk_ctrl, | 259 | .enable = s3c64xx_hclk_ctrl, |
260 | .ctrlbit = S3C_CLKCON_HCLK_HSMMC2, | 260 | .ctrlbit = S3C_CLKCON_HCLK_HSMMC2, |
261 | }, { | 261 | }, { |
262 | .name = "otg", | ||
263 | .id = -1, | ||
264 | .parent = &clk_h, | ||
265 | .enable = s3c64xx_hclk_ctrl, | ||
266 | .ctrlbit = S3C_CLKCON_HCLK_USB, | ||
267 | }, { | ||
262 | .name = "timers", | 268 | .name = "timers", |
263 | .id = -1, | 269 | .id = -1, |
264 | .parent = &clk_p, | 270 | .parent = &clk_p, |
diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c index c73ed06b6065..f0394baa11fa 100644 --- a/arch/arm/mach-u300/i2c.c +++ b/arch/arm/mach-u300/i2c.c | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/i2c.h> | 11 | #include <linux/i2c.h> |
12 | #include <linux/mfd/ab3100.h> | 12 | #include <linux/mfd/abx500.h> |
13 | #include <linux/regulator/machine.h> | 13 | #include <linux/regulator/machine.h> |
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | #include <mach/irqs.h> | 15 | #include <mach/irqs.h> |
@@ -46,6 +46,7 @@ | |||
46 | /* BUCK SLEEP 0xAC: 1.05V, Not used, SLEEP_A and B, Not used */ | 46 | /* BUCK SLEEP 0xAC: 1.05V, Not used, SLEEP_A and B, Not used */ |
47 | #define BUCK_SLEEP_SETTING 0xAC | 47 | #define BUCK_SLEEP_SETTING 0xAC |
48 | 48 | ||
49 | #ifdef CONFIG_AB3100_CORE | ||
49 | static struct regulator_consumer_supply supply_ldo_c[] = { | 50 | static struct regulator_consumer_supply supply_ldo_c[] = { |
50 | { | 51 | { |
51 | .dev_name = "ab3100-codec", | 52 | .dev_name = "ab3100-codec", |
@@ -253,14 +254,68 @@ static struct ab3100_platform_data ab3100_plf_data = { | |||
253 | LDO_D_SETTING, | 254 | LDO_D_SETTING, |
254 | }, | 255 | }, |
255 | }; | 256 | }; |
257 | #endif | ||
258 | |||
259 | #ifdef CONFIG_AB3550_CORE | ||
260 | static struct abx500_init_settings ab3550_init_settings[] = { | ||
261 | { | ||
262 | .bank = 0, | ||
263 | .reg = AB3550_IMR1, | ||
264 | .setting = 0xff | ||
265 | }, | ||
266 | { | ||
267 | .bank = 0, | ||
268 | .reg = AB3550_IMR2, | ||
269 | .setting = 0xff | ||
270 | }, | ||
271 | { | ||
272 | .bank = 0, | ||
273 | .reg = AB3550_IMR3, | ||
274 | .setting = 0xff | ||
275 | }, | ||
276 | { | ||
277 | .bank = 0, | ||
278 | .reg = AB3550_IMR4, | ||
279 | .setting = 0xff | ||
280 | }, | ||
281 | { | ||
282 | .bank = 0, | ||
283 | .reg = AB3550_IMR5, | ||
284 | /* The two most significant bits are not used */ | ||
285 | .setting = 0x3f | ||
286 | }, | ||
287 | }; | ||
288 | |||
289 | static struct ab3550_platform_data ab3550_plf_data = { | ||
290 | .irq = { | ||
291 | .base = IRQ_AB3550_BASE, | ||
292 | .count = (IRQ_AB3550_END - IRQ_AB3550_BASE + 1), | ||
293 | }, | ||
294 | .dev_data = { | ||
295 | }, | ||
296 | .init_settings = ab3550_init_settings, | ||
297 | .init_settings_sz = ARRAY_SIZE(ab3550_init_settings), | ||
298 | }; | ||
299 | #endif | ||
256 | 300 | ||
257 | static struct i2c_board_info __initdata bus0_i2c_board_info[] = { | 301 | static struct i2c_board_info __initdata bus0_i2c_board_info[] = { |
302 | #if defined(CONFIG_AB3550_CORE) | ||
303 | { | ||
304 | .type = "ab3550", | ||
305 | .addr = 0x4A, | ||
306 | .irq = IRQ_U300_IRQ0_EXT, | ||
307 | .platform_data = &ab3550_plf_data, | ||
308 | }, | ||
309 | #elif defined(CONFIG_AB3100_CORE) | ||
258 | { | 310 | { |
259 | .type = "ab3100", | 311 | .type = "ab3100", |
260 | .addr = 0x48, | 312 | .addr = 0x48, |
261 | .irq = IRQ_U300_IRQ0_EXT, | 313 | .irq = IRQ_U300_IRQ0_EXT, |
262 | .platform_data = &ab3100_plf_data, | 314 | .platform_data = &ab3100_plf_data, |
263 | }, | 315 | }, |
316 | #else | ||
317 | { }, | ||
318 | #endif | ||
264 | }; | 319 | }; |
265 | 320 | ||
266 | static struct i2c_board_info __initdata bus1_i2c_board_info[] = { | 321 | static struct i2c_board_info __initdata bus1_i2c_board_info[] = { |
diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index a6867b12773e..09b1b28fa8fd 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h | |||
@@ -109,6 +109,13 @@ | |||
109 | #define U300_NR_IRQS 48 | 109 | #define U300_NR_IRQS 48 |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | #ifdef CONFIG_AB3550_CORE | ||
113 | #define IRQ_AB3550_BASE (U300_NR_IRQS) | ||
114 | #define IRQ_AB3550_END (IRQ_AB3550_BASE + 37) | ||
115 | |||
116 | #define NR_IRQS (IRQ_AB3550_END + 1) | ||
117 | #else | ||
112 | #define NR_IRQS U300_NR_IRQS | 118 | #define NR_IRQS U300_NR_IRQS |
119 | #endif | ||
113 | 120 | ||
114 | #endif | 121 | #endif |
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 072196c57263..bb8d7b771817 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -50,7 +50,7 @@ struct pl022_config_chip ab4500_chip_info = { | |||
50 | 50 | ||
51 | static struct spi_board_info u8500_spi_devices[] = { | 51 | static struct spi_board_info u8500_spi_devices[] = { |
52 | { | 52 | { |
53 | .modalias = "ab4500", | 53 | .modalias = "ab8500", |
54 | .controller_data = &ab4500_chip_info, | 54 | .controller_data = &ab4500_chip_info, |
55 | .max_speed_hz = 12000000, | 55 | .max_speed_hz = 12000000, |
56 | .bus_num = 0, | 56 | .bus_num = 0, |
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index 1b2c9890e8b4..6544855af2f1 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c | |||
@@ -411,7 +411,7 @@ static struct clk_lookup u8500_common_clks[] = { | |||
411 | CLK(apetraceclk, "apetrace", NULL), | 411 | CLK(apetraceclk, "apetrace", NULL), |
412 | CLK(mcdeclk, "mcde", NULL), | 412 | CLK(mcdeclk, "mcde", NULL), |
413 | CLK(ipi2clk, "ipi2", NULL), | 413 | CLK(ipi2clk, "ipi2", NULL), |
414 | CLK(dmaclk, "dma40", NULL), | 414 | CLK(dmaclk, "dma40.0", NULL), |
415 | CLK(b2r2clk, "b2r2", NULL), | 415 | CLK(b2r2clk, "b2r2", NULL), |
416 | CLK(tvclk, "tv", NULL), | 416 | CLK(tvclk, "tv", NULL), |
417 | }; | 417 | }; |
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index d04299f3b6b5..f21c444edd99 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -32,6 +32,7 @@ static struct platform_device *platform_devs[] __initdata = { | |||
32 | &u8500_gpio_devs[6], | 32 | &u8500_gpio_devs[6], |
33 | &u8500_gpio_devs[7], | 33 | &u8500_gpio_devs[7], |
34 | &u8500_gpio_devs[8], | 34 | &u8500_gpio_devs[8], |
35 | &u8500_dma40_device, | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | /* minimum static i/o mapping required to boot U8500 platforms */ | 38 | /* minimum static i/o mapping required to boot U8500 platforms */ |
@@ -71,6 +72,9 @@ void __init u8500_init_devices(void) | |||
71 | { | 72 | { |
72 | ux500_init_devices(); | 73 | ux500_init_devices(); |
73 | 74 | ||
75 | if (cpu_is_u8500ed()) | ||
76 | dma40_u8500ed_fixup(); | ||
77 | |||
74 | /* Register the platform devices */ | 78 | /* Register the platform devices */ |
75 | platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs)); | 79 | platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs)); |
76 | 80 | ||
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 20334236afce..822903421943 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -12,9 +12,13 @@ | |||
12 | #include <linux/gpio.h> | 12 | #include <linux/gpio.h> |
13 | #include <linux/amba/bus.h> | 13 | #include <linux/amba/bus.h> |
14 | 14 | ||
15 | #include <plat/ste_dma40.h> | ||
16 | |||
15 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
16 | #include <mach/setup.h> | 18 | #include <mach/setup.h> |
17 | 19 | ||
20 | #include "ste-dma40-db8500.h" | ||
21 | |||
18 | static struct nmk_gpio_platform_data u8500_gpio_data[] = { | 22 | static struct nmk_gpio_platform_data u8500_gpio_data[] = { |
19 | GPIO_DATA("GPIO-0-31", 0), | 23 | GPIO_DATA("GPIO-0-31", 0), |
20 | GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */ | 24 | GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */ |
@@ -105,3 +109,108 @@ struct platform_device u8500_i2c4_device = { | |||
105 | .resource = u8500_i2c4_resources, | 109 | .resource = u8500_i2c4_resources, |
106 | .num_resources = ARRAY_SIZE(u8500_i2c4_resources), | 110 | .num_resources = ARRAY_SIZE(u8500_i2c4_resources), |
107 | }; | 111 | }; |
112 | |||
113 | static struct resource dma40_resources[] = { | ||
114 | [0] = { | ||
115 | .start = U8500_DMA_BASE, | ||
116 | .end = U8500_DMA_BASE + SZ_4K - 1, | ||
117 | .flags = IORESOURCE_MEM, | ||
118 | .name = "base", | ||
119 | }, | ||
120 | [1] = { | ||
121 | .start = U8500_DMA_LCPA_BASE, | ||
122 | .end = U8500_DMA_LCPA_BASE + SZ_4K - 1, | ||
123 | .flags = IORESOURCE_MEM, | ||
124 | .name = "lcpa", | ||
125 | }, | ||
126 | [2] = { | ||
127 | .start = U8500_DMA_LCLA_BASE, | ||
128 | .end = U8500_DMA_LCLA_BASE + 16 * 1024 - 1, | ||
129 | .flags = IORESOURCE_MEM, | ||
130 | .name = "lcla", | ||
131 | }, | ||
132 | [3] = { | ||
133 | .start = IRQ_DMA, | ||
134 | .end = IRQ_DMA, | ||
135 | .flags = IORESOURCE_IRQ} | ||
136 | }; | ||
137 | |||
138 | /* Default configuration for physcial memcpy */ | ||
139 | struct stedma40_chan_cfg dma40_memcpy_conf_phy = { | ||
140 | .channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE | | ||
141 | STEDMA40_LOW_PRIORITY_CHANNEL | | ||
142 | STEDMA40_PCHAN_BASIC_MODE), | ||
143 | .dir = STEDMA40_MEM_TO_MEM, | ||
144 | |||
145 | .src_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
146 | .src_info.data_width = STEDMA40_BYTE_WIDTH, | ||
147 | .src_info.psize = STEDMA40_PSIZE_PHY_1, | ||
148 | |||
149 | .dst_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
150 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, | ||
151 | .dst_info.psize = STEDMA40_PSIZE_PHY_1, | ||
152 | |||
153 | }; | ||
154 | /* Default configuration for logical memcpy */ | ||
155 | struct stedma40_chan_cfg dma40_memcpy_conf_log = { | ||
156 | .channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE | | ||
157 | STEDMA40_LOW_PRIORITY_CHANNEL | | ||
158 | STEDMA40_LCHAN_SRC_LOG_DST_LOG | | ||
159 | STEDMA40_NO_TIM_FOR_LINK), | ||
160 | .dir = STEDMA40_MEM_TO_MEM, | ||
161 | |||
162 | .src_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
163 | .src_info.data_width = STEDMA40_BYTE_WIDTH, | ||
164 | .src_info.psize = STEDMA40_PSIZE_LOG_1, | ||
165 | |||
166 | .dst_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
167 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, | ||
168 | .dst_info.psize = STEDMA40_PSIZE_LOG_1, | ||
169 | |||
170 | }; | ||
171 | |||
172 | /* | ||
173 | * Mapping between destination event lines and physical device address. | ||
174 | * The event line is tied to a device and therefor the address is constant. | ||
175 | */ | ||
176 | static const dma_addr_t dma40_tx_map[STEDMA40_NR_DEV]; | ||
177 | |||
178 | /* Mapping between source event lines and physical device address */ | ||
179 | static const dma_addr_t dma40_rx_map[STEDMA40_NR_DEV]; | ||
180 | |||
181 | /* Reserved event lines for memcpy only */ | ||
182 | static int dma40_memcpy_event[] = { | ||
183 | STEDMA40_MEMCPY_TX_1, | ||
184 | STEDMA40_MEMCPY_TX_2, | ||
185 | STEDMA40_MEMCPY_TX_3, | ||
186 | STEDMA40_MEMCPY_TX_4, | ||
187 | }; | ||
188 | |||
189 | static struct stedma40_platform_data dma40_plat_data = { | ||
190 | .dev_len = STEDMA40_NR_DEV, | ||
191 | .dev_rx = dma40_rx_map, | ||
192 | .dev_tx = dma40_tx_map, | ||
193 | .memcpy = dma40_memcpy_event, | ||
194 | .memcpy_len = ARRAY_SIZE(dma40_memcpy_event), | ||
195 | .memcpy_conf_phy = &dma40_memcpy_conf_phy, | ||
196 | .memcpy_conf_log = &dma40_memcpy_conf_log, | ||
197 | .llis_per_log = 8, | ||
198 | }; | ||
199 | |||
200 | struct platform_device u8500_dma40_device = { | ||
201 | .dev = { | ||
202 | .platform_data = &dma40_plat_data, | ||
203 | }, | ||
204 | .name = "dma40", | ||
205 | .id = 0, | ||
206 | .num_resources = ARRAY_SIZE(dma40_resources), | ||
207 | .resource = dma40_resources | ||
208 | }; | ||
209 | |||
210 | void dma40_u8500ed_fixup(void) | ||
211 | { | ||
212 | dma40_plat_data.memcpy = NULL; | ||
213 | dma40_plat_data.memcpy_len = 0; | ||
214 | dma40_resources[0].start = U8500_DMA_BASE_ED; | ||
215 | dma40_resources[0].end = U8500_DMA_BASE_ED + SZ_4K - 1; | ||
216 | } | ||
diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h index 9169e1e382a3..85fc6a80b386 100644 --- a/arch/arm/mach-ux500/include/mach/db8500-regs.h +++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h | |||
@@ -7,6 +7,18 @@ | |||
7 | #ifndef __MACH_DB8500_REGS_H | 7 | #ifndef __MACH_DB8500_REGS_H |
8 | #define __MACH_DB8500_REGS_H | 8 | #define __MACH_DB8500_REGS_H |
9 | 9 | ||
10 | /* Base address and bank offsets for ESRAM */ | ||
11 | #define U8500_ESRAM_BASE 0x40000000 | ||
12 | #define U8500_ESRAM_BANK_SIZE 0x00020000 | ||
13 | #define U8500_ESRAM_BANK0 U8500_ESRAM_BASE | ||
14 | #define U8500_ESRAM_BANK1 (U8500_ESRAM_BASE + U8500_ESRAM_BANK_SIZE) | ||
15 | #define U8500_ESRAM_BANK2 (U8500_ESRAM_BANK1 + U8500_ESRAM_BANK_SIZE) | ||
16 | #define U8500_ESRAM_BANK3 (U8500_ESRAM_BANK2 + U8500_ESRAM_BANK_SIZE) | ||
17 | #define U8500_ESRAM_BANK4 (U8500_ESRAM_BANK3 + U8500_ESRAM_BANK_SIZE) | ||
18 | /* Use bank 4 for DMA LCLA and LCPA */ | ||
19 | #define U8500_DMA_LCLA_BASE U8500_ESRAM_BANK4 | ||
20 | #define U8500_DMA_LCPA_BASE (U8500_ESRAM_BANK4 + 0x4000) | ||
21 | |||
10 | #define U8500_PER3_BASE 0x80000000 | 22 | #define U8500_PER3_BASE 0x80000000 |
11 | #define U8500_STM_BASE 0x80100000 | 23 | #define U8500_STM_BASE 0x80100000 |
12 | #define U8500_STM_REG_BASE (U8500_STM_BASE + 0xF000) | 24 | #define U8500_STM_REG_BASE (U8500_STM_BASE + 0xF000) |
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index 0422af00a56e..c2b2f2574947 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h | |||
@@ -25,5 +25,8 @@ extern struct platform_device ux500_i2c3_device; | |||
25 | 25 | ||
26 | extern struct platform_device u8500_i2c0_device; | 26 | extern struct platform_device u8500_i2c0_device; |
27 | extern struct platform_device u8500_i2c4_device; | 27 | extern struct platform_device u8500_i2c4_device; |
28 | extern struct platform_device u8500_dma40_device; | ||
29 | |||
30 | void dma40_u8500ed_fixup(void); | ||
28 | 31 | ||
29 | #endif | 32 | #endif |
diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h new file mode 100644 index 000000000000..e7016278dfa9 --- /dev/null +++ b/arch/arm/mach-ux500/ste-dma40-db8500.h | |||
@@ -0,0 +1,154 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ux500/ste_dma40_db8500.h | ||
3 | * DB8500-SoC-specific configuration for DMA40 | ||
4 | * | ||
5 | * Copyright (C) ST-Ericsson 2007-2010 | ||
6 | * License terms: GNU General Public License (GPL) version 2 | ||
7 | * Author: Per Friden <per.friden@stericsson.com> | ||
8 | * Author: Jonas Aaberg <jonas.aberg@stericsson.com> | ||
9 | */ | ||
10 | #ifndef STE_DMA40_DB8500_H | ||
11 | #define STE_DMA40_DB8500_H | ||
12 | |||
13 | #define STEDMA40_NR_DEV 64 | ||
14 | |||
15 | enum dma_src_dev_type { | ||
16 | STEDMA40_DEV_SPI0_RX = 0, | ||
17 | STEDMA40_DEV_SD_MMC0_RX = 1, | ||
18 | STEDMA40_DEV_SD_MMC1_RX = 2, | ||
19 | STEDMA40_DEV_SD_MMC2_RX = 3, | ||
20 | STEDMA40_DEV_I2C1_RX = 4, | ||
21 | STEDMA40_DEV_I2C3_RX = 5, | ||
22 | STEDMA40_DEV_I2C2_RX = 6, | ||
23 | STEDMA40_DEV_I2C4_RX = 7, /* Only on V1 */ | ||
24 | STEDMA40_DEV_SSP0_RX = 8, | ||
25 | STEDMA40_DEV_SSP1_RX = 9, | ||
26 | STEDMA40_DEV_MCDE_RX = 10, | ||
27 | STEDMA40_DEV_UART2_RX = 11, | ||
28 | STEDMA40_DEV_UART1_RX = 12, | ||
29 | STEDMA40_DEV_UART0_RX = 13, | ||
30 | STEDMA40_DEV_MSP2_RX = 14, | ||
31 | STEDMA40_DEV_I2C0_RX = 15, | ||
32 | STEDMA40_DEV_USB_OTG_IEP_8 = 16, | ||
33 | STEDMA40_DEV_USB_OTG_IEP_1_9 = 17, | ||
34 | STEDMA40_DEV_USB_OTG_IEP_2_10 = 18, | ||
35 | STEDMA40_DEV_USB_OTG_IEP_3_11 = 19, | ||
36 | STEDMA40_DEV_SLIM0_CH0_RX_HSI_RX_CH0 = 20, | ||
37 | STEDMA40_DEV_SLIM0_CH1_RX_HSI_RX_CH1 = 21, | ||
38 | STEDMA40_DEV_SLIM0_CH2_RX_HSI_RX_CH2 = 22, | ||
39 | STEDMA40_DEV_SLIM0_CH3_RX_HSI_RX_CH3 = 23, | ||
40 | STEDMA40_DEV_SRC_SXA0_RX_TX = 24, | ||
41 | STEDMA40_DEV_SRC_SXA1_RX_TX = 25, | ||
42 | STEDMA40_DEV_SRC_SXA2_RX_TX = 26, | ||
43 | STEDMA40_DEV_SRC_SXA3_RX_TX = 27, | ||
44 | STEDMA40_DEV_SD_MM2_RX = 28, | ||
45 | STEDMA40_DEV_SD_MM0_RX = 29, | ||
46 | STEDMA40_DEV_MSP1_RX = 30, | ||
47 | /* | ||
48 | * This channel is either SlimBus or MSP, | ||
49 | * never both at the same time. | ||
50 | */ | ||
51 | STEDMA40_SLIM0_CH0_RX = 31, | ||
52 | STEDMA40_DEV_MSP0_RX = 31, | ||
53 | STEDMA40_DEV_SD_MM1_RX = 32, | ||
54 | STEDMA40_DEV_SPI2_RX = 33, | ||
55 | STEDMA40_DEV_I2C3_RX2 = 34, | ||
56 | STEDMA40_DEV_SPI1_RX = 35, | ||
57 | STEDMA40_DEV_USB_OTG_IEP_4_12 = 36, | ||
58 | STEDMA40_DEV_USB_OTG_IEP_5_13 = 37, | ||
59 | STEDMA40_DEV_USB_OTG_IEP_6_14 = 38, | ||
60 | STEDMA40_DEV_USB_OTG_IEP_7_15 = 39, | ||
61 | STEDMA40_DEV_SPI3_RX = 40, | ||
62 | STEDMA40_DEV_SD_MM3_RX = 41, | ||
63 | STEDMA40_DEV_SD_MM4_RX = 42, | ||
64 | STEDMA40_DEV_SD_MM5_RX = 43, | ||
65 | STEDMA40_DEV_SRC_SXA4_RX_TX = 44, | ||
66 | STEDMA40_DEV_SRC_SXA5_RX_TX = 45, | ||
67 | STEDMA40_DEV_SRC_SXA6_RX_TX = 46, | ||
68 | STEDMA40_DEV_SRC_SXA7_RX_TX = 47, | ||
69 | STEDMA40_DEV_CAC1_RX = 48, | ||
70 | /* RX channels 49 and 50 are unused */ | ||
71 | STEDMA40_DEV_MSHC_RX = 51, | ||
72 | STEDMA40_DEV_SLIM1_CH0_RX_HSI_RX_CH4 = 52, | ||
73 | STEDMA40_DEV_SLIM1_CH1_RX_HSI_RX_CH5 = 53, | ||
74 | STEDMA40_DEV_SLIM1_CH2_RX_HSI_RX_CH6 = 54, | ||
75 | STEDMA40_DEV_SLIM1_CH3_RX_HSI_RX_CH7 = 55, | ||
76 | /* RX channels 56 thru 60 are unused */ | ||
77 | STEDMA40_DEV_CAC0_RX = 61, | ||
78 | /* RX channels 62 and 63 are unused */ | ||
79 | }; | ||
80 | |||
81 | enum dma_dest_dev_type { | ||
82 | STEDMA40_DEV_SPI0_TX = 0, | ||
83 | STEDMA40_DEV_SD_MMC0_TX = 1, | ||
84 | STEDMA40_DEV_SD_MMC1_TX = 2, | ||
85 | STEDMA40_DEV_SD_MMC2_TX = 3, | ||
86 | STEDMA40_DEV_I2C1_TX = 4, | ||
87 | STEDMA40_DEV_I2C3_TX = 5, | ||
88 | STEDMA40_DEV_I2C2_TX = 6, | ||
89 | STEDMA50_DEV_I2C4_TX = 7, /* Only on V1 */ | ||
90 | STEDMA40_DEV_SSP0_TX = 8, | ||
91 | STEDMA40_DEV_SSP1_TX = 9, | ||
92 | /* TX channel 10 is unused */ | ||
93 | STEDMA40_DEV_UART2_TX = 11, | ||
94 | STEDMA40_DEV_UART1_TX = 12, | ||
95 | STEDMA40_DEV_UART0_TX= 13, | ||
96 | STEDMA40_DEV_MSP2_TX = 14, | ||
97 | STEDMA40_DEV_I2C0_TX = 15, | ||
98 | STEDMA40_DEV_USB_OTG_OEP_8 = 16, | ||
99 | STEDMA40_DEV_USB_OTG_OEP_1_9 = 17, | ||
100 | STEDMA40_DEV_USB_OTG_OEP_2_10= 18, | ||
101 | STEDMA40_DEV_USB_OTG_OEP_3_11 = 19, | ||
102 | STEDMA40_DEV_SLIM0_CH0_TX_HSI_TX_CH0 = 20, | ||
103 | STEDMA40_DEV_SLIM0_CH1_TX_HSI_TX_CH1 = 21, | ||
104 | STEDMA40_DEV_SLIM0_CH2_TX_HSI_TX_CH2 = 22, | ||
105 | STEDMA40_DEV_SLIM0_CH3_TX_HSI_TX_CH3 = 23, | ||
106 | STEDMA40_DEV_DST_SXA0_RX_TX = 24, | ||
107 | STEDMA40_DEV_DST_SXA1_RX_TX = 25, | ||
108 | STEDMA40_DEV_DST_SXA2_RX_TX = 26, | ||
109 | STEDMA40_DEV_DST_SXA3_RX_TX = 27, | ||
110 | STEDMA40_DEV_SD_MM2_TX = 28, | ||
111 | STEDMA40_DEV_SD_MM0_TX = 29, | ||
112 | STEDMA40_DEV_MSP1_TX = 30, | ||
113 | /* | ||
114 | * This channel is either SlimBus or MSP, | ||
115 | * never both at the same time. | ||
116 | */ | ||
117 | STEDMA40_SLIM0_CH0_TX = 31, | ||
118 | STEDMA40_DEV_MSP0_TX = 31, | ||
119 | STEDMA40_DEV_SD_MM1_TX = 32, | ||
120 | STEDMA40_DEV_SPI2_TX = 33, | ||
121 | /* Secondary I2C3 channel */ | ||
122 | STEDMA40_DEV_I2C3_TX2 = 34, | ||
123 | STEDMA40_DEV_SPI1_TX = 35, | ||
124 | STEDMA40_DEV_USB_OTG_OEP_4_12 = 36, | ||
125 | STEDMA40_DEV_USB_OTG_OEP_5_13 = 37, | ||
126 | STEDMA40_DEV_USB_OTG_OEP_6_14 = 38, | ||
127 | STEDMA40_DEV_USB_OTG_OEP_7_15 = 39, | ||
128 | STEDMA40_DEV_SPI3_TX = 40, | ||
129 | STEDMA40_DEV_SD_MM3_TX = 41, | ||
130 | STEDMA40_DEV_SD_MM4_TX = 42, | ||
131 | STEDMA40_DEV_SD_MM5_TX = 43, | ||
132 | STEDMA40_DEV_DST_SXA4_RX_TX = 44, | ||
133 | STEDMA40_DEV_DST_SXA5_RX_TX = 45, | ||
134 | STEDMA40_DEV_DST_SXA6_RX_TX = 46, | ||
135 | STEDMA40_DEV_DST_SXA7_RX_TX = 47, | ||
136 | STEDMA40_DEV_CAC1_TX = 48, | ||
137 | STEDMA40_DEV_CAC1_TX_HAC1_TX = 49, | ||
138 | STEDMA40_DEV_HAC1_TX = 50, | ||
139 | STEDMA40_MEMXCPY_TX_0 = 51, | ||
140 | STEDMA40_DEV_SLIM1_CH0_TX_HSI_TX_CH4 = 52, | ||
141 | STEDMA40_DEV_SLIM1_CH1_TX_HSI_TX_CH5 = 53, | ||
142 | STEDMA40_DEV_SLIM1_CH2_TX_HSI_TX_CH6 = 54, | ||
143 | STEDMA40_DEV_SLIM1_CH3_TX_HSI_TX_CH7 = 55, | ||
144 | STEDMA40_MEMCPY_TX_1 = 56, | ||
145 | STEDMA40_MEMCPY_TX_2 = 57, | ||
146 | STEDMA40_MEMCPY_TX_3 = 58, | ||
147 | STEDMA40_MEMCPY_TX_4 = 59, | ||
148 | STEDMA40_MEMCPY_TX_5 = 60, | ||
149 | STEDMA40_DEV_CAC0_TX = 61, | ||
150 | STEDMA40_DEV_CAC0_TX_HAC0_TX = 62, | ||
151 | STEDMA40_DEV_HAC0_TX = 63, | ||
152 | }; | ||
153 | |||
154 | #endif | ||
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c index 24a931fd8d3b..b5e255265f20 100644 --- a/arch/arm/plat-s5p/clock.c +++ b/arch/arm/plat-s5p/clock.c | |||
@@ -148,6 +148,7 @@ static struct clk *s5p_clks[] __initdata = { | |||
148 | &clk_fout_vpll, | 148 | &clk_fout_vpll, |
149 | &clk_arm, | 149 | &clk_arm, |
150 | &clk_vpll, | 150 | &clk_vpll, |
151 | &clk_xusbxti, | ||
151 | }; | 152 | }; |
152 | 153 | ||
153 | void __init s5p_register_clocks(unsigned long xtal_freq) | 154 | void __init s5p_register_clocks(unsigned long xtal_freq) |
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h index 34efdd2b032c..db4112c6f2be 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h +++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h | |||
@@ -43,6 +43,11 @@ struct s3c_gpio_chip; | |||
43 | * layouts. Provide an point to vector control routine and provide any | 43 | * layouts. Provide an point to vector control routine and provide any |
44 | * per-bank configuration information that other systems such as the | 44 | * per-bank configuration information that other systems such as the |
45 | * external interrupt code will need. | 45 | * external interrupt code will need. |
46 | * | ||
47 | * @sa s3c_gpio_cfgpin | ||
48 | * @sa s3c_gpio_getcfg | ||
49 | * @sa s3c_gpio_setpull | ||
50 | * @sa s3c_gpio_getpull | ||
46 | */ | 51 | */ |
47 | struct s3c_gpio_cfg { | 52 | struct s3c_gpio_cfg { |
48 | unsigned int cfg_eint; | 53 | unsigned int cfg_eint; |
@@ -70,11 +75,25 @@ struct s3c_gpio_cfg { | |||
70 | /** | 75 | /** |
71 | * s3c_gpio_cfgpin() - Change the GPIO function of a pin. | 76 | * s3c_gpio_cfgpin() - Change the GPIO function of a pin. |
72 | * @pin pin The pin number to configure. | 77 | * @pin pin The pin number to configure. |
73 | * @pin to The configuration for the pin's function. | 78 | * @to to The configuration for the pin's function. |
74 | * | 79 | * |
75 | * Configure which function is actually connected to the external | 80 | * Configure which function is actually connected to the external |
76 | * pin, such as an gpio input, output or some form of special function | 81 | * pin, such as an gpio input, output or some form of special function |
77 | * connected to an internal peripheral block. | 82 | * connected to an internal peripheral block. |
83 | * | ||
84 | * The @to parameter can be one of the generic S3C_GPIO_INPUT, S3C_GPIO_OUTPUT | ||
85 | * or S3C_GPIO_SFN() to indicate one of the possible values that the helper | ||
86 | * will then generate the correct bit mask and shift for the configuration. | ||
87 | * | ||
88 | * If a bank of GPIOs all needs to be set to special-function 2, then | ||
89 | * the following code will work: | ||
90 | * | ||
91 | * for (gpio = start; gpio < end; gpio++) | ||
92 | * s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
93 | * | ||
94 | * The @to parameter can also be a specific value already shifted to the | ||
95 | * correct position in the control register, although these are discouraged | ||
96 | * in newer kernels and are only being kept for compatibility. | ||
78 | */ | 97 | */ |
79 | extern int s3c_gpio_cfgpin(unsigned int pin, unsigned int to); | 98 | extern int s3c_gpio_cfgpin(unsigned int pin, unsigned int to); |
80 | 99 | ||
@@ -108,6 +127,8 @@ extern unsigned s3c_gpio_getcfg(unsigned int pin); | |||
108 | * This function sets the state of the pull-{up,down} resistor for the | 127 | * This function sets the state of the pull-{up,down} resistor for the |
109 | * specified pin. It will return 0 if successfull, or a negative error | 128 | * specified pin. It will return 0 if successfull, or a negative error |
110 | * code if the pin cannot support the requested pull setting. | 129 | * code if the pin cannot support the requested pull setting. |
130 | * | ||
131 | * @pull is one of S3C_GPIO_PULL_NONE, S3C_GPIO_PULL_DOWN or S3C_GPIO_PULL_UP. | ||
111 | */ | 132 | */ |
112 | extern int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull); | 133 | extern int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull); |
113 | 134 | ||