add eSATA SheevaPlug support
svn path=/dists/sid/linux-2.6/; revision=15399
This commit is contained in:
parent
f0c48f95cc
commit
41ff40398c
|
@ -73,6 +73,14 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
|
|||
- ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
|
||||
* linux-base: Add libata transition script
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* Add some ARM patches from git:
|
||||
- Update mach types
|
||||
- eSATA SheevaPlug: basic board support
|
||||
- eSATA SheevaPlug: configure SoC SATA interface
|
||||
- eSATA SheevaPlug: correlate MPP to SD CD and SD WP
|
||||
* [armel/kirkwood] Enable MACH_ESATA_SHEEVAPLUG.
|
||||
|
||||
-- maximilian attems <maks@debian.org> Thu, 25 Feb 2010 13:07:47 +0100
|
||||
|
||||
linux-2.6 (2.6.32-9) unstable; urgency=high
|
||||
|
|
|
@ -58,6 +58,7 @@ CONFIG_MACH_DB88F6281_BP=y
|
|||
CONFIG_MACH_RD88F6192_NAS=y
|
||||
CONFIG_MACH_RD88F6281=y
|
||||
CONFIG_MACH_SHEEVAPLUG=y
|
||||
CONFIG_MACH_ESATA_SHEEVAPLUG=y
|
||||
CONFIG_MACH_TS219=y
|
||||
CONFIG_MACH_TS41X=y
|
||||
CONFIG_MACH_OPENRD_BASE=y
|
||||
|
|
|
@ -0,0 +1,174 @@
|
|||
--- a/arch/arm/tools/mach-types 2009-12-03 03:51:21.000000000 +0000
|
||||
+++ b/arch/arm/tools/mach-types 2010-03-16 15:45:42.000000000 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
#
|
||||
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
||||
#
|
||||
-# Last update: Wed Nov 25 22:14:58 2009
|
||||
+# Last update: Sat Feb 20 14:16:15 2010
|
||||
#
|
||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||
#
|
||||
@@ -1776,6 +1776,7 @@
|
||||
wdg002 MACH_WDG002 WDG002 1785
|
||||
sg560adsl MACH_SG560ADSL SG560ADSL 1786
|
||||
nextio_n2800_ica MACH_NEXTIO_N2800_ICA NEXTIO_N2800_ICA 1787
|
||||
+dove_db MACH_DOVE_DB DOVE_DB 1788
|
||||
marvell_newdb MACH_MARVELL_NEWDB MARVELL_NEWDB 1789
|
||||
vandihud MACH_VANDIHUD VANDIHUD 1790
|
||||
magx_e8 MACH_MAGX_E8 MAGX_E8 1791
|
||||
@@ -2256,7 +2257,7 @@
|
||||
oratismadi MACH_ORATISMADI ORATISMADI 2269
|
||||
oratisot16 MACH_ORATISOT16 ORATISOT16 2270
|
||||
oratisdesk MACH_ORATISDESK ORATISDESK 2271
|
||||
-v2_ca9 MACH_V2P_CA9 V2P_CA9 2272
|
||||
+vexpress MACH_VEXPRESS VEXPRESS 2272
|
||||
sintexo MACH_SINTEXO SINTEXO 2273
|
||||
cm3389 MACH_CM3389 CM3389 2274
|
||||
omap3_cio MACH_OMAP3_CIO OMAP3_CIO 2275
|
||||
@@ -2535,4 +2536,145 @@
|
||||
c3ax03 MACH_C3AX03 C3AX03 2549
|
||||
mxt_td60 MACH_MXT_TD60 MXT_TD60 2550
|
||||
esyx MACH_ESYX ESYX 2551
|
||||
+dove_db2 MACH_DOVE_DB2 DOVE_DB2 2552
|
||||
bulldog MACH_BULLDOG BULLDOG 2553
|
||||
+derell_me2000 MACH_DERELL_ME2000 DERELL_ME2000 2554
|
||||
+bcmring_base MACH_BCMRING_BASE BCMRING_BASE 2555
|
||||
+bcmring_evm MACH_BCMRING_EVM BCMRING_EVM 2556
|
||||
+bcmring_evm_jazz MACH_BCMRING_EVM_JAZZ BCMRING_EVM_JAZZ 2557
|
||||
+bcmring_sp MACH_BCMRING_SP BCMRING_SP 2558
|
||||
+bcmring_sv MACH_BCMRING_SV BCMRING_SV 2559
|
||||
+bcmring_sv_jazz MACH_BCMRING_SV_JAZZ BCMRING_SV_JAZZ 2560
|
||||
+bcmring_tablet MACH_BCMRING_TABLET BCMRING_TABLET 2561
|
||||
+bcmring_vp MACH_BCMRING_VP BCMRING_VP 2562
|
||||
+bcmring_evm_seikor MACH_BCMRING_EVM_SEIKOR BCMRING_EVM_SEIKOR 2563
|
||||
+bcmring_sp_wqvga MACH_BCMRING_SP_WQVGA BCMRING_SP_WQVGA 2564
|
||||
+bcmring_custom MACH_BCMRING_CUSTOM BCMRING_CUSTOM 2565
|
||||
+acer_s200 MACH_ACER_S200 ACER_S200 2566
|
||||
+bt270 MACH_BT270 BT270 2567
|
||||
+iseo MACH_ISEO ISEO 2568
|
||||
+cezanne MACH_CEZANNE CEZANNE 2569
|
||||
+lucca MACH_LUCCA LUCCA 2570
|
||||
+supersmart MACH_SUPERSMART SUPERSMART 2571
|
||||
+arm11_board MACH_CS_MISANO CS_MISANO 2572
|
||||
+magnolia2 MACH_MAGNOLIA2 MAGNOLIA2 2573
|
||||
+emxx MACH_EMXX EMXX 2574
|
||||
+outlaw MACH_OUTLAW OUTLAW 2575
|
||||
+riot_bei2 MACH_RIOT_BEI2 RIOT_BEI2 2576
|
||||
+riot_vox MACH_RIOT_VOX RIOT_VOX 2577
|
||||
+riot_x37 MACH_RIOT_X37 RIOT_X37 2578
|
||||
+mega25mx MACH_MEGA25MX MEGA25MX 2579
|
||||
+benzina2 MACH_BENZINA2 BENZINA2 2580
|
||||
+ignite MACH_IGNITE IGNITE 2581
|
||||
+foggia MACH_FOGGIA FOGGIA 2582
|
||||
+arezzo MACH_AREZZO AREZZO 2583
|
||||
+leica_skywalker MACH_LEICA_SKYWALKER LEICA_SKYWALKER 2584
|
||||
+jacinto2_jamr MACH_JACINTO2_JAMR JACINTO2_JAMR 2585
|
||||
+gts_nova MACH_GTS_NOVA GTS_NOVA 2586
|
||||
+p3600 MACH_P3600 P3600 2587
|
||||
+dlt2 MACH_DLT2 DLT2 2588
|
||||
+df3120 MACH_DF3120 DF3120 2589
|
||||
+ecucore_9g20 MACH_ECUCORE_9G20 ECUCORE_9G20 2590
|
||||
+nautel_lpc3240 MACH_NAUTEL_LPC3240 NAUTEL_LPC3240 2591
|
||||
+glacier MACH_GLACIER GLACIER 2592
|
||||
+phrazer_bulldog MACH_PHRAZER_BULLDOG PHRAZER_BULLDOG 2593
|
||||
+omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_BULLDOG 2594
|
||||
+pca101 MACH_PCA101 PCA101 2595
|
||||
+buzzc MACH_BUZZC BUZZC 2596
|
||||
+sasie2 MACH_SASIE2 SASIE2 2597
|
||||
+davinci_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598
|
||||
+smartmeter_dl MACH_SMARTMETER_DL SMARTMETER_DL 2599
|
||||
+wzl6410 MACH_WZL6410 WZL6410 2600
|
||||
+wzl6410m MACH_WZL6410M WZL6410M 2601
|
||||
+wzl6410f MACH_WZL6410F WZL6410F 2602
|
||||
+wzl6410i MACH_WZL6410I WZL6410I 2603
|
||||
+spacecom1 MACH_SPACECOM1 SPACECOM1 2604
|
||||
+pingu920 MACH_PINGU920 PINGU920 2605
|
||||
+bravoc MACH_BRAVOC BRAVOC 2606
|
||||
+cybo2440 MACH_CYBO2440 CYBO2440 2607
|
||||
+vdssw MACH_VDSSW VDSSW 2608
|
||||
+romulus MACH_ROMULUS ROMULUS 2609
|
||||
+omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610
|
||||
+eltd100 MACH_ELTD100 ELTD100 2611
|
||||
+capc7117 MACH_CAPC7117 CAPC7117 2612
|
||||
+swan MACH_SWAN SWAN 2613
|
||||
+veu MACH_VEU VEU 2614
|
||||
+rm2 MACH_RM2 RM2 2615
|
||||
+tt2100 MACH_TT2100 TT2100 2616
|
||||
+venice MACH_VENICE VENICE 2617
|
||||
+pc7323 MACH_PC7323 PC7323 2618
|
||||
+masp MACH_MASP MASP 2619
|
||||
+fujitsu_tvstbsoc0 MACH_FUJITSU_TVSTBSOC FUJITSU_TVSTBSOC 2620
|
||||
+fujitsu_tvstbsoc1 MACH_FUJITSU_TVSTBSOC1 FUJITSU_TVSTBSOC1 2621
|
||||
+lexikon MACH_LEXIKON LEXIKON 2622
|
||||
+mini2440v2 MACH_MINI2440V2 MINI2440V2 2623
|
||||
+icontrol MACH_ICONTROL ICONTROL 2624
|
||||
+sheevad MACH_SHEEVAD SHEEVAD 2625
|
||||
+qsd8x50a_st1_1 MACH_QSD8X50A_ST1_1 QSD8X50A_ST1_1 2626
|
||||
+qsd8x50a_st1_5 MACH_QSD8X50A_ST1_5 QSD8X50A_ST1_5 2627
|
||||
+bee MACH_BEE BEE 2628
|
||||
+mx23evk MACH_MX23EVK MX23EVK 2629
|
||||
+ap4evb MACH_AP4EVB AP4EVB 2630
|
||||
+stockholm MACH_STOCKHOLM STOCKHOLM 2631
|
||||
+lpc_h3131 MACH_LPC_H3131 LPC_H3131 2632
|
||||
+stingray MACH_STINGRAY STINGRAY 2633
|
||||
+kraken MACH_KRAKEN KRAKEN 2634
|
||||
+gw2388 MACH_GW2388 GW2388 2635
|
||||
+jadecpu MACH_JADECPU JADECPU 2636
|
||||
+carlisle MACH_CARLISLE CARLISLE 2637
|
||||
+lux_sf9 MACH_LUX_SFT9 LUX_SFT9 2638
|
||||
+nemid_tb MACH_NEMID_TB NEMID_TB 2639
|
||||
+terrier MACH_TERRIER TERRIER 2640
|
||||
+turbot MACH_TURBOT TURBOT 2641
|
||||
+sanddab MACH_SANDDAB SANDDAB 2642
|
||||
+mx35_cicada MACH_MX35_CICADA MX35_CICADA 2643
|
||||
+ghi2703d MACH_GHI2703D GHI2703D 2644
|
||||
+lux_sfx9 MACH_LUX_SFX9 LUX_SFX9 2645
|
||||
+lux_sf9g MACH_LUX_SF9G LUX_SF9G 2646
|
||||
+lux_edk9 MACH_LUX_EDK9 LUX_EDK9 2647
|
||||
+hw90240 MACH_HW90240 HW90240 2648
|
||||
+dm365_leopard MACH_DM365_LEOPARD DM365_LEOPARD 2649
|
||||
+mityomapl138 MACH_MITYOMAPL138 MITYOMAPL138 2650
|
||||
+scat110 MACH_SCAT110 SCAT110 2651
|
||||
+acer_a1 MACH_ACER_A1 ACER_A1 2652
|
||||
+cmcontrol MACH_CMCONTROL CMCONTROL 2653
|
||||
+pelco_lamar MACH_PELCO_LAMAR PELCO_LAMAR 2654
|
||||
+rfp43 MACH_RFP43 RFP43 2655
|
||||
+sk86r0301 MACH_SK86R0301 SK86R0301 2656
|
||||
+ctpxa MACH_CTPXA CTPXA 2657
|
||||
+epb_arm9_a MACH_EPB_ARM9_A EPB_ARM9_A 2658
|
||||
+guruplug MACH_GURUPLUG GURUPLUG 2659
|
||||
+spear310 MACH_SPEAR310 SPEAR310 2660
|
||||
+spear320 MACH_SPEAR320 SPEAR320 2661
|
||||
+robotx MACH_ROBOTX ROBOTX 2662
|
||||
+lsxhl MACH_LSXHL LSXHL 2663
|
||||
+smartlite MACH_SMARTLITE SMARTLITE 2664
|
||||
+cws2 MACH_CWS2 CWS2 2665
|
||||
+m619 MACH_M619 M619 2666
|
||||
+smartview MACH_SMARTVIEW SMARTVIEW 2667
|
||||
+lsa_salsa MACH_LSA_SALSA LSA_SALSA 2668
|
||||
+kizbox MACH_KIZBOX KIZBOX 2669
|
||||
+htccharmer MACH_HTCCHARMER HTCCHARMER 2670
|
||||
+guf_neso_lt MACH_GUF_NESO_LT GUF_NESO_LT 2671
|
||||
+pm9g45 MACH_PM9G45 PM9G45 2672
|
||||
+htcpanther MACH_HTCPANTHER HTCPANTHER 2673
|
||||
+htcpanther_cdma MACH_HTCPANTHER_CDMA HTCPANTHER_CDMA 2674
|
||||
+reb01 MACH_REB01 REB01 2675
|
||||
+aquila MACH_AQUILA AQUILA 2676
|
||||
+spark_sls_hw2 MACH_SPARK_SLS_HW2 SPARK_SLS_HW2 2677
|
||||
+sheeva_esata MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
|
||||
+surf7x30 MACH_SURF7X30 SURF7X30 2679
|
||||
+micro2440 MACH_MICRO2440 MICRO2440 2680
|
||||
+am2440 MACH_AM2440 AM2440 2681
|
||||
+tq2440 MACH_TQ2440 TQ2440 2682
|
||||
+lpc2478oem MACH_LPC2478OEM LPC2478OEM 2683
|
||||
+ak880x MACH_AK880X AK880X 2684
|
||||
+cobra3530 MACH_COBRA3530 COBRA3530 2685
|
||||
+pmppb MACH_PMPPB PMPPB 2686
|
||||
+u6715 MACH_U6715 U6715 2687
|
||||
+axar1500_sender MACH_AXAR1500_SENDER AXAR1500_SENDER 2688
|
||||
+g30_dvb MACH_G30_DVB G30_DVB 2689
|
||||
+vc088x MACH_VC088X VC088X 2690
|
||||
+mioa702 MACH_MIOA702 MIOA702 2691
|
||||
+hpmin MACH_HPMIN HPMIN 2692
|
||||
+ak880xak MACH_AK880XAK AK880XAK 2693
|
|
@ -0,0 +1,72 @@
|
|||
From: John Holland <john.holland@cellent-fs.de>
|
||||
Date: Fri, 19 Feb 2010 22:10:58 +0000 (+0100)
|
||||
Subject: [ARM] eSATA SheevaPlug basic board support
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d8ecb3490050b33bf46ce77c7f239e0fc51a6835
|
||||
|
||||
[ARM] eSATA SheevaPlug basic board support
|
||||
|
||||
Allow basic eSATA SheevaPlug board configuration and build.
|
||||
|
||||
Signed-off-by: John Holland <john.holland@cellent-fs.de>
|
||||
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
||||
--
|
||||
---
|
||||
|
||||
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
||||
index f6c6196..1b8adda 100644
|
||||
--- a/arch/arm/mach-kirkwood/Kconfig
|
||||
+++ b/arch/arm/mach-kirkwood/Kconfig
|
||||
@@ -32,6 +32,12 @@
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Marvell SheevaPlug Reference Board.
|
||||
|
||||
+config MACH_ESATA_SHEEVAPLUG
|
||||
+ bool "Marvell eSATA SheevaPlug Reference Board"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Marvell eSATA SheevaPlug Reference Board.
|
||||
+
|
||||
config MACH_TS219
|
||||
bool "QNAP TS-119 and TS-219 Turbo NAS"
|
||||
help
|
||||
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
||||
index d4d7f53..704b892 100644
|
||||
--- a/arch/arm/mach-kirkwood/Makefile
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
|
||||
obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
|
||||
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
|
||||
+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
|
||||
obj-$(CONFIG_MACH_TS219) += ts219-setup.o
|
||||
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o
|
||||
obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o
|
||||
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
index c7319ee..629ce84 100644
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
@@ -96,6 +96,7 @@ static void __init sheevaplug_init(void)
|
||||
platform_device_register(&sheevaplug_leds);
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_MACH_SHEEVAPLUG
|
||||
MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
|
||||
/* Maintainer: shadi Ammouri <shadi@marvell.com> */
|
||||
.phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
||||
@@ -106,3 +107,16 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
|
||||
.init_irq = kirkwood_init_irq,
|
||||
.timer = &kirkwood_timer,
|
||||
MACHINE_END
|
||||
+#endif
|
||||
+
|
||||
+#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
|
||||
+MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
|
||||
+ .phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
||||
+ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
|
||||
+ .boot_params = 0x00000100,
|
||||
+ .init_machine = sheevaplug_init,
|
||||
+ .map_io = kirkwood_map_io,
|
||||
+ .init_irq = kirkwood_init_irq,
|
||||
+ .timer = &kirkwood_timer,
|
||||
+MACHINE_END
|
||||
+#endif
|
|
@ -0,0 +1,73 @@
|
|||
From: John Holland <john.holland@cellent-fs.de>
|
||||
Date: Fri, 19 Feb 2010 22:11:04 +0000 (+0100)
|
||||
Subject: [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d5b5746bed1023e4a55f96405422d3e51968fa43
|
||||
|
||||
[ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP
|
||||
|
||||
Accept SD CD and SD WP in accordance to
|
||||
http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf
|
||||
on MPP 47 and 44 respectively on the eSATA SheevaPlug
|
||||
|
||||
Signed-off-by: John Holland <john.holland@cellent-fs.de>
|
||||
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
||||
--
|
||||
---
|
||||
|
||||
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
index bb9bc70..a00879d 100644
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
@@ -51,6 +51,11 @@ static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
|
||||
/* unfortunately the CD signal has not been connected */
|
||||
};
|
||||
|
||||
+static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
|
||||
+ .gpio_write_protect = 44, /* MPP44 used as SD write protect */
|
||||
+ .gpio_card_detect = 47, /* MPP47 used as SD card detect */
|
||||
+};
|
||||
+
|
||||
static struct gpio_led sheevaplug_led_pins[] = {
|
||||
{
|
||||
.name = "plug:green:health",
|
||||
@@ -79,13 +84,26 @@ static unsigned int sheevaplug_mpp_config[] __initdata = {
|
||||
0
|
||||
};
|
||||
|
||||
+static unsigned int sheeva_esata_mpp_config[] __initdata = {
|
||||
+ MPP29_GPIO, /* USB Power Enable */
|
||||
+ MPP44_GPIO, /* SD Write Protect */
|
||||
+ MPP47_GPIO, /* SD Card Detect */
|
||||
+ MPP49_GPIO, /* LED Green */
|
||||
+ 0
|
||||
+};
|
||||
+
|
||||
static void __init sheevaplug_init(void)
|
||||
{
|
||||
/*
|
||||
* Basic setup. Needs to be called early.
|
||||
*/
|
||||
kirkwood_init();
|
||||
- kirkwood_mpp_conf(sheevaplug_mpp_config);
|
||||
+
|
||||
+ /* setup gpio pin select */
|
||||
+ if (machine_is_sheeva_esata())
|
||||
+ kirkwood_mpp_conf(sheeva_esata_mpp_config);
|
||||
+ else
|
||||
+ kirkwood_mpp_conf(sheevaplug_mpp_config);
|
||||
|
||||
kirkwood_uart0_init();
|
||||
kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
|
||||
@@ -101,7 +119,11 @@ static void __init sheevaplug_init(void)
|
||||
if (machine_is_sheeva_esata())
|
||||
kirkwood_sata_init(&sheeva_esata_sata_data);
|
||||
|
||||
- kirkwood_sdio_init(&sheevaplug_mvsdio_data);
|
||||
+ /* enable sd wp and sd cd on plugs with esata */
|
||||
+ if (machine_is_sheeva_esata())
|
||||
+ kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
|
||||
+ else
|
||||
+ kirkwood_sdio_init(&sheevaplug_mvsdio_data);
|
||||
|
||||
platform_device_register(&sheevaplug_leds);
|
||||
}
|
|
@ -0,0 +1,49 @@
|
|||
From: John Holland <john.holland@cellent-fs.de>
|
||||
Date: Fri, 19 Feb 2010 22:11:01 +0000 (+0100)
|
||||
Subject: [ARM] eSATA SheevaPlug: configure SoC SATA interface
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d7b222d708e6eff0cf47928f439c8bcf49f10bb6
|
||||
|
||||
[ARM] eSATA SheevaPlug: configure SoC SATA interface
|
||||
|
||||
Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug.
|
||||
|
||||
Signed-off-by: John Holland <john.holland@cellent-fs.de>
|
||||
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
||||
--
|
||||
---
|
||||
|
||||
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
index 629ce84..bb9bc70 100644
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/ata_platform.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/mv643xx_eth.h>
|
||||
#include <linux/gpio.h>
|
||||
@@ -42,6 +43,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
|
||||
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
|
||||
};
|
||||
|
||||
+static struct mv_sata_platform_data sheeva_esata_sata_data = {
|
||||
+ .n_ports = 2,
|
||||
+};
|
||||
+
|
||||
static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
|
||||
/* unfortunately the CD signal has not been connected */
|
||||
};
|
||||
@@ -91,6 +96,11 @@ static void __init sheevaplug_init(void)
|
||||
kirkwood_ehci_init();
|
||||
|
||||
kirkwood_ge00_init(&sheevaplug_ge00_data);
|
||||
+
|
||||
+ /* honor lower power consumption for plugs with out eSATA */
|
||||
+ if (machine_is_sheeva_esata())
|
||||
+ kirkwood_sata_init(&sheeva_esata_sata_data);
|
||||
+
|
||||
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
|
||||
|
||||
platform_device_register(&sheevaplug_leds);
|
|
@ -3,6 +3,10 @@
|
|||
+ bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch
|
||||
+ bugfix/all/firmware-Sierra-Wireless-CIS-copyright.patch
|
||||
+ bugfix/all/firmware-pcmcia-cs-CIS-source-and-copyright.patch
|
||||
+ features/arm/mach-types-update-2010-02-20.patch
|
||||
+ features/arm/sheevaplug-esata-board.patch
|
||||
+ features/arm/sheevaplug-esata-sata.patch
|
||||
+ features/arm/sheevaplug-esata-mpp.patch
|
||||
|
||||
# revert fixes included in or conflicting with 2.6.32.10
|
||||
- features/sparc/video-sunxvr500-intergraph.patch
|
||||
|
|
Loading…
Reference in New Issue