Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[pandora-kernel.git] / arch / arm / mach-ux500 / board-mop500-pins.c

diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 70cdbd6..f26fd76 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -236,6 +236,46 @@ static pin_cfg_t mop500_pins_hrefv60[] = {
 
 };
 
+static pin_cfg_t snowball_pins[] = {
+       /* SSP0, to AB8500 */
+       GPIO143_SSP0_CLK,
+       GPIO144_SSP0_FRM,
+       GPIO145_SSP0_RXD        | PIN_PULL_DOWN,
+       GPIO146_SSP0_TXD,
+
+       /* MMC0: MicroSD card */
+       GPIO21_MC0_DAT31DIR     | PIN_OUTPUT_HIGH,
+
+       /* MMC2: LAN */
+       GPIO86_SM_ADQ0,
+       GPIO87_SM_ADQ1,
+       GPIO88_SM_ADQ2,
+       GPIO89_SM_ADQ3,
+       GPIO90_SM_ADQ4,
+       GPIO91_SM_ADQ5,
+       GPIO92_SM_ADQ6,
+       GPIO93_SM_ADQ7,
+
+       GPIO94_SM_ADVn,
+       GPIO95_SM_CS0n,
+       GPIO96_SM_OEn,
+       GPIO97_SM_WEn,
+
+       GPIO128_SM_CKO,
+       GPIO130_SM_FBCLK,
+       GPIO131_SM_ADQ8,
+       GPIO132_SM_ADQ9,
+       GPIO133_SM_ADQ10,
+       GPIO134_SM_ADQ11,
+       GPIO135_SM_ADQ12,
+       GPIO136_SM_ADQ13,
+       GPIO137_SM_ADQ14,
+       GPIO138_SM_ADQ15,
+
+       /* RSTn_LAN */
+       GPIO141_GPIO            | PIN_OUTPUT_HIGH,
+};
+
 void __init mop500_pins_init(void)
 {
        nmk_config_pins(mop500_pins_common,
@@ -243,6 +283,9 @@ void __init mop500_pins_init(void)
        if (machine_is_hrefv60())
                nmk_config_pins(mop500_pins_hrefv60,
                                ARRAY_SIZE(mop500_pins_hrefv60));
+       else if (machine_is_snowball())
+               nmk_config_pins(snowball_pins,
+                               ARRAY_SIZE(snowball_pins));
        else
                nmk_config_pins(mop500_pins_default,
                                ARRAY_SIZE(mop500_pins_default));