From e7415b8c3c2e702d96c59c072afa6cb4e3578131 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 13 Mar 2013 18:55:16 +0100 Subject: [PATCH] --- yaml --- r: 372643 b: refs/heads/master c: ffa2a9d504b6145cf355a98b686254847d62a9a3 h: refs/heads/master i: 372641: 41334df23cd135dabd8a136917a9becbc44a2c6c 372639: 2987a281b956c3cd6f82d4fab18bfed4693a6a46 v: v3 --- [refs] | 2 +- .../arm/mach-shmobile/include/mach/sh73a0.h | 29 +++---------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 0213abe92927..eded8a35adba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 385a94a40be99acbabdca44da0adb1e671a715d0 +refs/heads/master: ffa2a9d504b6145cf355a98b686254847d62a9a3 diff --git a/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h b/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h index f1b85ffd640e..218e6b78397b 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h @@ -149,31 +149,10 @@ enum { GPIO_FN_A24, GPIO_FN_MSIOF0_RXD, GPIO_FN_A25, GPIO_FN_MSIOF0_SS2, GPIO_FN_A26, - GPIO_FN_D0_NAF0, - GPIO_FN_D1_NAF1, - GPIO_FN_D2_NAF2, - GPIO_FN_D3_NAF3, - GPIO_FN_D4_NAF4, - GPIO_FN_D5_NAF5, - GPIO_FN_D6_NAF6, - GPIO_FN_D7_NAF7, - GPIO_FN_D8_NAF8, - GPIO_FN_D9_NAF9, - GPIO_FN_D10_NAF10, - GPIO_FN_D11_NAF11, - GPIO_FN_D12_NAF12, - GPIO_FN_D13_NAF13, - GPIO_FN_D14_NAF14, - GPIO_FN_D15_NAF15, - GPIO_FN_CS4_, - GPIO_FN_CS5A_, GPIO_FN_PORT91_RDWR, - GPIO_FN_CS5B_, GPIO_FN_FCE1_, - GPIO_FN_CS6B_, GPIO_FN_DACK0, - GPIO_FN_FCE0_, GPIO_FN_CS6A_, + GPIO_FN_FCE1_, + GPIO_FN_DACK0, + GPIO_FN_FCE0_, GPIO_FN_WAIT_, GPIO_FN_DREQ0, - GPIO_FN_RD__FSC, - GPIO_FN_WE0__FWE, GPIO_FN_RDWR_FWE, - GPIO_FN_WE1_, GPIO_FN_FRB, GPIO_FN_CKO, GPIO_FN_NBRSTOUT_, @@ -219,7 +198,7 @@ enum { GPIO_FN_VIO2_CLK, GPIO_FN_VIO_FIELD, GPIO_FN_VIO2_FIELD, GPIO_FN_VIO_CKO, - GPIO_FN_A27, GPIO_FN_PORT149_RDWR, GPIO_FN_MFG0_IN1, \ + GPIO_FN_A27, GPIO_FN_MFG0_IN1, GPIO_FN_MFG0_IN2, GPIO_FN_TS_SPSYNC3, GPIO_FN_MSIOF2_RSCK, GPIO_FN_TS_SDAT3, GPIO_FN_MSIOF2_RSYNC,