summaryrefslogtreecommitdiff
path: root/multitech/recipes/linux
diff options
context:
space:
mode:
Diffstat (limited to 'multitech/recipes/linux')
-rw-r--r--multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/defconfig (renamed from multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/defconfig)0
-rw-r--r--multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-macb-force-link.patch (renamed from multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-macb-force-link.patch)0
-rw-r--r--multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-mach-at91-mtocgd2.patch (renamed from multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch)40
-rw-r--r--multitech/recipes/linux/linux_2.6.39-at91.bb4
4 files changed, 22 insertions, 22 deletions
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/defconfig b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/defconfig
index 04fb2d9..04fb2d9 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/defconfig
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/defconfig
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-macb-force-link.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-macb-force-link.patch
index 2ef39a9..2ef39a9 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-macb-force-link.patch
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-macb-force-link.patch
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-mach-at91-mtocgd2.patch
index dbc292f..c61237e 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-mach-at91-mtocgd2.patch
@@ -102,7 +102,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
.ecc_mode = NAND_ECC_HW,
.has_pmecc = 1,
- .pmecc_corr_cap = 2,
-+// MTOCGD3: 4-bit PMECC
++// MTOCGD2: 4-bit PMECC
+ .pmecc_corr_cap = 4,
.pmecc_sector_size = 512,
.pmecc_lookup_table_offset = 0x8000,
@@ -111,11 +111,11 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
else
cm_nand_smc_config.mode |= AT91_SMC_DBW_8;
-+ // MTOCGD3 Rev B
++ // MTOCGD2 Rev B
+ cm_nand_data.bus_on_d0 = 0;
+ cm_nand_data.rdy_pin = AT91_PIN_PC31;
+
-+ // MTOCGD3: disable
++ // MTOCGD2: disable
/* revision of board modify NAND wiring */
+ /*
if (cm_is_revA()) {
@@ -246,9 +246,9 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
/* LEDs */
at91_gpio_leds(cm_leds, ARRAY_SIZE(cm_leds));
-+ printk(KERN_CRIT "AT91: MTOCGD3 board\n");
++ printk(KERN_CRIT "AT91: MTOCGD2 board\n");
+
-+ /* MTOCGD3: disable
++ /* MTOCGD2: disable
if (cm_is_revA())
printk(KERN_CRIT "AT91: CM rev A\n");
else
@@ -277,9 +277,9 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
- at91_register_uart(AT91SAM9X5_ID_USART1, 2, 0);
- /* USART2 on ttyS3. (Rx, Tx) */
- at91_register_uart(AT91SAM9X5_ID_USART2, 3, 0);
-+ // MTOCGD3: GPS on UART0 as ttyS1 with Rx/Tx only
++ // MTOCGD2: GPS on UART0 as ttyS1 with Rx/Tx only
+ at91_register_uart(AT91SAM9X5_ID_UART0, 1, 0);
-+ // MTOCGD3 Rev A: Daughter card serial on USART1 as ttyS2 with RTS/CTS
++ // MTOCGD2 Rev A: Daughter card serial on USART1 as ttyS2 with RTS/CTS
+ at91_register_uart(AT91SAM9X5_ID_USART1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
}
@@ -293,7 +293,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
+ .phy_irq_pin = 0,
};
-+/* MTOCGD3: no macb1
++/* MTOCGD2: no macb1
static struct at91_eth_data __initdata ek_macb1_data = {
.phy_irq_pin = AT91_PIN_PC26,
.is_rmii = 1,
@@ -305,7 +305,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
* MCI (SD/MMC)
*/
-/* mci0 detect_pin is revision dependent */
-+// MTOCGD3: MCI0 is BT/Wifi
++// MTOCGD2: MCI0 is BT/Wifi
static struct mci_platform_data __initdata mci0_data = {
.slot[0] = {
.bus_width = 4,
@@ -314,7 +314,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
},
};
-+// MTOCGD3: MCI1 is SD card slot
++// MTOCGD2: MCI1 is SD card slot
static struct mci_platform_data __initdata mci1_data = {
.slot[0] = {
.bus_width = 4,
@@ -371,7 +371,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
cm_board_init(&cm_config);
- ek_board_configure_pins();
-+ // MTOCGD3: disable
++ // MTOCGD2: disable
+ //ek_board_configure_pins();
/* Serial */
at91_add_device_serial();
@@ -379,16 +379,16 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
at91_add_device_usbh_ohci(&ek_usbh_fs_data);
at91_add_device_usbh_ehci(&ek_usbh_hs_data);
/* USB HS Device */
-+ // MTOCGD3: set usb device vcc pin
++ // MTOCGD2: set usb device vcc pin
+ ek_usba_udc_data.vbus_pin = AT91_PIN_PC7;
at91_add_device_usba(&ek_usba_udc_data);
/* Ethernet */
at91_add_device_eth(0, &ek_macb0_data);
-+ /* MTOCGD3: no macb1
++ /* MTOCGD2: no macb1
at91_add_device_eth(1, &ek_macb1_data);
+ */
/* MMC0 */
-+ // MTOCGD3: MCI0 for BT/Wifi
++ // MTOCGD2: MCI0 for BT/Wifi
at91_add_device_mci(0, &mci0_data);
/* I2C */
if (cm_config & CM_CONFIG_I2C0_ENABLE)
@@ -396,14 +396,14 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
at91_add_device_i2c(0,
ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
-+ // MTOCGD3: Wi-fi
++ // MTOCGD2: Wi-fi
+ at91_set_gpio_input(mtr_wlan_data.irq, 0);
+ at91_set_deglitch(mtr_wlan_data.irq, 1);
+
+ if (wl12xx_set_platform_data(&mtr_wlan_data))
+ pr_err("error setting wl12xx data\n");
+
-+/* MTOCGD3: no LCD */
++/* MTOCGD2: no LCD */
+#if 0
if (cpu_is_at91sam9g25()) {
/* ISI */
@@ -420,7 +420,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
- */
- if (!(cm_config & CM_CONFIG_SPI0_ENABLE) && !config_isi_enabled)
- at91_add_device_mci(1, &mci1_data);
-+ // MTOCGD3: MCI1 to SD Card
++ // MTOCGD2: MCI1 to SD Card
+ at91_add_device_mci(1, &mci1_data);
#if 0
@@ -429,7 +429,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
at91_add_device_can(0, NULL);
#endif
-+/* MTOCGD3: disable things we don't have */
++/* MTOCGD2: disable things we don't have */
+#if 0
if (cpu_is_at91sam9x25() || cpu_is_at91sam9x35())
/* this conflicts with usart.1 */
@@ -440,7 +440,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
"AT91: ISI conficts with MCI1, disable MCI1\n");
+#endif
+
-+ printk(KERN_CRIT "AT91: MTOCGD3 board EK init\n");
++ printk(KERN_CRIT "AT91: MTOCGD2 board EK init\n");
}
MACHINE_START(AT91SAM9X5EK, "Atmel AT91SAM9X5-EK")
@@ -467,7 +467,7 @@ Index: git/arch/arm/mach-at91/at91sam9x5_devices.c
};
-static const unsigned spi1_standard_cs[4] = { AT91_PIN_PA8, AT91_PIN_PA0, AT91_PIN_PA31, AT91_PIN_PA30 };
-+// MTOCGD3: SPI1 chip selects on pins SPI1_NCS1 to SPI1_NCS5
++// MTOCGD2: SPI1 chip selects on pins SPI1_NCS1 to SPI1_NCS5
+static const unsigned spi1_standard_cs[5] = { AT91_PIN_PC15, AT91_PIN_PC16, AT91_PIN_PC17, AT91_PIN_PC18, AT91_PIN_PC19 };
void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb
index e5c5d69..2c6982d 100644
--- a/multitech/recipes/linux/linux_2.6.39-at91.bb
+++ b/multitech/recipes/linux/linux_2.6.39-at91.bb
@@ -29,9 +29,9 @@ COMMON_PATCHES = " \
file://linux-2.6.39.4-cdc-acm-ignore-exar-devices.patch \
"
-SRC_URI_append_mtocgd3 = " \
+SRC_URI_append_mtocgd2 = " \
file://defconfig \
- file://linux-2.6.39.4-mach-at91-mtocgd3.patch \
+ file://linux-2.6.39.4-mach-at91-mtocgd2.patch \
file://linux-2.6.39.4-macb-force-link.patch \
${COMMON_PATCHES} \
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 07:17:19 +0000