diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/e740.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-pxa/e750.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-pxa/h5000.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/eseries-gpio.h | 15 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-ssp.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 6 |
6 files changed, 44 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index 54af7ed1397e..07500a04fd8c 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c | |||
@@ -133,6 +133,11 @@ static unsigned long e740_pin_config[] __initdata = { | |||
133 | /* IrDA */ | 133 | /* IrDA */ |
134 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, | 134 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, |
135 | 135 | ||
136 | /* Audio power control */ | ||
137 | GPIO16_GPIO, /* AC97 codec AVDD2 supply (analogue power) */ | ||
138 | GPIO40_GPIO, /* Mic amp power */ | ||
139 | GPIO41_GPIO, /* Headphone amp power */ | ||
140 | |||
136 | /* PC Card */ | 141 | /* PC Card */ |
137 | GPIO8_GPIO, /* CD0 */ | 142 | GPIO8_GPIO, /* CD0 */ |
138 | GPIO44_GPIO, /* CD1 */ | 143 | GPIO44_GPIO, /* CD1 */ |
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c index 16ae72150b1b..6126c04e02bc 100644 --- a/arch/arm/mach-pxa/e750.c +++ b/arch/arm/mach-pxa/e750.c | |||
@@ -131,6 +131,11 @@ static unsigned long e750_pin_config[] __initdata = { | |||
131 | /* IrDA */ | 131 | /* IrDA */ |
132 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, | 132 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, |
133 | 133 | ||
134 | /* Audio power control */ | ||
135 | GPIO4_GPIO, /* Headphone amp power */ | ||
136 | GPIO7_GPIO, /* Speaker amp power */ | ||
137 | GPIO37_GPIO, /* Headphone detect */ | ||
138 | |||
134 | /* PC Card */ | 139 | /* PC Card */ |
135 | GPIO8_GPIO, /* CD0 */ | 140 | GPIO8_GPIO, /* CD0 */ |
136 | GPIO44_GPIO, /* CD1 */ | 141 | GPIO44_GPIO, /* CD1 */ |
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index 6a197fb5c095..f3d220c32e07 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c | |||
@@ -154,6 +154,13 @@ static unsigned long h5000_pin_config[] __initdata = { | |||
154 | GPIO23_SSP1_SCLK, | 154 | GPIO23_SSP1_SCLK, |
155 | GPIO25_SSP1_TXD, | 155 | GPIO25_SSP1_TXD, |
156 | GPIO26_SSP1_RXD, | 156 | GPIO26_SSP1_RXD, |
157 | |||
158 | /* I2S */ | ||
159 | GPIO28_I2S_BITCLK_OUT, | ||
160 | GPIO29_I2S_SDATA_IN, | ||
161 | GPIO30_I2S_SDATA_OUT, | ||
162 | GPIO31_I2S_SYNC, | ||
163 | GPIO32_I2S_SYSCLK, | ||
157 | }; | 164 | }; |
158 | 165 | ||
159 | /* | 166 | /* |
diff --git a/arch/arm/mach-pxa/include/mach/eseries-gpio.h b/arch/arm/mach-pxa/include/mach/eseries-gpio.h index efbd2aa9ecec..f3e5509820d7 100644 --- a/arch/arm/mach-pxa/include/mach/eseries-gpio.h +++ b/arch/arm/mach-pxa/include/mach/eseries-gpio.h | |||
@@ -45,6 +45,21 @@ | |||
45 | /* e7xx IrDA power control */ | 45 | /* e7xx IrDA power control */ |
46 | #define GPIO_E7XX_IR_OFF 38 | 46 | #define GPIO_E7XX_IR_OFF 38 |
47 | 47 | ||
48 | /* e740 audio control GPIOs */ | ||
49 | #define GPIO_E740_WM9705_nAVDD2 16 | ||
50 | #define GPIO_E740_MIC_ON 40 | ||
51 | #define GPIO_E740_AMP_ON 41 | ||
52 | |||
53 | /* e750 audio control GPIOs */ | ||
54 | #define GPIO_E750_HP_AMP_OFF 4 | ||
55 | #define GPIO_E750_SPK_AMP_OFF 7 | ||
56 | #define GPIO_E750_HP_DETECT 37 | ||
57 | |||
58 | /* e800 audio control GPIOs */ | ||
59 | #define GPIO_E800_HP_DETECT 81 | ||
60 | #define GPIO_E800_HP_AMP_OFF 82 | ||
61 | #define GPIO_E800_SPK_AMP_ON 83 | ||
62 | |||
48 | /* ASIC related GPIOs */ | 63 | /* ASIC related GPIOs */ |
49 | #define GPIO_ESERIES_TMIO_IRQ 5 | 64 | #define GPIO_ESERIES_TMIO_IRQ 5 |
50 | #define GPIO_ESERIES_TMIO_PCLR 19 | 65 | #define GPIO_ESERIES_TMIO_PCLR 19 |
diff --git a/arch/arm/mach-pxa/include/mach/regs-ssp.h b/arch/arm/mach-pxa/include/mach/regs-ssp.h index 8152be683881..6a2ed35acd59 100644 --- a/arch/arm/mach-pxa/include/mach/regs-ssp.h +++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h | |||
@@ -49,7 +49,7 @@ | |||
49 | #define SSCR0_TUM (1 << 23) /* Transmit FIFO underrun interrupt mask */ | 49 | #define SSCR0_TUM (1 << 23) /* Transmit FIFO underrun interrupt mask */ |
50 | #define SSCR0_FRDC (0x07000000) /* Frame rate divider control (mask) */ | 50 | #define SSCR0_FRDC (0x07000000) /* Frame rate divider control (mask) */ |
51 | #define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] */ | 51 | #define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] */ |
52 | #define SSCR0_ADC (1 << 30) /* Audio clock select */ | 52 | #define SSCR0_ACS (1 << 30) /* Audio clock select */ |
53 | #define SSCR0_MOD (1 << 31) /* Mode (normal or network) */ | 53 | #define SSCR0_MOD (1 << 31) /* Mode (normal or network) */ |
54 | #endif | 54 | #endif |
55 | 55 | ||
@@ -108,6 +108,11 @@ | |||
108 | #define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */ | 108 | #define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */ |
109 | #define SSSR_PINT (1 << 18) /* Peripheral Trailing Byte Interrupt */ | 109 | #define SSSR_PINT (1 << 18) /* Peripheral Trailing Byte Interrupt */ |
110 | 110 | ||
111 | #if defined(CONFIG_PXA3xx) | ||
112 | #define SSPSP_EDMYSTOP(x) ((x) << 28) /* Extended Dummy Stop */ | ||
113 | #define SSPSP_EDMYSTRT(x) ((x) << 26) /* Extended Dummy Start */ | ||
114 | #endif | ||
115 | |||
111 | #define SSPSP_FSRT (1 << 25) /* Frame Sync Relative Timing */ | 116 | #define SSPSP_FSRT (1 << 25) /* Frame Sync Relative Timing */ |
112 | #define SSPSP_DMYSTOP(x) ((x) << 23) /* Dummy Stop */ | 117 | #define SSPSP_DMYSTOP(x) ((x) << 23) /* Dummy Stop */ |
113 | #define SSPSP_SFRMWDTH(x) ((x) << 16) /* Serial Frame Width */ | 118 | #define SSPSP_SFRMWDTH(x) ((x) << 16) /* Serial Frame Width */ |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 7a0a430222cf..8c61ddac119e 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -103,6 +103,12 @@ static unsigned long spitz_pin_config[] __initdata = { | |||
103 | GPIO57_nIOIS16, | 103 | GPIO57_nIOIS16, |
104 | GPIO104_PSKTSEL, | 104 | GPIO104_PSKTSEL, |
105 | 105 | ||
106 | /* I2S */ | ||
107 | GPIO28_I2S_BITCLK_OUT, | ||
108 | GPIO29_I2S_SDATA_IN, | ||
109 | GPIO30_I2S_SDATA_OUT, | ||
110 | GPIO31_I2S_SYNC, | ||
111 | |||
106 | /* MMC */ | 112 | /* MMC */ |
107 | GPIO32_MMC_CLK, | 113 | GPIO32_MMC_CLK, |
108 | GPIO112_MMC_CMD, | 114 | GPIO112_MMC_CMD, |