Menu
▾
▴
gc-linux-cvs — CVS commit logs.
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
(53) |
Feb
(78) |
Mar
(34) |
Apr
(26) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(16) |
Sep
(2) |
Oct
(58) |
Nov
(13) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(62) |
Feb
(4) |
Mar
(40) |
Apr
(9) |
May
(13) |
Jun
(26) |
Jul
(32) |
Aug
(24) |
Sep
(18) |
Oct
(18) |
Nov
(14) |
Dec
|
| 2006 |
Jan
(15) |
Feb
(2) |
Mar
(23) |
Apr
(2) |
May
(2) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(1) |
Feb
(45) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(31) |
Dec
(5) |
| 2008 |
Jan
(6) |
Feb
(34) |
Mar
(113) |
Apr
(40) |
May
(19) |
Jun
(5) |
Jul
(41) |
Aug
(13) |
Sep
(53) |
Oct
(4) |
Nov
(53) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(29) |
Mar
(66) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(163) |
Nov
|
Dec
(91) |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/drivers/i2c/busses In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/i2c/busses Modified Files: Kconfig Makefile i2c-gpio.c Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 25 Oct 2009 18:50:27 -0000 1.6 --- Makefile 25 Oct 2009 18:53:45 -0000 1.7 *************** *** 31,37 **** obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o - obj-$(CONFIG_I2C_GPIO_COMMON) += i2c-gpio-common.o obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o - obj-$(CONFIG_I2C_GPIO_OF) += i2c-gpio-of.o obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o --- 31,35 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.6 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.7 *************** *** 327,350 **** For details please see http://www.ti.com/davinci - config I2C_GPIO_COMMON - tristate - depends on GENERIC_GPIO - select I2C_ALGOBIT - default n - config I2C_GPIO tristate "GPIO-based bitbanging I2C" ! select I2C_GPIO_COMMON help This is a very simple bitbanging I2C driver utilizing the arch-neutral GPIO API to control the SCL and SDA lines. - config I2C_GPIO_OF - tristate "GPIO-based bitbanging I2C driver with OF bindings" - select I2C_GPIO_COMMON - help - This option allows the declaration of GPIO-based I2C devices - using a device tree source. - config I2C_HIGHLANDER tristate "Highlander FPGA SMBus interface" --- 327,338 ---- For details please see http://www.ti.com/davinci config I2C_GPIO tristate "GPIO-based bitbanging I2C" ! depends on GENERIC_GPIO ! select I2C_ALGOBIT help This is a very simple bitbanging I2C driver utilizing the arch-neutral GPIO API to control the SCL and SDA lines. config I2C_HIGHLANDER tristate "Highlander FPGA SMBus interface" Index: i2c-gpio.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/i2c-gpio.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** i2c-gpio.c 25 Oct 2009 18:50:27 -0000 1.4 --- i2c-gpio.c 25 Oct 2009 18:53:45 -0000 1.5 *************** *** 8,27 **** * published by the Free Software Foundation. */ ! ! #include "i2c-gpio-common.h" ! #include <linux/init.h> #include <linux/platform_device.h> /* ! * Platform bindings. ! * */ static int __devinit i2c_gpio_probe(struct platform_device *pdev) { struct i2c_gpio_platform_data *pdata; struct i2c_adapter *adap; ! int error; pdata = pdev->dev.platform_data; --- 8,87 ---- * published by the Free Software Foundation. */ ! #include <linux/i2c.h> ! #include <linux/i2c-algo-bit.h> ! #include <linux/i2c-gpio.h> #include <linux/init.h> + #include <linux/module.h> #include <linux/platform_device.h> + #include <asm/gpio.h> + + /* Toggle SDA by changing the direction of the pin */ + static void i2c_gpio_setsda_dir(void *data, int state) + { + struct i2c_gpio_platform_data *pdata = data; + + if (state) + gpio_direction_input(pdata->sda_pin); + else + gpio_direction_output(pdata->sda_pin, 0); + } + /* ! * Toggle SDA by changing the output value of the pin. This is only ! * valid for pins configured as open drain (i.e. setting the value ! * high effectively turns off the output driver.) */ + static void i2c_gpio_setsda_val(void *data, int state) + { + struct i2c_gpio_platform_data *pdata = data; + + gpio_set_value(pdata->sda_pin, state); + } + + /* Toggle SCL by changing the direction of the pin. */ + static void i2c_gpio_setscl_dir(void *data, int state) + { + struct i2c_gpio_platform_data *pdata = data; + + if (state) + gpio_direction_input(pdata->scl_pin); + else + gpio_direction_output(pdata->scl_pin, 0); + } + + /* + * Toggle SCL by changing the output value of the pin. This is used + * for pins that are configured as open drain and for output-only + * pins. The latter case will break the i2c protocol, but it will + * often work in practice. + */ + static void i2c_gpio_setscl_val(void *data, int state) + { + struct i2c_gpio_platform_data *pdata = data; + + gpio_set_value(pdata->scl_pin, state); + } + + static int i2c_gpio_getsda(void *data) + { + struct i2c_gpio_platform_data *pdata = data; + + return gpio_get_value(pdata->sda_pin); + } + + static int i2c_gpio_getscl(void *data) + { + struct i2c_gpio_platform_data *pdata = data; + + return gpio_get_value(pdata->scl_pin); + } static int __devinit i2c_gpio_probe(struct platform_device *pdev) { struct i2c_gpio_platform_data *pdata; + struct i2c_algo_bit_data *bit_data; struct i2c_adapter *adap; ! int ret; pdata = pdev->dev.platform_data; *************** *** 29,61 **** return -ENXIO; ! error = -ENOMEM; ! adap = kzalloc(sizeof(*adap), GFP_KERNEL); if (!adap) goto err_alloc_adap; ! error = i2c_gpio_adapter_probe(adap, pdata, &pdev->dev, pdev->id, ! THIS_MODULE); ! if (error) ! goto err_probe; platform_set_drvdata(pdev, adap); return 0; ! err_probe: kfree(adap); err_alloc_adap: ! return error; } static int __devexit i2c_gpio_remove(struct platform_device *pdev) { - struct i2c_adapter *adap; struct i2c_gpio_platform_data *pdata; adap = platform_get_drvdata(pdev); pdata = pdev->dev.platform_data; ! i2c_gpio_adapter_remove(adap, pdata); kfree(adap); return 0; } --- 89,192 ---- return -ENXIO; ! ret = -ENOMEM; ! adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL); if (!adap) goto err_alloc_adap; ! bit_data = kzalloc(sizeof(struct i2c_algo_bit_data), GFP_KERNEL); ! if (!bit_data) ! goto err_alloc_bit_data; ! ! ret = gpio_request(pdata->sda_pin, "sda"); ! if (ret) ! goto err_request_sda; ! ret = gpio_request(pdata->scl_pin, "scl"); ! if (ret) ! goto err_request_scl; ! ! if (pdata->sda_is_open_drain) { ! gpio_direction_output(pdata->sda_pin, 1); ! bit_data->setsda = i2c_gpio_setsda_val; ! } else { ! gpio_direction_input(pdata->sda_pin); ! bit_data->setsda = i2c_gpio_setsda_dir; ! } ! ! if (pdata->scl_is_open_drain || pdata->scl_is_output_only) { ! gpio_direction_output(pdata->scl_pin, 1); ! bit_data->setscl = i2c_gpio_setscl_val; ! } else { ! gpio_direction_input(pdata->scl_pin); ! bit_data->setscl = i2c_gpio_setscl_dir; ! } ! ! if (!pdata->scl_is_output_only) ! bit_data->getscl = i2c_gpio_getscl; ! bit_data->getsda = i2c_gpio_getsda; ! ! if (pdata->udelay) ! bit_data->udelay = pdata->udelay; ! else if (pdata->scl_is_output_only) ! bit_data->udelay = 50; /* 10 kHz */ ! else ! bit_data->udelay = 5; /* 100 kHz */ ! ! if (pdata->timeout) ! bit_data->timeout = pdata->timeout; ! else ! bit_data->timeout = HZ / 10; /* 100 ms */ ! ! bit_data->data = pdata; ! ! adap->owner = THIS_MODULE; ! snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id); ! adap->algo_data = bit_data; ! adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; ! adap->dev.parent = &pdev->dev; ! ! /* ! * If "dev->id" is negative we consider it as zero. ! * The reason to do so is to avoid sysfs names that only make ! * sense when there are multiple adapters. ! */ ! adap->nr = (pdev->id != -1) ? pdev->id : 0; ! ret = i2c_bit_add_numbered_bus(adap); ! if (ret) ! goto err_add_bus; platform_set_drvdata(pdev, adap); + dev_info(&pdev->dev, "using pins %u (SDA) and %u (SCL%s)\n", + pdata->sda_pin, pdata->scl_pin, + pdata->scl_is_output_only + ? ", no clock stretching" : ""); + return 0; ! err_add_bus: ! gpio_free(pdata->scl_pin); ! err_request_scl: ! gpio_free(pdata->sda_pin); ! err_request_sda: ! kfree(bit_data); ! err_alloc_bit_data: kfree(adap); err_alloc_adap: ! return ret; } static int __devexit i2c_gpio_remove(struct platform_device *pdev) { struct i2c_gpio_platform_data *pdata; + struct i2c_adapter *adap; adap = platform_get_drvdata(pdev); pdata = pdev->dev.platform_data; ! i2c_del_adapter(adap); ! gpio_free(pdata->scl_pin); ! gpio_free(pdata->sda_pin); ! kfree(adap->algo_data); kfree(adap); + return 0; } *************** *** 72,82 **** static int __init i2c_gpio_init(void) { ! int error; ! error = platform_driver_register(&i2c_gpio_driver); ! if (error) ! printk(KERN_ERR "i2c-gpio: registration failed (%d)\n", error); ! return error; } module_init(i2c_gpio_init); --- 203,213 ---- static int __init i2c_gpio_init(void) { ! int ret; ! ret = platform_driver_register(&i2c_gpio_driver); ! if (ret) ! printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret); ! return ret; } module_init(i2c_gpio_init); |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/drivers/input/keyboard In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/input/keyboard Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2009 18:50:27 -0000 1.9 --- Makefile 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 29,31 **** obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o - obj-$(CONFIG_KEYBOARD_WII) += rvl-stkbd.o --- 29,30 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.13 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.14 *************** *** 324,338 **** module will be called bf54x-keys. - config KEYBOARD_WII - tristate "Nintendo Wii USB keyboard IOS glue" - depends on (STARLET_IOS && !USB) - help - Say Y here if you have a Nintendo Wii console running Linux and have - a keyboard attached to one of its USB ports. - This driver uses the IOS interface glue to access the USB keyboard. - - To compile this driver as a module, choose M here: the - module will be called rvl-stkbd. - config KEYBOARD_SH_KEYSC tristate "SuperH KEYSC keypad support" --- 324,327 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:58
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/mmc/host Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 25 Oct 2009 18:50:27 -0000 1.1 --- Makefile 25 Oct 2009 18:53:45 -0000 1.2 *************** *** 15,19 **** obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o - obj-$(CONFIG_MMC_SDHCI_MIPC) += sdhci-mipc.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o --- 15,18 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.1 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.2 *************** *** 84,98 **** If unsure, say N. - config MMC_SDHCI_MIPC - tristate "Nintendo Wii SDHCI support via 'mini'" - depends on MMC_SDHCI && STARLET_MINI - select MMC_SDHCI_IO_ACCESSORS - help - This selects the Nintendo Wii Secure Digital Host Controller - Interface. The SDHC hardware is accessed via the 'mini' firmware - replacement for Starlet. - - If unsure, say N. - config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" --- 84,87 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Rewind to v2.6.30. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig.cputype 25 Oct 2009 18:50:27 -0000 1.10 --- Kconfig.cputype 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 271,275 **** config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON default y --- 271,275 ---- config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x default y |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/net Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Makefile 25 Oct 2009 18:50:27 -0000 1.35 --- Makefile 25 Oct 2009 18:53:45 -0000 1.36 *************** *** 234,238 **** obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o - obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o --- 234,237 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.41 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.42 *************** *** 281,293 **** will be called bmac. - config GAMECUBE_BBA - tristate "Nintendo GameCube ethernet BroadBand Adapter (BBA)" - depends on GAMECUBE_EXI && GAMECUBE - help - Say Y here to add ethernet support for the Broadband Adapter (BBA). - - To compile this driver as a module, choose M here: the module - will be called gcn-bba. - config ARIADNE tristate "Ariadne support" --- 281,284 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/usb/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/usb/host Modified Files: Kconfig Makefile ehci-hcd.c ehci.h ohci-hcd.c ohci-q.c ohci.h Log Message: Rewind to v2.6.30. Index: ohci-q.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-q.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohci-q.c 25 Oct 2009 18:50:27 -0000 1.2 --- ohci-q.c 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 616,622 **** /* FALLTHROUGH */ case PIPE_BULK: - if (ohci->flags & OHCI_QUIRK_WII) - ohci_mipc_bulk_quirk(ohci); - info = is_out ? TD_T_TOGGLE | TD_CC | TD_DP_OUT --- 616,619 ---- *************** *** 650,656 **** */ case PIPE_CONTROL: - if (ohci->flags & OHCI_QUIRK_WII) - ohci_mipc_control_quirk(ohci); - info = TD_CC | TD_DP_SETUP | TD_T_DATA0; td_fill (ohci, info, urb->setup_dma, 8, urb, cnt++); --- 647,650 ---- Index: ehci.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ehci.h 25 Oct 2009 18:50:27 -0000 1.2 --- ehci.h 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 38,62 **** #endif - /* - * Some platforms have weird constraints when accessing memory. - * - * For example, the Nintendo Wii video game console is unable to perform - * non-32 bit writes to non-cached memory for its second block of 64MB of RAM. - * As this platform also requires CONFIG_NOT_COHERENT, all memory allocated - * using the dma memory allocation functions can only be written using - * 32-bit accesses. - * - * Because of this constraint, as a workaround, we make sure that all - * fields in struct ehci_qh (which is allocated from a dma pool) are - * always 32 bit fields. - * Note that the remaining structs allocated from dma-able memory are already - * 32 bit fields. - */ - #ifdef CONFIG_USB_EHCI_HCD_MIPC - #define ehci_fld(type) u32 - #else - #define ehci_fld(type) type - #endif - /* statistics can be kept for for tuning/monitoring */ struct ehci_stats { --- 38,41 ---- *************** *** 357,361 **** unsigned stamp; ! ehci_fld(u8) qh_state; #define QH_STATE_LINKED 1 /* HC sees this */ #define QH_STATE_UNLINK 2 /* HC may still see this */ --- 336,340 ---- unsigned stamp; ! u8 qh_state; #define QH_STATE_LINKED 1 /* HC sees this */ #define QH_STATE_UNLINK 2 /* HC may still see this */ *************** *** 364,377 **** #define QH_STATE_COMPLETING 5 /* don't touch token.HALT */ ! ehci_fld(u8) xacterrs; /* XactErr retry counter */ #define QH_XACTERR_MAX 32 /* XactErr retry limit */ /* periodic schedule info */ ! ehci_fld(u8) usecs; /* intr bandwidth */ ! ehci_fld(u8) gap_uf; /* uframes split/csplit gap */ ! ehci_fld(u8) c_usecs; /* ... split completion bw */ ! ehci_fld(u16) tt_usecs; /* tt downstream bandwidth */ ! ehci_fld(unsigned short) period; /* polling interval */ ! ehci_fld(unsigned short) start; /* where polling starts */ #define NO_FRAME ((unsigned short)~0) /* pick new start */ struct usb_device *dev; /* access to TT */ --- 343,356 ---- #define QH_STATE_COMPLETING 5 /* don't touch token.HALT */ ! u8 xacterrs; /* XactErr retry counter */ #define QH_XACTERR_MAX 32 /* XactErr retry limit */ /* periodic schedule info */ ! u8 usecs; /* intr bandwidth */ ! u8 gap_uf; /* uframes split/csplit gap */ ! u8 c_usecs; /* ... split completion bw */ ! u16 tt_usecs; /* tt downstream bandwidth */ ! unsigned short period; /* polling interval */ ! unsigned short start; /* where polling starts */ #define NO_FRAME ((unsigned short)~0) /* pick new start */ struct usb_device *dev; /* access to TT */ *************** *** 610,631 **** #endif - #ifdef CONFIG_USB_EHCI_HCD_MIPC - - #include <asm/starlet-mini.h> - - static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, - __u32 __iomem *regs) - { - return mipc_in_be32(regs); - } - - static inline void ehci_writel(const struct ehci_hcd *ehci, - const unsigned int val, __u32 __iomem *regs) - { - mipc_out_be32(regs, val); - } - - #else - /* * Big-endian read/write functions are arch-specific. --- 589,592 ---- *************** *** 661,666 **** } - #endif /* CONFIG_USB_EHCI_HCD_MIPC */ - /* * On certain ppc-44x SoC there is a HW issue, that could only worked around with --- 622,625 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.9 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 94,105 **** OpenFirmware platform bus. - config USB_EHCI_HCD_MIPC - bool "Nintendo Wii EHCI USB controller support via 'mini'" - depends on USB_EHCI_HCD && STARLET_MINI - default y - ---help--- - Say Y here to support the EHCI USB controller found in the - Nintendo Wii video game console. - config USB_OXU210HP_HCD tristate "OXU210HP HCD support" --- 94,97 ---- *************** *** 178,190 **** OpenFirmware platform bus. - config USB_OHCI_HCD_MIPC - bool "Nintendo Wii OHCI USB controller support via 'mini'" - depends on USB_OHCI_HCD && STARLET_MINI - select USB_OHCI_LITTLE_ENDIAN - default y - ---help--- - Say Y here to support the OHCI USB controller found in the - Nintendo Wii video game console. - config USB_OHCI_HCD_PPC_OF_BE bool "Support big endian HC" --- 170,173 ---- *************** *** 340,362 **** SH7366 and SH7723 processors. - config USB_WII_HCD - tristate "Nintendo Wii HCD support" - depends on USB && STARLET_IOS && !HIGHMEM && EXPERIMENTAL - help - The Nintendo Wii includes a USB 1.1 host controller that can be - accessed through the API provided by the starlet subsystem. - - Enable this option if you plan to use the internal Nintendo Wii - bluetooth dongle or any USB peripheral connected to the external - ports. - - USB devices using isochronous transfers are not supported. - Use of USB hubs is partially supported. - - Use completely at you own risk. If unsure, say N. - - To compile this driver as a module, choose M here: the - module will be called rvl-sthcd. - config USB_WHCI_HCD tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)" --- 323,326 ---- Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 25 Oct 2009 18:50:27 -0000 1.6 --- Makefile 25 Oct 2009 18:53:45 -0000 1.7 *************** *** 29,32 **** obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o - obj-$(CONFIG_USB_WII_HCD) += rvl-sthcd.o obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o --- 29,31 ---- Index: ohci.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohci.h 25 Oct 2009 18:50:27 -0000 1.2 --- ohci.h 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 17,42 **** /* - * Some platforms have weird constraints when accessing memory. - * - * For example, the Nintendo Wii video game console is unable to perform - * non-32 bit writes to non-cached memory for its second block of 64MB of RAM. - * As this platform also requires CONFIG_NOT_COHERENT_CACHE, all memory - * allocated using the dma memory allocation functions can only be written - * using 32-bit accesses. - * - * Because of this constraint, as a workaround, we make sure that all - * fields in struct ed and td (which are allocated from dma pools) are - * always 32 bit fields. - * Note that the remaining structs allocated from dma-able memory are already - * 32 bit fields. - */ - #ifdef CONFIG_USB_OHCI_HCD_MIPC - #define ohci_fld(type) u32 - #else - #define ohci_fld(type) type - #endif - - - /* * OHCI Endpoint Descriptor (ED) ... holds TD queue * See OHCI spec, section 4.2 --- 17,20 ---- *************** *** 74,92 **** * usually: OPER --> UNLINK --> (IDLE | OPER) --> ... */ ! ohci_fld(u8) state; /* ED_{IDLE,UNLINK,OPER} */ #define ED_IDLE 0x00 /* NOT linked to HC */ #define ED_UNLINK 0x01 /* being unlinked from hc */ #define ED_OPER 0x02 /* IS linked to hc */ ! ohci_fld(u8) type; /* PIPE_{BULK,...} */ /* periodic scheduling params (for intr and iso) */ ! ohci_fld(u8) branch; ! ohci_fld(u16) interval; ! ohci_fld(u16) load; ! ohci_fld(u16) last_iso; /* iso only */ /* HC may see EDs on rm_list until next frame (frame_no == tick) */ ! ohci_fld(u16) tick; } __attribute__ ((aligned(16))); --- 52,70 ---- * usually: OPER --> UNLINK --> (IDLE | OPER) --> ... */ ! u8 state; /* ED_{IDLE,UNLINK,OPER} */ #define ED_IDLE 0x00 /* NOT linked to HC */ #define ED_UNLINK 0x01 /* being unlinked from hc */ #define ED_OPER 0x02 /* IS linked to hc */ ! u8 type; /* PIPE_{BULK,...} */ /* periodic scheduling params (for intr and iso) */ ! u8 branch; ! u16 interval; ! u16 load; ! u16 last_iso; /* iso only */ /* HC may see EDs on rm_list until next frame (frame_no == tick) */ ! u16 tick; } __attribute__ ((aligned(16))); *************** *** 141,145 **** /* rest are purely for the driver's use */ ! ohci_fld(__u8) index; struct ed *ed; struct td *td_hash; /* dma-->td hashtable */ --- 119,123 ---- /* rest are purely for the driver's use */ ! __u8 index; struct ed *ed; struct td *td_hash; /* dma-->td hashtable */ *************** *** 425,429 **** #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */ #define OHCI_QUIRK_AMD_ISO 0x200 /* ISO transfers*/ - #define OHCI_QUIRK_WII 0x400 /* Hollywood chipset */ // there are also chip quirks/bugs in init logic --- 403,406 ---- *************** *** 560,594 **** #endif - #ifdef CONFIG_USB_OHCI_HCD_MIPC - - #include <asm/starlet-mini.h> - - static inline unsigned int _ohci_readl(const struct ohci_hcd *ohci, - __hc32 __iomem *regs) - { - return mipc_in_be32(regs); - } - - static inline void _ohci_writel(const struct ohci_hcd *ohci, - const unsigned int val, __hc32 __iomem *regs) - { - mipc_out_be32(regs, val); - } - - extern void ohci_mipc_control_quirk(struct ohci_hcd *ohci); - extern void ohci_mipc_bulk_quirk(struct ohci_hcd *ohci); - - #else - - static inline void ohci_mipc_control_quirk(struct ohci_hcd *ohci) - { - return; - } - - static inline void ohci_mipc_bulk_quirk(struct ohci_hcd *ohci) - { - return; - } - /* * Big-endian read/write functions are arch-specific. --- 537,540 ---- *************** *** 620,625 **** } - #endif /* CONFIG_USB_OHCI_HCD_MIPC */ - #ifdef CONFIG_ARCH_LH7A404 /* Marc Singer: at the time this code was written, the LH7A404 --- 566,569 ---- Index: ohci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-hcd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ohci-hcd.c 25 Oct 2009 18:50:27 -0000 1.2 --- ohci-hcd.c 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 1062,1070 **** #endif - #ifdef CONFIG_USB_OHCI_HCD_MIPC - #include "ohci-mipc.c" - #define OF_PLATFORM_DRIVER ohci_hcd_mipc_driver - #endif - #ifdef CONFIG_PPC_PS3 #include "ohci-ps3.c" --- 1062,1065 ---- Index: ehci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci-hcd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ehci-hcd.c 25 Oct 2009 18:50:27 -0000 1.2 --- ehci-hcd.c 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 1063,1071 **** #endif - #ifdef CONFIG_USB_EHCI_HCD_MIPC - #include "ehci-mipc.c" - #define OF_PLATFORM_DRIVER ehci_hcd_mipc_driver - #endif - #ifdef CONFIG_PLAT_ORION #include "ehci-orion.c" --- 1063,1066 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/video/logo Modified Files: Kconfig Makefile logo.c Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2009 18:50:27 -0000 1.9 --- Makefile 25 Oct 2009 18:53:46 -0000 1.10 *************** *** 8,12 **** obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o - obj-$(CONFIG_LOGO_GAMECUBE_CLUT224) += logo_gcn_clut224.o obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o --- 8,11 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.10 --- Kconfig 25 Oct 2009 18:53:46 -0000 1.11 *************** *** 43,51 **** default y - config LOGO_GAMECUBE_CLUT224 - bool "224-color GameCube Linux logo" - depends on GAMECUBE - default y - config LOGO_MAC_CLUT224 bool "224-color Macintosh Linux logo" --- 43,46 ---- Index: logo.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** logo.c 25 Oct 2009 18:50:27 -0000 1.9 --- logo.c 25 Oct 2009 18:53:46 -0000 1.10 *************** *** 28,32 **** extern const struct linux_logo logo_blackfin_clut224; extern const struct linux_logo logo_dec_clut224; - extern const struct linux_logo logo_gcn_clut224; extern const struct linux_logo logo_mac_clut224; extern const struct linux_logo logo_parisc_clut224; --- 28,31 ---- *************** *** 92,99 **** logo = &logo_dec_clut224; #endif - #ifdef CONFIG_LOGO_GAMECUBE_CLUT224 - /* GameCube Linux logo */ - logo = &logo_gcn_clut224; - #endif #ifdef CONFIG_LOGO_MAC_CLUT224 /* Macintosh Linux logo on m68k */ --- 91,94 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/gpio In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/gpio Modified Files: gpiolib.c Log Message: Rewind to v2.6.30. Index: gpiolib.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/gpio/gpiolib.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gpiolib.c 25 Oct 2009 18:50:27 -0000 1.5 --- gpiolib.c 25 Oct 2009 18:53:45 -0000 1.6 *************** *** 1006,1027 **** EXPORT_SYMBOL_GPL(gpio_direction_output); - /** - * gpio_direction_is_output - tell if a gpio is configured as an output - * @gpio: gpio in question - * - * Returns a negative errno if the given gpio is not valid. - * Returns a positive non-zero if the gpio is configured as an output. - * Returns zero otherwise. - */ - int gpio_direction_is_output(unsigned gpio) - { - struct gpio_desc *desc = &gpio_desc[gpio]; - - if (!gpio_is_valid(gpio)) - return -EINVAL; - - return test_bit(FLAG_IS_OUT, &desc->flags); - } - EXPORT_SYMBOL_GPL(gpio_direction_is_output); /* I/O calls are only valid after configuration completed; the relevant --- 1006,1009 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/usb Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 25 Oct 2009 18:50:27 -0000 1.7 --- Makefile 25 Oct 2009 18:53:45 -0000 1.8 *************** *** 18,22 **** obj-$(CONFIG_USB_U132_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/ - obj-$(CONFIG_USB_WII_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_ISP1760_HCD) += host/ --- 18,21 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.8 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.9 *************** *** 23,27 **** default y if ARM # SL-811 default y if SUPERH # r8a66597-hcd - default y if STARLET_IOS # rvl-sthcd default PCI --- 23,26 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/misc Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 25 Oct 2009 18:50:27 -0000 1.14 --- Makefile 25 Oct 2009 18:53:45 -0000 1.15 *************** *** 21,25 **** obj-$(CONFIG_ISL29003) += isl29003.o obj-$(CONFIG_C2PORT) += c2port/ - obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o - obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o obj-y += eeprom/ --- 21,23 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.18 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.19 *************** *** 56,81 **** interval timing. - config GAMECUBE_GQR - tristate "Nintendo GameCube/Wii Graphic Quantization Registers (GQR)" - depends on GAMECUBE_COMMON - help - This option enables device driver support for the Gekko/Broadway - processors' Graphic Quantization Registers. - These registers are used with the psql and psqst instructions. - The registers will appear in /proc/sys/gqr. - - config GAMECUBE_MI - tristate "Nintendo GameCube Memory Interface (MI)" - depends on GAMECUBE - help - If you say yes to this option, support will be included for the - Memory Interface (MI) of the Nintendo GameCube. - - The MI allows one to setup up to four protected memory regions, - catching invalid accesses to them. The MI catches out of bounds - memory accesses too. - - If in doubt, say N here. - config IBM_ASM tristate "Device driver for IBM RSA service processor" --- 56,59 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/sound/ppc Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:50:28 -0000 1.11 --- Makefile 25 Oct 2009 18:53:46 -0000 1.12 *************** *** 5,13 **** snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o - snd-gcn-objs := gcn-ai.o # Toplevel Module Dependency obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o obj-$(CONFIG_SND_PS3) += snd_ps3.o - obj-$(CONFIG_SND_GAMECUBE) += snd-gcn.o - obj-$(CONFIG_SND_GAMECUBE_MIC) += gcn-mic.o --- 5,10 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Kconfig 25 Oct 2009 18:50:28 -0000 1.20 --- Kconfig 25 Oct 2009 18:53:46 -0000 1.21 *************** *** 50,70 **** default "2000" - config SND_GAMECUBE - tristate "Nintendo GameCube/Wii" - depends on SND && GAMECUBE_COMMON - help - Say Y here to include support for audio on the Nintendo GameCube/Wii. - - To compile this driver as a module, choose M here: the module - will be called snd-gcn. - - config SND_GAMECUBE_MIC - tristate "Nintendo GameCube Microphone (DOL-022)" - depends on SND && GAMECUBE_EXI && EXPERIMENTAL - help - If you say yes to this option, support will be included for the - Nintendo GameCube Microphone (DOL-022). - - If in doubt, say N here. - endif # SND_PPC --- 50,52 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/net/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/net/usb Modified Files: usbnet.c Log Message: Rewind to v2.6.30. Index: usbnet.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** usbnet.c 25 Oct 2009 18:50:27 -0000 1.6 --- usbnet.c 25 Oct 2009 18:53:45 -0000 1.7 *************** *** 516,522 **** // during some PM-driven resume scenarios, // these (async) unlinks complete immediately - spin_unlock(&q->lock); retval = usb_unlink_urb (urb); - spin_lock(&q->lock); if (retval != -EINPROGRESS && retval != 0) devdbg (dev, "unlink urb err, %d", retval); --- 516,520 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/include/asm-generic In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/include/asm-generic Modified Files: gpio.h Log Message: Rewind to v2.6.30. Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-generic/gpio.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gpio.h 25 Oct 2009 18:50:28 -0000 1.5 --- gpio.h 25 Oct 2009 18:53:46 -0000 1.6 *************** *** 119,123 **** extern int gpio_direction_input(unsigned gpio); extern int gpio_direction_output(unsigned gpio, int value); - extern int gpio_direction_is_output(unsigned gpio); extern int gpio_get_value_cansleep(unsigned gpio); --- 119,122 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/kernel Modified Files: kexec.c Log Message: Rewind to v2.6.30. Index: kexec.c =================================================================== RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kexec.c 25 Oct 2009 18:50:28 -0000 1.2 --- kexec.c 25 Oct 2009 18:53:46 -0000 1.3 *************** *** 581,591 **** ! static inline int kimage_add_page_with_flags(struct kimage *image, ! unsigned long page, int flags) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | (flags & ~PAGE_MASK)); if (result == 0) image->destination += PAGE_SIZE; --- 581,590 ---- ! static int kimage_add_page(struct kimage *image, unsigned long page) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | IND_SOURCE); if (result == 0) image->destination += PAGE_SIZE; *************** *** 594,607 **** } - static int kimage_add_page(struct kimage *image, unsigned long page) - { - return kimage_add_page_with_flags(image, page, IND_SOURCE); - } - - static int kimage_add_page_noalloc(struct kimage *image, unsigned long page) - { - return kimage_add_page_with_flags(image, page, IND_SOURCE|IND_NOALLOC); - } - static void kimage_free_extra_pages(struct kimage *image) --- 593,596 ---- *************** *** 622,646 **** } - int kimage_add_preserved_region(struct kimage *image, unsigned long to, - unsigned long from, int length) - { - int result = 0; - - if (length > 0) { - result = kimage_set_destination(image, to); - if (result < 0) - goto out; - while (length > 0) { - result = kimage_add_page_noalloc(image, from); - if (result < 0) - goto out; - from += PAGE_SIZE; - length -= PAGE_SIZE; - } - } - out: - return result; - } - #define for_each_kimage_entry(image, ptr, entry) \ for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ --- 611,614 ---- *************** *** 674,682 **** */ ind = entry; - } else if (entry & IND_SOURCE) { - /* free only entries that we really allocated */ - if (!(entry & IND_NOALLOC)) - kimage_free_entry(entry); } } /* Free the final indirection page */ --- 642,648 ---- */ ind = entry; } + else if (entry & IND_SOURCE) + kimage_free_entry(entry); } /* Free the final indirection page */ |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/mm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/mm Modified Files: pgtable_32.c Log Message: Rewind to v2.6.30. Index: pgtable_32.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pgtable_32.c 25 Oct 2009 18:50:27 -0000 1.6 --- pgtable_32.c 25 Oct 2009 18:53:45 -0000 1.7 *************** *** 193,209 **** */ if (mem_init_done && (p < virt_to_phys(high_memory))) { ! /* ! * On some systems, though, we may want to remap normal RAM ! * that we have memreserve'd at the device tree. ! * But we can't do that safely if we are using BATs. ! * ! */ ! if (!__map_without_bats) { ! printk(KERN_WARNING ! "__ioremap(): phys addr 0x%llx is RAM lr %p\n", ! (unsigned long long)p, ! __builtin_return_address(0)); ! return NULL; ! } } #endif --- 193,199 ---- */ if (mem_init_done && (p < virt_to_phys(high_memory))) { ! printk("__ioremap(): phys addr 0x%llx is RAM lr %p\n", ! (unsigned long long)p, __builtin_return_address(0)); ! return NULL; } #endif |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:55
|
Update of /cvsroot/gc-linux/linux/drivers/input In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/input Modified Files: Kconfig Log Message: Rewind to v2.6.30. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.14 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.15 *************** *** 181,186 **** source "drivers/input/gameport/Kconfig" - source "drivers/input/si/Kconfig" - endmenu --- 181,184 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:53
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/boot Modified Files: Makefile wrapper Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:50:26 -0000 1.11 --- Makefile 25 Oct 2009 18:53:45 -0000 1.12 *************** *** 66,70 **** 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ ! fsl-soc.c mpc8xx.c pq2.c ugecon.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ cuboot-ebony.c treeboot-ebony.c prpmc2800.c \ --- 66,70 ---- 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ ! fsl-soc.c mpc8xx.c pq2.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ cuboot-ebony.c treeboot-ebony.c prpmc2800.c \ *************** *** 76,80 **** cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c gamecube.c wii.c src-boot := $(src-wlib) $(src-plat) empty.c --- 76,80 ---- cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c src-boot := $(src-wlib) $(src-plat) empty.c *************** *** 253,258 **** image-$(CONFIG_MPC7448HPC2) += cuImage.mpc7448hpc2 image-$(CONFIG_PPC_C2K) += cuImage.c2k - image-$(CONFIG_GAMECUBE) += dtbImage.gamecube - image-$(CONFIG_WII) += dtbImage.wii # Board port in arch/powerpc/platform/amigaone/Kconfig --- 253,256 ---- Index: wrapper =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wrapper 25 Oct 2009 18:50:26 -0000 1.2 --- wrapper 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 226,232 **** binary=y ;; - wii|gamecube) - link_address='0x500000' - ;; esac --- 226,229 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:53
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc Modified Files: Kconfig Kconfig.debug Log Message: Rewind to v2.6.30. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:50:26 -0000 1.10 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 659,663 **** bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx --- 659,663 ---- bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx Index: Kconfig.debug =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Kconfig.debug 25 Oct 2009 18:50:26 -0000 1.9 --- Kconfig.debug 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 225,236 **** has run, and set up the CPM in a particular way. - config PPC_EARLY_DEBUG_USBGECKO - bool "Early debugging through the USB Gecko adapter" - depends on GAMECUBE_COMMON - select USBGECKO_UDBG - help - Select this to enable early debugging for Nintendo GameCube/Wii - consoles via an external USB Gecko adapter. - endchoice --- 225,228 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:53
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/kernel Modified Files: cputable.c dma.c head_32.S udbg.c Log Message: Rewind to v2.6.30. Index: udbg.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/udbg.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** udbg.c 25 Oct 2009 18:50:26 -0000 1.7 --- udbg.c 25 Oct 2009 18:53:45 -0000 1.8 *************** *** 61,66 **** #elif defined(CONFIG_PPC_EARLY_DEBUG_CPM) udbg_init_cpm(); - #elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO) - udbg_init_usbgecko(); #endif --- 61,64 ---- Index: dma.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/dma.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dma.c 25 Oct 2009 18:50:26 -0000 1.2 --- dma.c 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 33,39 **** void *ret; #ifdef CONFIG_NOT_COHERENT_CACHE - if (dma_alloc_from_coherent(dev, size, dma_handle, &ret)) - return ret; - ret = __dma_alloc_coherent(dev, size, dma_handle, flag); if (ret == NULL) --- 33,36 ---- *************** *** 63,68 **** { #ifdef CONFIG_NOT_COHERENT_CACHE - if (dma_release_from_coherent(dev, get_order(size), vaddr)) - return; __dma_free_coherent(size, vaddr); #else --- 60,63 ---- Index: head_32.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** head_32.S 25 Oct 2009 18:50:26 -0000 1.11 --- head_32.S 25 Oct 2009 18:53:45 -0000 1.12 *************** *** 165,171 **** bl setup_cpm_bat #endif - #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO - bl setup_usbgecko_bat - #endif /* --- 165,168 ---- *************** *** 1297,1318 **** #endif - #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO - setup_usbgecko_bat: - /* prepare a BAT for early io */ - lis r8, 0x0c00 - ori r8, r8, 0x002a /* uncached, guarded ,rw */ - lis r11, 0xcc00 - ori r11, r11, 0x3 /* 128K */ - #ifdef CONFIG_WII - oris r8, r8, 0x0100 - oris r11, r11, 0x0100 - #endif - mtspr SPRN_DBAT1L, r8 - mtspr SPRN_DBAT1U, r11 - sync - isync - blr - #endif - #ifdef CONFIG_8260 /* Jump into the system reset for the rom. --- 1294,1297 ---- Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** cputable.c 25 Oct 2009 18:50:26 -0000 1.10 --- cputable.c 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 691,699 **** .platform = "ppc750", }, ! { /* 745/755 */ ! .pvr_mask = 0xfffff000, ! .pvr_value = 0x00083000, ! .cpu_name = "745/755", ! .cpu_features = CPU_FTRS_750, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, --- 691,699 ---- .platform = "ppc750", }, ! { /* 750CL */ ! .pvr_mask = 0xfffff0f0, ! .pvr_value = 0x00087010, ! .cpu_name = "750CL", ! .cpu_features = CPU_FTRS_750CL, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, *************** *** 706,716 **** .platform = "ppc750", }, ! { /* 750CL (and "Broadway") */ ! .pvr_mask = 0xfffff0e0, ! .pvr_value = 0x00087000, ! .cpu_name = "750CL", ! .cpu_features = CPU_FTRS_750CL, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, ! .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, --- 706,716 ---- .platform = "ppc750", }, ! { /* 745/755 */ ! .pvr_mask = 0xfffff000, ! .pvr_value = 0x00083000, ! .cpu_name = "745/755", ! .cpu_features = CPU_FTRS_750, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, ! .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, |
|
From: Albert H. <he...@us...> - 2009-10-25 18:53:53
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/include/asm Modified Files: dma-mapping.h udbg.h Log Message: Rewind to v2.6.30. Index: dma-mapping.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dma-mapping.h 25 Oct 2009 18:50:26 -0000 1.2 --- dma-mapping.h 25 Oct 2009 18:53:45 -0000 1.3 *************** *** 16,20 **** #include <linux/dma-attrs.h> #include <asm/io.h> - #include <asm-generic/dma-coherent.h> #define DMA_ERROR_CODE (~(dma_addr_t)0x0) --- 16,19 ---- Index: udbg.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/udbg.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** udbg.h 25 Oct 2009 18:50:26 -0000 1.5 --- udbg.h 25 Oct 2009 18:53:45 -0000 1.6 *************** *** 52,56 **** extern void __init udbg_init_40x_realmode(void); extern void __init udbg_init_cpm(void); - extern void __init udbg_init_usbgecko(void); #endif /* __KERNEL__ */ --- 52,55 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:50:42
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/mmc/host Added Files: Kconfig Makefile sdhci-mipc.c Log Message: Merge gc-linux-v2.6.30. --- NEW FILE: sdhci-mipc.c --- /* * drivers/mmc/host/sdhci-mipc.c * * Nintendo Wii Secure Digital Host Controller Interface via 'mini' IPC (mipc). * Copyright (C) 2009 The GameCube Linux Team * Copyright (C) 2009 Albert Herranz * * Based on sdhci-of.c * * Copyright (c) 2007 Freescale Semiconductor, Inc. * Copyright (c) 2009 MontaVista Software, Inc. * * Authors: Xiaobo Xie <X....@fr...> * Anton Vorontsov <avo...@ru...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. */ #include <linux/module.h> #include <linux/init.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/of.h> #include <linux/of_platform.h> #include <linux/mmc/host.h> #include <asm/starlet.h> #include <asm/starlet-mini.h> #include "sdhci.h" #define DRV_MODULE_NAME "sdhci-mipc" #define DRV_DESCRIPTION "Secure Digital Host Controller Interface via 'mini'" #define DRV_AUTHOR "Albert Herranz" static char sdhci_mipc_driver_version[] = "0.1i"; #define drv_printk(level, format, arg...) \ printk(level DRV_MODULE_NAME ": " format , ## arg) #define DBG(fmt, arg...) drv_printk(KERN_DEBUG, "%s: " fmt, \ __func__, ## arg) struct sdhci_mipc_data { unsigned int quirks; struct sdhci_ops ops; }; struct sdhci_mipc_host { u16 xfer_mode_shadow; }; static u32 sdhci_mipc_readl(struct sdhci_host *host, int reg) { return mipc_in_be32(host->ioaddr + reg); } static u16 sdhci_mipc_readw(struct sdhci_host *host, int reg) { return mipc_in_be16(host->ioaddr + (reg ^ 0x2)); } static u8 sdhci_mipc_readb(struct sdhci_host *host, int reg) { return mipc_in_8(host->ioaddr + (reg ^ 0x3)); } static void sdhci_mipc_writel(struct sdhci_host *host, u32 val, int reg) { mipc_out_be32(host->ioaddr + reg, val); udelay(5); } static void sdhci_mipc_writew(struct sdhci_host *host, u16 val, int reg) { struct sdhci_mipc_host *mipc_host = sdhci_priv(host); int base = reg & ~0x3; int shift = (reg & 0x2) * 8; switch (reg) { case SDHCI_TRANSFER_MODE: /* * Postpone this write, we must do it together with a * command write that is down below. */ mipc_host->xfer_mode_shadow = val; return; case SDHCI_COMMAND: sdhci_mipc_writel(host, val << 16 | mipc_host->xfer_mode_shadow, SDHCI_TRANSFER_MODE); return; } mipc_clrsetbits_be32(host->ioaddr + base, 0xffff << shift, val << shift); udelay(5); } static void sdhci_mipc_writeb(struct sdhci_host *host, u8 val, int reg) { int base = reg & ~0x3; int shift = (reg & 0x3) * 8; mipc_clrsetbits_be32(host->ioaddr + base , 0xff << shift, val << shift); udelay(5); } static struct sdhci_mipc_data sdhci_mipc = { .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_32BIT_DMA_SIZE, .ops = { .readl = sdhci_mipc_readl, .readw = sdhci_mipc_readw, .readb = sdhci_mipc_readb, .writel = sdhci_mipc_writel, .writew = sdhci_mipc_writew, .writeb = sdhci_mipc_writeb, }, }; #ifdef CONFIG_PM static int sdhci_mipc_suspend(struct of_device *ofdev, pm_message_t state) { struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); return mmc_suspend_host(host->mmc, state); } static int sdhci_mipc_resume(struct of_device *ofdev) { struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); return mmc_resume_host(host->mmc); } #else #define sdhci_mipc_suspend NULL #define sdhci_mipc_resume NULL #endif static int __devinit sdhci_mipc_probe(struct of_device *ofdev, const struct of_device_id *match) { struct device_node *np = ofdev->node; struct sdhci_mipc_data *sdhci_mipc_data = match->data; struct sdhci_host *host; struct sdhci_mipc_host *mipc_host; struct resource res; int error; if (starlet_get_ipc_flavour() != STARLET_IPC_MINI) { error = -ENODEV; goto out; } if (!of_device_is_available(np)) { error = -ENODEV; goto out; } host = sdhci_alloc_host(&ofdev->dev, sizeof(*mipc_host)); if (!host) { DBG("unable to allocate sdhci_host\n"); error = -ENODEV; goto out; } dev_set_drvdata(&ofdev->dev, host); error = of_address_to_resource(np, 0, &res); if (error) { DBG("of_address_to_resource failed (%d)\n", error); goto err_no_address; } host->ioaddr = mipc_ioremap(res.start, resource_size(&res)); if (!host->ioaddr) { DBG("ioremap failed\n"); error = -EINVAL; goto err_ioremap; } host->irq = irq_of_parse_and_map(np, 0); if (!host->irq) { DBG("irq_of_parse_and_map failed\n"); error = -EINVAL; goto err_no_irq; } host->hw_name = dev_name(&ofdev->dev); if (sdhci_mipc_data) { host->quirks = sdhci_mipc_data->quirks; host->ops = &sdhci_mipc_data->ops; } error = sdhci_add_host(host); if (error) { DBG("sdhci_add_host failed\n"); goto err_add_host; } return 0; err_add_host: irq_dispose_mapping(host->irq); err_no_irq: mipc_iounmap(host->ioaddr); err_ioremap: err_no_address: sdhci_free_host(host); out: return error; } static int __devexit sdhci_mipc_remove(struct of_device *ofdev) { struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); sdhci_remove_host(host, 0); irq_dispose_mapping(host->irq); mipc_iounmap(host->ioaddr); sdhci_free_host(host); return 0; } static const struct of_device_id sdhci_mipc_match[] = { { .compatible = "nintendo,hollywood-sdhci", .data = &sdhci_mipc, }, {}, }; MODULE_DEVICE_TABLE(of, sdhci_mipc_match); static struct of_platform_driver sdhci_mipc_driver = { .driver.name = DRV_MODULE_NAME, .match_table = sdhci_mipc_match, .probe = sdhci_mipc_probe, .remove = __devexit_p(sdhci_mipc_remove), .suspend = sdhci_mipc_suspend, .resume = sdhci_mipc_resume, }; static int __init sdhci_mipc_init(void) { drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION, sdhci_mipc_driver_version); return of_register_platform_driver(&sdhci_mipc_driver); } module_init(sdhci_mipc_init); static void __exit sdhci_mipc_exit(void) { of_unregister_platform_driver(&sdhci_mipc_driver); } module_exit(sdhci_mipc_exit); MODULE_AUTHOR(DRV_AUTHOR); MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_LICENSE("GPL"); --- NEW FILE: Makefile --- # # Makefile for MMC/SD host controller drivers # ifeq ($(CONFIG_MMC_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif obj-$(CONFIG_MMC_ARMMMCI) += mmci.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o obj-$(CONFIG_MMC_SDHCI_MIPC) += sdhci-mipc.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o obj-$(CONFIG_MMC_AT91) += at91_mci.o obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o ifeq ($(CONFIG_OF),y) obj-$(CONFIG_MMC_SPI) += of_mmc_spi.o endif obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o --- NEW FILE: Kconfig --- # # MMC/SD host controller drivers # comment "MMC/SD/SDIO Host Controller Drivers" config MMC_ARMMMCI tristate "ARM AMBA Multimedia Card Interface support" depends on ARM_AMBA help This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card Interface (PL180 and PL181) support. If you have an ARM(R) platform with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_PXA tristate "Intel PXA25x/26x/27x Multimedia Card Interface support" depends on ARCH_PXA help This selects the Intel(R) PXA(R) Multimedia card Interface. If you have a PXA(R) platform with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_SDHCI tristate "Secure Digital Host Controller Interface support" depends on HAS_DMA help This selects the generic Secure Digital Host Controller Interface. It is used by manufacturers such as Texas Instruments(R), Ricoh(R) and Toshiba(R). Most controllers found in laptops are of this type. If you have a controller with this interface, say Y or M here. You also need to enable an appropriate bus interface. If unsure, say N. config MMC_SDHCI_IO_ACCESSORS bool depends on MMC_SDHCI help This is silent Kconfig symbol that is selected by the drivers that need to overwrite SDHCI IO memory accessors. config MMC_SDHCI_PCI tristate "SDHCI support on PCI bus" depends on MMC_SDHCI && PCI help This selects the PCI Secure Digital Host Controller Interface. Most controllers found today are PCI devices. If you have a controller with this interface, say Y or M here. If unsure, say N. config MMC_RICOH_MMC tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)" depends on MMC_SDHCI_PCI help This selects the disabler for the Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them useless. It is safe to select this driver even if you don't have a Ricoh based card reader. To compile this driver as a module, choose M here: the module will be called ricoh_mmc. If unsure, say Y. config MMC_SDHCI_OF tristate "SDHCI support on OpenFirmware platforms" depends on MMC_SDHCI && PPC_OF select MMC_SDHCI_IO_ACCESSORS help This selects the OF support for Secure Digital Host Controller Interfaces. So far, only the Freescale eSDHC controller is known to exist on OF platforms. If unsure, say N. config MMC_SDHCI_MIPC tristate "Nintendo Wii SDHCI support via 'mini'" depends on MMC_SDHCI && STARLET_MINI select MMC_SDHCI_IO_ACCESSORS help This selects the Nintendo Wii Secure Digital Host Controller Interface. The SDHC hardware is accessed via the 'mini' firmware replacement for Starlet. If unsure, say N. config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP select TPS65010 if MACH_OMAP_H2 help This selects the TI OMAP Multimedia card Interface. If you have an OMAP board with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" depends on ARCH_OMAP2430 || ARCH_OMAP3 help This selects the TI OMAP High Speed Multimedia card Interface. If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_WBSD tristate "Winbond W83L51xD SD/MMC Card Interface support" depends on ISA_DMA_API help This selects the Winbond(R) W83L51xD Secure digital and Multimedia card Interface. If you have a machine with a integrated W83L518D or W83L519D SD/MMC card reader, say Y or M here. If unsure, say N. config MMC_AU1X tristate "Alchemy AU1XX0 MMC Card Interface support" depends on SOC_AU1200 help This selects the AMD Alchemy(R) Multimedia card interface. If you have a Alchemy platform with a MMC slot, say Y or M here. If unsure, say N. config MMC_AT91 tristate "AT91 SD/MMC Card Interface support" depends on ARCH_AT91 help This selects the AT91 MCI controller. If unsure, say N. config MMC_ATMELMCI tristate "Atmel Multimedia Card Interface support" depends on AVR32 help This selects the Atmel Multimedia Card Interface driver. If you have an AT32 (AVR32) platform with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support (EXPERIMENTAL)" depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL help Say Y here to have the Atmel MCI driver use a DMA engine to do data transfers and thus increase the throughput and reduce the CPU utilization. Note that this is highly experimental and may cause the driver to lock up. If unsure, say N. config MMC_IMX tristate "Motorola i.MX Multimedia Card Interface support" depends on ARCH_IMX help This selects the Motorola i.MX Multimedia card Interface. If you have a i.MX platform with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_MXC tristate "Freescale i.MX2/3 Multimedia Card Interface support" depends on ARCH_MXC help This selects the Freescale i.MX2/3 Multimedia card Interface. If you have a i.MX platform with a Multimedia Card slot, say Y or M here. If unsure, say N. config MMC_TIFM_SD tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" depends on EXPERIMENTAL && PCI select TIFM_CORE help Say Y here if you want to be able to access MMC/SD cards with the Texas Instruments(R) Flash Media card reader, found in many laptops. This option 'selects' (turns on, enables) 'TIFM_CORE', but you probably also need appropriate card reader host adapter, such as 'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support (TIFM_7XX1)'. To compile this driver as a module, choose M here: the module will be called tifm_sd. config MMC_MVSDIO tristate "Marvell MMC/SD/SDIO host driver" depends on PLAT_ORION ---help--- This selects the Marvell SDIO host driver. SDIO may currently be found on the Kirkwood 88F6281 and 88F6192 SoC controllers. To compile this driver as a module, choose M here: the module will be called mvsdio. config MMC_SPI tristate "MMC/SD/SDIO over SPI" depends on SPI_MASTER && !HIGHMEM && HAS_DMA select CRC7 select CRC_ITU_T help Some systems access MMC/SD/SDIO cards using a SPI controller instead of using a "native" MMC/SD/SDIO controller. This has a disadvantage of being relatively high overhead, but a compensating advantage of working on many systems without dedicated MMC/SD/SDIO controllers. If unsure, or if your system has no SPI master driver, say N. config MMC_S3C tristate "Samsung S3C SD/MMC Card Interface support" depends on ARCH_S3C2410 help This selects a driver for the MCI interface found in Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs. If you have a board based on one of those and a MMC/SD slot, say Y or M here. If unsure, say N. config MMC_SDRICOH_CS tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)" depends on EXPERIMENTAL && PCI && PCMCIA help Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA card whenever you insert a MMC or SD card into the card slot. To compile this driver as a module, choose M here: the module will be called sdricoh_cs. config MMC_TMIO tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" depends on MFD_TMIO help This provides support for the SD/MMC cell found in TC6393XB, T7L66XB and also ipaq ASIC3 |
|
From: Albert H. <he...@us...> - 2009-10-25 18:50:42
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/video Modified Files: Kconfig Makefile gcnfb.c Log Message: Merge gc-linux-v2.6.30. Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** gcnfb.c 28 Mar 2009 20:44:19 -0000 1.25 --- gcnfb.c 25 Oct 2009 18:50:27 -0000 1.26 *************** *** 40,44 **** "Albert Herranz" ! static char vifb_driver_version[] = "2.0i"; #define drv_printk(level, format, arg...) \ --- 40,44 ---- "Albert Herranz" ! static char vifb_driver_version[] = "2.1i"; #define drv_printk(level, format, arg...) \ *************** *** 524,527 **** --- 524,530 ---- static int want_ypan = 1; /* 0..nothing, 1..ypan */ + /* use old behaviour for video mode settings */ + static int nostalgic; + static int force_scan; static int force_rate; *************** *** 1644,1648 **** spin_lock_irqsave(&ctl->lock, flags); ! ctl->visible_page = (offset) ? 1 : 0; spin_unlock_irqrestore(&ctl->lock, flags); --- 1647,1654 ---- spin_lock_irqsave(&ctl->lock, flags); ! if (info->fix.smem_start + offset >= ctl->page_address[1]) ! ctl->visible_page = 1; ! else ! ctl->visible_page = 0; spin_unlock_irqrestore(&ctl->lock, flags); *************** *** 1656,1661 **** --- 1662,1671 ---- struct vi_tv_mode *mode = ctl->mode; struct vi_mode_timings timings; + u32 yres = var->yres; int error = -EINVAL; + if (nostalgic && yres == 576) + yres = 574; + if (vi_vmode_is_progressive(var->vmode)) { /* 480p */ *************** *** 1666,1670 **** /* 576i */ error = vi_pal_625_calc_timings(&timings, var, ! var->xres, var->yres); else /* 480i */ --- 1676,1680 ---- /* 576i */ error = vi_pal_625_calc_timings(&timings, var, ! var->xres, yres); else /* 480i */ *************** *** 1708,1713 **** yres = _ALIGN_UP(yres, VI_VERT_ALIGN+1); if (yres > mode->height) { ! drv_printk(KERN_ERR, "yres %u out of bounds\n", yres); ! goto err_out; } if (yres < 16) { --- 1718,1727 ---- yres = _ALIGN_UP(yres, VI_VERT_ALIGN+1); if (yres > mode->height) { ! if (!nostalgic) { ! drv_printk(KERN_ERR, "yres %u out of bounds\n", yres); ! goto err_out; ! } ! if (!(mode->height == 574 && yres == 576)) ! yres = mode->height; } if (yres < 16) { *************** *** 1798,1801 **** --- 1812,1822 ---- info->fix.line_length = var->xres_virtual * (var->bits_per_pixel / 8); + ctl->page_address[0] = info->fix.smem_start; + if (var->yres * info->fix.line_length <= info->fix.smem_len / 2) + ctl->page_address[1] = + info->fix.smem_start + var->yres * info->fix.line_length; + else + ctl->page_address[1] = info->fix.smem_start; + /* set page 0 as the visible page and cancel pending flips */ spin_lock_irqsave(&ctl->lock, flags); *************** *** 1814,1824 **** } - ctl->page_address[0] = info->fix.smem_start; - if (var->yres * info->fix.line_length <= info->fix.smem_len / 2) - ctl->page_address[1] = - info->fix.smem_start + var->yres * info->fix.line_length; - else - ctl->page_address[1] = info->fix.smem_start; - vi_setup_tv_mode(ctl); --- 1835,1838 ---- *************** *** 1991,2000 **** vi_detect_tv_mode(ctl); ! /* by default, start with overscan compensation */ ! info->var.xres = 576; ! if (ctl->mode->height == 574) ! info->var.yres = 516; ! else ! info->var.yres = 432; ctl->visible_page = 0; --- 2005,2019 ---- vi_detect_tv_mode(ctl); ! if (!nostalgic) { ! /* by default, start with overscan compensation */ ! info->var.xres = 576; ! if (ctl->mode->height == 574) ! info->var.yres = 516; ! else ! info->var.yres = 432; ! } else { ! info->var.xres = ctl->mode->width; ! info->var.yres = ctl->mode->height; ! } ctl->visible_page = 0; *************** *** 2135,2139 **** else if (!strncmp(this_opt + 3, "NTSC", 4)) force_tv = VI_TV_NTSC; ! } } --- 2154,2159 ---- else if (!strncmp(this_opt + 3, "NTSC", 4)) force_tv = VI_TV_NTSC; ! } else if (!strcmp(this_opt, "nostalgic")) ! nostalgic = 1; } Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Makefile 25 Oct 2009 18:45:36 -0000 1.32 --- Makefile 25 Oct 2009 18:50:27 -0000 1.33 *************** *** 126,129 **** --- 126,130 ---- obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ + obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o # Platform or fallback drivers go here Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Kconfig 25 Oct 2009 18:45:36 -0000 1.36 --- Kconfig 25 Oct 2009 18:50:27 -0000 1.37 *************** *** 1664,1667 **** --- 1664,1686 ---- endchoice + config FB_GAMECUBE + bool "Nintendo GameCube/Wii frame buffer" + depends on FB && GAMECUBE_COMMON + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the Nintendo GameCube. + + config WII_AVE_RVL + bool "Nintendo Wii audio/video encoder support" + depends on FB_GAMECUBE && WII + select I2C_GPIO + select I2C + default y + help + Say Y here to support the audio/video encoder found in the + Nintendo Wii video game console. + config FB_AU1100 bool "Au1100 LCD Driver" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:50:42
|
Update of /cvsroot/gc-linux/linux/drivers/gpio In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/gpio Modified Files: gpiolib.c Log Message: Merge gc-linux-v2.6.30. Index: gpiolib.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/gpio/gpiolib.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gpiolib.c 25 Oct 2009 18:45:35 -0000 1.4 --- gpiolib.c 25 Oct 2009 18:50:27 -0000 1.5 *************** *** 1006,1009 **** --- 1006,1027 ---- EXPORT_SYMBOL_GPL(gpio_direction_output); + /** + * gpio_direction_is_output - tell if a gpio is configured as an output + * @gpio: gpio in question + * + * Returns a negative errno if the given gpio is not valid. + * Returns a positive non-zero if the gpio is configured as an output. + * Returns zero otherwise. + */ + int gpio_direction_is_output(unsigned gpio) + { + struct gpio_desc *desc = &gpio_desc[gpio]; + + if (!gpio_is_valid(gpio)) + return -EINVAL; + + return test_bit(FLAG_IS_OUT, &desc->flags); + } + EXPORT_SYMBOL_GPL(gpio_direction_is_output); /* I/O calls are only valid after configuration completed; the relevant |
|
From: Albert H. <he...@us...> - 2009-10-25 18:50:42
|
Update of /cvsroot/gc-linux/linux/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/kernel Modified Files: kexec.c Log Message: Merge gc-linux-v2.6.30. Index: kexec.c =================================================================== RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kexec.c 25 Oct 2009 18:45:36 -0000 1.1 --- kexec.c 25 Oct 2009 18:50:28 -0000 1.2 *************** *** 581,590 **** ! static int kimage_add_page(struct kimage *image, unsigned long page) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | IND_SOURCE); if (result == 0) image->destination += PAGE_SIZE; --- 581,591 ---- ! static inline int kimage_add_page_with_flags(struct kimage *image, ! unsigned long page, int flags) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | (flags & ~PAGE_MASK)); if (result == 0) image->destination += PAGE_SIZE; *************** *** 593,596 **** --- 594,607 ---- } + static int kimage_add_page(struct kimage *image, unsigned long page) + { + return kimage_add_page_with_flags(image, page, IND_SOURCE); + } + + static int kimage_add_page_noalloc(struct kimage *image, unsigned long page) + { + return kimage_add_page_with_flags(image, page, IND_SOURCE|IND_NOALLOC); + } + static void kimage_free_extra_pages(struct kimage *image) *************** *** 611,614 **** --- 622,646 ---- } + int kimage_add_preserved_region(struct kimage *image, unsigned long to, + unsigned long from, int length) + { + int result = 0; + + if (length > 0) { + result = kimage_set_destination(image, to); + if (result < 0) + goto out; + while (length > 0) { + result = kimage_add_page_noalloc(image, from); + if (result < 0) + goto out; + from += PAGE_SIZE; + length -= PAGE_SIZE; + } + } + out: + return result; + } + #define for_each_kimage_entry(image, ptr, entry) \ for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ *************** *** 642,648 **** */ ind = entry; } - else if (entry & IND_SOURCE) - kimage_free_entry(entry); } /* Free the final indirection page */ --- 674,682 ---- */ ind = entry; + } else if (entry & IND_SOURCE) { + /* free only entries that we really allocated */ + if (!(entry & IND_NOALLOC)) + kimage_free_entry(entry); } } /* Free the final indirection page */ |
|
From: Albert H. <he...@us...> - 2009-10-25 18:50:42
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/block Modified Files: Kconfig Makefile rvl-mem2.c rvl-stsd.c Log Message: Merge gc-linux-v2.6.30. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Kconfig 25 Oct 2009 18:45:35 -0000 1.38 --- Kconfig 25 Oct 2009 18:50:27 -0000 1.39 *************** *** 64,67 **** --- 64,132 ---- module will be called z2ram. + config GAMECUBE_SD + tristate "Nintendo GameCube/Wii MMC/SD card" + depends on GAMECUBE_EXI + help + This enables support for using SD and MMC cards through + the Nintendo SD Card Adapter (DOL-019) or compatible hardware. + + You probably want to compile FAT support, and the required + codepages, or mount will complain. See Filesystems -> DOS/FAT/NT + filesystems and Filesystems -> Native Language Support + + Say Y if you want to include this driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called gcn-sd. + + config GAMECUBE_ARAM + tristate "Nintendo GameCube Auxiliary RAM (ARAM)" + depends on GAMECUBE + help + This enables support for using the 16MB of ARAM found in the + Nintendo GameCube as a block device. + Say Y if you want to include this driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called gcn-aram. + + config GAMECUBE_DI + tristate "Nintendo GameCube Disk Interface (DI)" + depends on GAMECUBE + help + This enables support for using the DVD drive unit found + in the Nintendo GameCube. + Say Y if you want to include this driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called gcn-di. + + config WII_MEM2 + tristate "Nintendo Wii MEM2" + depends on WII + help + This enables support for using the MEM2 found in the + Nintendo Wii as a block device. + Say Y if you want to include this driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called rvl-mem2. + + config WII_SD + tristate "Nintendo Wii front slot MMC/SD" + depends on STARLET_IOS + help + This enables support for MMC/SD cards using the front SD card + slot of the Nintendo Wii. + + You probably want to compile FAT support, and the required + codepages, or mount will complain. See Filesystems -> DOS/FAT/NT + filesystems and Filesystems -> Native Language Support + + Say Y if you want to include this driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called rvl-stsd. + config BLK_DEV_XD tristate "XT hard disk support" Index: rvl-mem2.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-mem2.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rvl-mem2.c 2 Mar 2009 18:51:03 -0000 1.6 --- rvl-mem2.c 25 Oct 2009 18:50:27 -0000 1.7 *************** *** 100,104 **** error = 0; } ! blk_end_request(req, error, len); } else { end_request(req, 0); --- 100,104 ---- error = 0; } ! __blk_end_request(req, error, len); } else { end_request(req, 0); Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile 25 Oct 2009 18:45:35 -0000 1.26 --- Makefile 25 Oct 2009 18:50:27 -0000 1.27 *************** *** 14,17 **** --- 14,22 ---- obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o + obj-$(CONFIG_GAMECUBE_SD) += gcn-sd.o + obj-$(CONFIG_GAMECUBE_ARAM) += gcn-aram.o + obj-$(CONFIG_GAMECUBE_DI) += gcn-di/ + obj-$(CONFIG_WII_MEM2) += rvl-mem2.o + obj-$(CONFIG_WII_SD) += rvl-stsd.o obj-$(CONFIG_BLK_DEV_RAM) += brd.o obj-$(CONFIG_BLK_DEV_LOOP) += loop.o Index: rvl-stsd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-stsd.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rvl-stsd.c 2 Mar 2009 18:49:41 -0000 1.7 --- rvl-stsd.c 25 Oct 2009 18:50:27 -0000 1.8 *************** *** 36,39 **** --- 36,40 ---- #include <linux/of_platform.h> #include <asm/starlet.h> + #include <asm/starlet-ios.h> /* *************** *** 52,56 **** #define DRV_AUTHOR "Albert Herranz" ! static char stsd_driver_version[] = "0.3i"; #define drv_printk(level, format, arg...) \ --- 53,57 ---- #define DRV_AUTHOR "Albert Herranz" ! static char stsd_driver_version[] = "0.4i"; #define drv_printk(level, format, arg...) \ *************** *** 2199,2202 **** --- 2200,2206 ---- int error; + if (starlet_get_ipc_flavour() != STARLET_IPC_IOS) + return -ENODEV; + host = kzalloc(sizeof(*host), GFP_KERNEL); if (!host) { *************** *** 2247,2251 **** static struct of_device_id stsd_of_match[] = { ! { .compatible = "nintendo,starlet-sd" }, { }, }; --- 2251,2255 ---- static struct of_device_id stsd_of_match[] = { ! { .compatible = "nintendo,starlet-ios-sd" }, { }, }; |
165 messages has been excluded from this view by a project administrator.
