diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 16 | ||||
-rw-r--r-- | drivers/mmc/at91_mci.c | 4 | ||||
-rw-r--r-- | drivers/net/arm/at91_ether.c | 2 | ||||
-rw-r--r-- | drivers/serial/at91_serial.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 6 | ||||
-rw-r--r-- | drivers/video/backlight/locomolcd.c | 30 |
7 files changed, 32 insertions, 30 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 9e56c3989d68..0d9667921f61 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -196,7 +196,7 @@ config I2C_IBM_IIC | |||
196 | 196 | ||
197 | config I2C_IOP3XX | 197 | config I2C_IOP3XX |
198 | tristate "Intel IOP3xx and IXP4xx on-chip I2C interface" | 198 | tristate "Intel IOP3xx and IXP4xx on-chip I2C interface" |
199 | depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C | 199 | depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX) && I2C |
200 | help | 200 | help |
201 | Say Y here if you want to use the IIC bus controller on | 201 | Say Y here if you want to use the IIC bus controller on |
202 | the Intel IOP3xx I/O Processors or IXP4xx Network Processors. | 202 | the Intel IOP3xx I/O Processors or IXP4xx Network Processors. |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 8e413150af37..4436c89be58e 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -82,14 +82,16 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap) | |||
82 | 82 | ||
83 | /* | 83 | /* |
84 | * Every time unit enable is asserted, GPOD needs to be cleared | 84 | * Every time unit enable is asserted, GPOD needs to be cleared |
85 | * on IOP321 to avoid data corruption on the bus. | 85 | * on IOP3XX to avoid data corruption on the bus. |
86 | */ | 86 | */ |
87 | #ifdef CONFIG_ARCH_IOP321 | 87 | #ifdef CONFIG_PLAT_IOP |
88 | #define IOP321_GPOD_I2C0 0x00c0 /* clear these bits to enable ch0 */ | 88 | if (iop3xx_adap->id == 0) { |
89 | #define IOP321_GPOD_I2C1 0x0030 /* clear these bits to enable ch1 */ | 89 | gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW); |
90 | 90 | gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW); | |
91 | *IOP321_GPOD &= (iop3xx_adap->id == 0) ? ~IOP321_GPOD_I2C0 : | 91 | } else { |
92 | ~IOP321_GPOD_I2C1; | 92 | gpio_line_set(IOP3XX_GPIO_LINE(5), GPIO_LOW); |
93 | gpio_line_set(IOP3XX_GPIO_LINE(4), GPIO_LOW); | ||
94 | } | ||
93 | #endif | 95 | #endif |
94 | /* NB SR bits not same position as CR IE bits :-( */ | 96 | /* NB SR bits not same position as CR IE bits :-( */ |
95 | iop3xx_adap->SR_enabled = | 97 | iop3xx_adap->SR_enabled = |
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c index d34b7d9d92ed..cb142a66098c 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c | |||
@@ -851,7 +851,7 @@ static int at91_mci_probe(struct platform_device *pdev) | |||
851 | /* | 851 | /* |
852 | * Allocate the MCI interrupt | 852 | * Allocate the MCI interrupt |
853 | */ | 853 | */ |
854 | ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); | 854 | ret = request_irq(AT91RM9200_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); |
855 | if (ret) { | 855 | if (ret) { |
856 | printk(KERN_ERR "Failed to request MCI interrupt\n"); | 856 | printk(KERN_ERR "Failed to request MCI interrupt\n"); |
857 | clk_disable(mci_clk); | 857 | clk_disable(mci_clk); |
@@ -907,7 +907,7 @@ static int at91_mci_remove(struct platform_device *pdev) | |||
907 | 907 | ||
908 | mmc_remove_host(mmc); | 908 | mmc_remove_host(mmc); |
909 | at91_mci_disable(); | 909 | at91_mci_disable(); |
910 | free_irq(AT91_ID_MCI, host); | 910 | free_irq(AT91RM9200_ID_MCI, host); |
911 | mmc_free_host(mmc); | 911 | mmc_free_host(mmc); |
912 | 912 | ||
913 | clk_disable(mci_clk); /* Disable the peripheral clock */ | 913 | clk_disable(mci_clk); /* Disable the peripheral clock */ |
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 95b28aa01f4f..3ecf2cc53a7c 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
@@ -947,7 +947,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add | |||
947 | return -ENOMEM; | 947 | return -ENOMEM; |
948 | 948 | ||
949 | dev->base_addr = AT91_VA_BASE_EMAC; | 949 | dev->base_addr = AT91_VA_BASE_EMAC; |
950 | dev->irq = AT91_ID_EMAC; | 950 | dev->irq = AT91RM9200_ID_EMAC; |
951 | SET_MODULE_OWNER(dev); | 951 | SET_MODULE_OWNER(dev); |
952 | 952 | ||
953 | /* Install the interrupt handler */ | 953 | /* Install the interrupt handler */ |
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c index 54c6b2adf7b7..bf4bf103e5a0 100644 --- a/drivers/serial/at91_serial.c +++ b/drivers/serial/at91_serial.c | |||
@@ -139,7 +139,7 @@ static void at91_set_mctrl(struct uart_port *port, u_int mctrl) | |||
139 | * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. | 139 | * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. |
140 | * We need to drive the pin manually. | 140 | * We need to drive the pin manually. |
141 | */ | 141 | */ |
142 | if (port->mapbase == AT91_BASE_US0) { | 142 | if (port->mapbase == AT91RM9200_BASE_US0) { |
143 | if (mctrl & TIOCM_RTS) | 143 | if (mctrl & TIOCM_RTS) |
144 | at91_set_gpio_value(AT91_PIN_PA21, 0); | 144 | at91_set_gpio_value(AT91_PIN_PA21, 0); |
145 | else | 145 | else |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index d00958a01cfb..77beba485a84 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1658,7 +1658,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev) | |||
1658 | return -ENODEV; | 1658 | return -ENODEV; |
1659 | } | 1659 | } |
1660 | 1660 | ||
1661 | if (!request_mem_region(AT91_BASE_UDP, SZ_16K, driver_name)) { | 1661 | if (!request_mem_region(AT91RM9200_BASE_UDP, SZ_16K, driver_name)) { |
1662 | DBG("someone's using UDC memory\n"); | 1662 | DBG("someone's using UDC memory\n"); |
1663 | return -EBUSY; | 1663 | return -EBUSY; |
1664 | } | 1664 | } |
@@ -1720,7 +1720,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev) | |||
1720 | fail1: | 1720 | fail1: |
1721 | device_unregister(&udc->gadget.dev); | 1721 | device_unregister(&udc->gadget.dev); |
1722 | fail0: | 1722 | fail0: |
1723 | release_mem_region(AT91_BASE_UDP, SZ_16K); | 1723 | release_mem_region(AT91RM9200_BASE_UDP, SZ_16K); |
1724 | DBG("%s probe failed, %d\n", driver_name, retval); | 1724 | DBG("%s probe failed, %d\n", driver_name, retval); |
1725 | return retval; | 1725 | return retval; |
1726 | } | 1726 | } |
@@ -1742,7 +1742,7 @@ static int __devexit at91udc_remove(struct platform_device *pdev) | |||
1742 | free_irq(udc->board.vbus_pin, udc); | 1742 | free_irq(udc->board.vbus_pin, udc); |
1743 | free_irq(udc->udp_irq, udc); | 1743 | free_irq(udc->udp_irq, udc); |
1744 | device_unregister(&udc->gadget.dev); | 1744 | device_unregister(&udc->gadget.dev); |
1745 | release_mem_region(AT91_BASE_UDP, SZ_16K); | 1745 | release_mem_region(AT91RM9200_BASE_UDP, SZ_16K); |
1746 | 1746 | ||
1747 | clk_put(udc->iclk); | 1747 | clk_put(udc->iclk); |
1748 | clk_put(udc->fclk); | 1748 | clk_put(udc->fclk); |
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index caf1eca199b0..628571c63bac 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c | |||
@@ -33,19 +33,19 @@ static unsigned long locomolcd_flags; | |||
33 | 33 | ||
34 | static void locomolcd_on(int comadj) | 34 | static void locomolcd_on(int comadj) |
35 | { | 35 | { |
36 | locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0); | 36 | locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0); |
37 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 1); | 37 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 1); |
38 | mdelay(2); | 38 | mdelay(2); |
39 | 39 | ||
40 | locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0); | 40 | locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0); |
41 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 1); | 41 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 1); |
42 | mdelay(2); | 42 | mdelay(2); |
43 | 43 | ||
44 | locomo_m62332_senddata(locomolcd_dev, comadj, 0); | 44 | locomo_m62332_senddata(locomolcd_dev, comadj, 0); |
45 | mdelay(5); | 45 | mdelay(5); |
46 | 46 | ||
47 | locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0); | 47 | locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0); |
48 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 1); | 48 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 1); |
49 | mdelay(10); | 49 | mdelay(10); |
50 | 50 | ||
51 | /* TFTCRST | CPSOUT=0 | CPSEN */ | 51 | /* TFTCRST | CPSOUT=0 | CPSEN */ |
@@ -58,8 +58,8 @@ static void locomolcd_on(int comadj) | |||
58 | locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC); | 58 | locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC); |
59 | mdelay(10); | 59 | mdelay(10); |
60 | 60 | ||
61 | locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0); | 61 | locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0); |
62 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 1); | 62 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 1); |
63 | } | 63 | } |
64 | 64 | ||
65 | static void locomolcd_off(int comadj) | 65 | static void locomolcd_off(int comadj) |
@@ -68,16 +68,16 @@ static void locomolcd_off(int comadj) | |||
68 | locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC); | 68 | locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC); |
69 | mdelay(1); | 69 | mdelay(1); |
70 | 70 | ||
71 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0); | 71 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0); |
72 | mdelay(110); | 72 | mdelay(110); |
73 | 73 | ||
74 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0); | 74 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0); |
75 | mdelay(700); | 75 | mdelay(700); |
76 | 76 | ||
77 | /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */ | 77 | /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */ |
78 | locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC); | 78 | locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC); |
79 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0); | 79 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0); |
80 | locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0); | 80 | locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0); |
81 | } | 81 | } |
82 | 82 | ||
83 | void locomolcd_power(int on) | 83 | void locomolcd_power(int on) |
@@ -167,14 +167,14 @@ static int locomolcd_resume(struct locomo_dev *dev) | |||
167 | #define locomolcd_resume NULL | 167 | #define locomolcd_resume NULL |
168 | #endif | 168 | #endif |
169 | 169 | ||
170 | static int locomolcd_probe(struct locomo_dev *dev) | 170 | static int locomolcd_probe(struct locomo_dev *ldev) |
171 | { | 171 | { |
172 | unsigned long flags; | 172 | unsigned long flags; |
173 | 173 | ||
174 | local_irq_save(flags); | 174 | local_irq_save(flags); |
175 | locomolcd_dev = dev; | 175 | locomolcd_dev = ldev; |
176 | 176 | ||
177 | locomo_gpio_set_dir(dev, LOCOMO_GPIO_FL_VR, 0); | 177 | locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0); |
178 | 178 | ||
179 | /* the poodle_lcd_power function is called for the first time | 179 | /* the poodle_lcd_power function is called for the first time |
180 | * from fs_initcall, which is before locomo is activated. | 180 | * from fs_initcall, which is before locomo is activated. |