tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc

* 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
AT91: Change nand buswidth logic to match hardware default configuration
at91: Use "pclk" as con_id on at91cap9 and at91rm9200
at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
atmel_serial: fix internal port num
at91: fix at91_set_serial_console: use platform device id

Linus Torvalds fc52693f aababb97

+34 -33
+4 -4
arch/arm/mach-at91/at91cap9.c
··· 223 223 }; 224 224 225 225 static struct clk_lookup periph_clocks_lookups[] = { 226 - CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk), 227 - CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk), 226 + CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), 227 + CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), 228 228 CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), 229 229 CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk), 230 230 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), 231 231 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), 232 232 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), 233 - CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), 234 - CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), 233 + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), 234 + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), 235 235 }; 236 236 237 237 static struct clk_lookup usart_clocks_lookups[] = {
+1 -1
arch/arm/mach-at91/at91cap9_devices.c
··· 1220 1220 { 1221 1221 if (portnr < ATMEL_MAX_UART) { 1222 1222 atmel_default_console_device = at91_uarts[portnr]; 1223 - at91cap9_set_console_clock(portnr); 1223 + at91cap9_set_console_clock(at91_uarts[portnr]->id); 1224 1224 } 1225 1225 } 1226 1226
+3 -3
arch/arm/mach-at91/at91rm9200.c
··· 199 199 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), 200 200 CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), 201 201 CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), 202 - CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), 203 - CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), 204 - CLKDEV_CON_DEV_ID("ssc", "ssc.2", &ssc2_clk), 202 + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), 203 + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), 204 + CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), 205 205 }; 206 206 207 207 static struct clk_lookup usart_clocks_lookups[] = {
+1 -1
arch/arm/mach-at91/at91rm9200_devices.c
··· 1135 1135 { 1136 1136 if (portnr < ATMEL_MAX_UART) { 1137 1137 atmel_default_console_device = at91_uarts[portnr]; 1138 - at91rm9200_set_console_clock(portnr); 1138 + at91rm9200_set_console_clock(at91_uarts[portnr]->id); 1139 1139 } 1140 1140 } 1141 1141
+1 -1
arch/arm/mach-at91/at91sam9260_devices.c
··· 1173 1173 { 1174 1174 if (portnr < ATMEL_MAX_UART) { 1175 1175 atmel_default_console_device = at91_uarts[portnr]; 1176 - at91sam9260_set_console_clock(portnr); 1176 + at91sam9260_set_console_clock(at91_uarts[portnr]->id); 1177 1177 } 1178 1178 } 1179 1179
+1 -1
arch/arm/mach-at91/at91sam9261_devices.c
··· 1013 1013 { 1014 1014 if (portnr < ATMEL_MAX_UART) { 1015 1015 atmel_default_console_device = at91_uarts[portnr]; 1016 - at91sam9261_set_console_clock(portnr); 1016 + at91sam9261_set_console_clock(at91_uarts[portnr]->id); 1017 1017 } 1018 1018 } 1019 1019
+1 -1
arch/arm/mach-at91/at91sam9263_devices.c
··· 1395 1395 { 1396 1396 if (portnr < ATMEL_MAX_UART) { 1397 1397 atmel_default_console_device = at91_uarts[portnr]; 1398 - at91sam9263_set_console_clock(portnr); 1398 + at91sam9263_set_console_clock(at91_uarts[portnr]->id); 1399 1399 } 1400 1400 } 1401 1401
+5 -5
arch/arm/mach-at91/at91sam9g45.c
··· 217 217 static struct clk_lookup periph_clocks_lookups[] = { 218 218 /* One additional fake clock for ohci */ 219 219 CLKDEV_CON_ID("ohci_clk", &uhphs_clk), 220 - CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci.0", &uhphs_clk), 221 - CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk), 222 - CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk), 223 - CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), 224 - CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk), 220 + CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci", &uhphs_clk), 221 + CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), 222 + CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), 223 + CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk), 224 + CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk), 225 225 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), 226 226 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), 227 227 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb0_clk),
+1 -1
arch/arm/mach-at91/at91sam9g45_devices.c
··· 1550 1550 { 1551 1551 if (portnr < ATMEL_MAX_UART) { 1552 1552 atmel_default_console_device = at91_uarts[portnr]; 1553 - at91sam9g45_set_console_clock(portnr); 1553 + at91sam9g45_set_console_clock(at91_uarts[portnr]->id); 1554 1554 } 1555 1555 } 1556 1556
+2 -2
arch/arm/mach-at91/at91sam9rl.c
··· 191 191 }; 192 192 193 193 static struct clk_lookup periph_clocks_lookups[] = { 194 - CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk), 195 - CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk), 194 + CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), 195 + CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), 196 196 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), 197 197 CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), 198 198 CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
+1 -1
arch/arm/mach-at91/at91sam9rl_devices.c
··· 1168 1168 { 1169 1169 if (portnr < ATMEL_MAX_UART) { 1170 1170 atmel_default_console_device = at91_uarts[portnr]; 1171 - at91sam9rl_set_console_clock(portnr); 1171 + at91sam9rl_set_console_clock(at91_uarts[portnr]->id); 1172 1172 } 1173 1173 } 1174 1174
+1 -1
arch/arm/mach-at91/board-cap9adk.c
··· 215 215 csa = at91_sys_read(AT91_MATRIX_EBICSA); 216 216 at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V); 217 217 218 - cap9adk_nand_data.bus_width_16 = !board_have_nand_8bit(); 218 + cap9adk_nand_data.bus_width_16 = board_have_nand_16bit(); 219 219 /* setup bus-width (8 or 16) */ 220 220 if (cap9adk_nand_data.bus_width_16) 221 221 cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16;
+1 -1
arch/arm/mach-at91/board-sam9260ek.c
··· 214 214 215 215 static void __init ek_add_device_nand(void) 216 216 { 217 - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); 217 + ek_nand_data.bus_width_16 = board_have_nand_16bit(); 218 218 /* setup bus-width (8 or 16) */ 219 219 if (ek_nand_data.bus_width_16) 220 220 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+1 -1
arch/arm/mach-at91/board-sam9261ek.c
··· 220 220 221 221 static void __init ek_add_device_nand(void) 222 222 { 223 - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); 223 + ek_nand_data.bus_width_16 = board_have_nand_16bit(); 224 224 /* setup bus-width (8 or 16) */ 225 225 if (ek_nand_data.bus_width_16) 226 226 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+1 -1
arch/arm/mach-at91/board-sam9263ek.c
··· 221 221 222 222 static void __init ek_add_device_nand(void) 223 223 { 224 - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); 224 + ek_nand_data.bus_width_16 = board_have_nand_16bit(); 225 225 /* setup bus-width (8 or 16) */ 226 226 if (ek_nand_data.bus_width_16) 227 227 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+1 -1
arch/arm/mach-at91/board-sam9g20ek.c
··· 198 198 199 199 static void __init ek_add_device_nand(void) 200 200 { 201 - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); 201 + ek_nand_data.bus_width_16 = board_have_nand_16bit(); 202 202 /* setup bus-width (8 or 16) */ 203 203 if (ek_nand_data.bus_width_16) 204 204 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+1 -1
arch/arm/mach-at91/board-sam9m10g45ek.c
··· 178 178 179 179 static void __init ek_add_device_nand(void) 180 180 { 181 - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); 181 + ek_nand_data.bus_width_16 = board_have_nand_16bit(); 182 182 /* setup bus-width (8 or 16) */ 183 183 if (ek_nand_data.bus_width_16) 184 184 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+5 -5
arch/arm/mach-at91/include/mach/system_rev.h
··· 13 13 * the 16-31 bit are reserved for at91 generic information 14 14 * 15 15 * bit 31: 16 - * 0 => nand 16 bit 17 - * 1 => nand 8 bit 16 + * 0 => nand 8 bit 17 + * 1 => nand 16 bit 18 18 */ 19 - #define BOARD_HAVE_NAND_8BIT (1 << 31) 20 - static int inline board_have_nand_8bit(void) 19 + #define BOARD_HAVE_NAND_16BIT (1 << 31) 20 + static inline int board_have_nand_16bit(void) 21 21 { 22 - return system_rev & BOARD_HAVE_NAND_8BIT; 22 + return system_rev & BOARD_HAVE_NAND_16BIT; 23 23 } 24 24 25 25 #endif /* __ARCH_SYSTEM_REV_H__ */
+2 -1
drivers/tty/serial/atmel_serial.c
··· 1709 1709 static int __devinit atmel_serial_probe(struct platform_device *pdev) 1710 1710 { 1711 1711 struct atmel_uart_port *port; 1712 + struct atmel_uart_data *pdata = pdev->dev.platform_data; 1712 1713 void *data; 1713 1714 int ret; 1714 1715 1715 1716 BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1)); 1716 1717 1717 - port = &atmel_ports[pdev->id]; 1718 + port = &atmel_ports[pdata->num]; 1718 1719 port->backup_imr = 0; 1719 1720 1720 1721 atmel_init_port(port, pdev);