Skip to content

Commit d11fdf0

Browse files
Hazel Zhangkelvincheung
Hazel Zhang
authored and
kelvincheung
committed
Revert "Bug #marlin3L pinmux and pinmap code implement"
delete pinmap commit ,it need modified This reverts commit 2f134df.
1 parent 2f134df commit d11fdf0

File tree

4 files changed

+123
-373
lines changed

4 files changed

+123
-373
lines changed

‎drivers/include/hal_pin_reg.h‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,66 +16,6 @@ extern "C"
1616
#include "hal_pinmap.h"
1717
#include <uwp_hal.h>
1818
#define CTL_BASE_PIN (BASE_AON_PIN)
19-
#define GROUP(x) ((x)+0x0400)
20-
21-
#if defined(CONFIG_SOC_UWP5662)
22-
23-
#define PIN_PAD_CTL_RESERVED (CTL_BASE_PIN+0x0000)
24-
#define PIN_PIN_CRTL_REG0 (CTL_BASE_PIN+0x0004)
25-
#define PIN_PIN_CRTL_REG1 (CTL_BASE_PIN+0x0008)
26-
#define PIN_PIN_CRTL_REG2 (CTL_BASE_PIN+0x000C)
27-
#define PIN_PIN_CRTL_REG3 (CTL_BASE_PIN+0x0010)
28-
#define PIN_PIN_CRTL_REG4 (CTL_BASE_PIN+0x0014)
29-
#define PIN_PIN_CRTL_REG5 (CTL_BASE_PIN+0x0018)
30-
#define PIN_GPIO1_REG (CTL_BASE_PIN+0x001C)
31-
#define PIN_GPIO2_REG (CTL_BASE_PIN+0x0020)
32-
#define PIN_GPIO0_REG (CTL_BASE_PIN+0x0024)
33-
#define PIN_GPIO3_REG (CTL_BASE_PIN+0x0028)
34-
#define PIN_RFCTL7_REG (CTL_BASE_PIN+0x002C)
35-
#define PIN_RFCTL6_REG (CTL_BASE_PIN+0x0030)
36-
#define PIN_RFCTL4_REG (CTL_BASE_PIN+0x0034)
37-
#define PIN_RFCTL5_REG (CTL_BASE_PIN+0x0038)
38-
#define PIN_U1TXD_REG (CTL_BASE_PIN+0x003C)
39-
#define PIN_U1RXD_REG (CTL_BASE_PIN+0x0040)
40-
#define PIN_U1RTS_REG (CTL_BASE_PIN+0x0044)
41-
#define PIN_U1CTS_REG (CTL_BASE_PIN+0x0048)
42-
#define PIN_U0TXD_REG (CTL_BASE_PIN+0x004C)
43-
#define PIN_U0RXD_REG (CTL_BASE_PIN+0x0050)
44-
#define PIN_U0RTS_REG (CTL_BASE_PIN+0x0054)
45-
#define PIN_U0CTS_REG (CTL_BASE_PIN+0x0058)
46-
#define PIN_IISDI_REG (CTL_BASE_PIN+0x005C)
47-
#define PIN_IISDO_REG (CTL_BASE_PIN+0x0060)
48-
#define PIN_IISCLK_REG (CTL_BASE_PIN+0x0064)
49-
#define PIN_IISLRCK_REG (CTL_BASE_PIN+0x0068)
50-
#define PIN_U3RXD_REG (CTL_BASE_PIN+0x006C)
51-
#define PIN_U3TXD_REG (CTL_BASE_PIN+0x0070)
52-
#define PIN_RST_N_REG (CTL_BASE_PIN+0x0074)
53-
#define PIN_MTMS_REG (CTL_BASE_PIN+0x0078)
54-
#define PIN_MTCK_REG (CTL_BASE_PIN+0x007C)
55-
#define PIN_CHIP_EN_REG (CTL_BASE_PIN+0x0080)
56-
#define PIN_ESMD3_REG (CTL_BASE_PIN+0x0084)
57-
#define PIN_ESMD2_REG (CTL_BASE_PIN+0x0088)
58-
#define PIN_ESMD1_REG (CTL_BASE_PIN+0x008C)
59-
#define PIN_ESMCSN_REG (CTL_BASE_PIN+0x0090)
60-
#define PIN_ESMD0_REG (CTL_BASE_PIN+0x0094)
61-
#define PIN_ESMSMP_REG (CTL_BASE_PIN+0x0098)
62-
#define PIN_ESMCLK_REG (CTL_BASE_PIN+0x009C)
63-
#define PIN_SD_D3_REG (CTL_BASE_PIN+0x00A0)
64-
#define PIN_SD_D0_REG (CTL_BASE_PIN+0x00A4)
65-
#define PIN_SD_D2_REG (CTL_BASE_PIN+0x00A8)
66-
#define PIN_SD_D1_REG (CTL_BASE_PIN+0x00AC)
67-
#define PIN_SD_CLK_REG (CTL_BASE_PIN+0x00B0)
68-
#define PIN_SD_CMD_REG (CTL_BASE_PIN+0x00B4)
69-
#define PIN_U2RXD_REG (CTL_BASE_PIN+0x00B8)
70-
#define PIN_U2TXD_REG (CTL_BASE_PIN+0x00BC)
71-
#define PIN_PTEST_REG (CTL_BASE_PIN+0x00C0)
72-
#define PIN_WCI_2_TXD_REG (CTL_BASE_PIN+0x00C4)
73-
#define PIN_WCI_2_RXD_REG (CTL_BASE_PIN+0x00C8)
74-
#define PIN_XTLEN_REG (CTL_BASE_PIN+0x00CC)
75-
#define PIN_GNSS_LNA_EN_REG (CTL_BASE_PIN+0x00D0)
76-
#define PIN_INT_REG (CTL_BASE_PIN+0x00D4)
77-
78-
#elif defined(CONFIG_SOC_UWP5661)
7919

8020
#define PIN_PIN_CRTL_REG0 (CTL_BASE_PIN+0x0000)
8121
#define PIN_PIN_CRTL_REG1 (CTL_BASE_PIN+0x0004)
@@ -134,8 +74,6 @@ extern "C"
13474
#define PIN_PCIE_RST_L_REG (CTL_BASE_PIN+0x00D8)
13575
#define PIN_PCIE_WAKE_L_REG (CTL_BASE_PIN+0x00DC)
13676

137-
#endif
138-
13977
/*pinmap ctrl register Bit field value*/
14078

14179
/*

‎drivers/include/hal_pinmap.h‎

Lines changed: 65 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -33,193 +33,136 @@
3333
#define PIN_SPU_EN BIT(3)
3434
#define PIN_SPX_EN 0x00
3535

36+
#define PMUX_PIN_FUNC(x) (x<<4)
37+
3638
#define PIN_FUNC_DEF (0X00<<4)
3739
#define PIN_FUNC_1 (0X01<<4)
3840
#define PIN_FUNC_2 (0X02<<4)
3941
#define PIN_FUNC_3 (0X03<<4)
4042
#define PIN_FUNC_4 (0X04<<4)
4143
#define PIN_FUNC_5 (0X05<<4)
4244

43-
#if defined(CONFIG_SOC_UWP5662)
44-
45-
/* PULL UP or PULL DOWN */
46-
#define PIN_FPD_EN BIT(6)
47-
#define PIN_FPU_EN BIT(7)
48-
#define PIN_FPX_EN 0X00
49-
50-
#define PIN_PADI_SWITCH BIT(10)
51-
#define PIN_PAD_SLP_EN0 BIT(13)
52-
#define PIN_PAD_SLP_EN1 BIT(14)
53-
54-
/* drive strength select*/
55-
#define PIN_DS_0 (0x00<<19)
56-
#define PIN_DS_1 (0x01<<19)
57-
#define PIN_DS_2 (0x02<<19)
58-
#define PIN_DS_3 (0x03<<19)
59-
#define PIN_DS_4 (0x04<<19)
60-
#define PIN_DS_5 (0x05<<19)
61-
#define PIN_DS_6 (0x06<<19)
62-
#define PIN_DS_7 (0x07<<19)
63-
64-
#elif defined(CONFIG_SOC_UWP5661)
65-
66-
/* PULL UP or PULL DOWN */
6745
#define PIN_FPD_EN BIT(7)
6846
#define PIN_FPU_EN BIT(8)
6947
#define PIN_FPX_EN 0X00
7048

71-
/* drive strength select*/
72-
#define PIN_DS_0 (0x00<<14)
73-
#define PIN_DS_1 (0x01<<14)
74-
#define PIN_DS_2 (0x02<<14)
75-
#define PIN_DS_3 (0x03<<14)
76-
#define PIN_DS_4 (0x04<<14)
77-
#define PIN_DS_5 (0x05<<14)
78-
#define PIN_DS_6 (0x06<<14)
79-
#define PIN_DS_7 (0x07<<14)
80-
81-
#endif
82-
8349
#define PIN_SE_EN BIT(11)
8450
#define PIN_SE_DEF 0x0000
8551

8652
#define PIN_WPUS_EN BIT(12)
8753
#define PIN_WPUS_DEF 0x0000
8854

55+
#define PIN_DS_0 (0x00<<14)
56+
#define PIN_DS_1 (0x00<<14)
57+
#define PIN_DS_2 (0x00<<14)
58+
#define PIN_DS_3 (0x00<<14)
59+
8960
#define PIN_XTLEN_VALUE (PIN_DS_1 | PIN_FPX_EN \
90-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
61+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
9162
#define PIN_IISDO_VALUE (PIN_DS_1 | PIN_FPX_EN \
92-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
63+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
9364
#define PIN_IISCLK_VALUE (PIN_DS_1 | PIN_FPX_EN \
94-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
65+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
9566
#define PIN_IISLRCK_VALUE (PIN_DS_1 | PIN_FPX_EN \
96-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
67+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
9768
#define PIN_IISDI_VALUE (PIN_DS_1 | PIN_FPD_EN \
98-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
69+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
9970
#define PIN_PTEST_VALUE (PIN_DS_1 | PIN_FPX_EN \
100-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_I_EN)
71+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_I_EN)
10172
#define PIN_GPIO0_VALUE (PIN_DS_1 | PIN_FPX_EN \
102-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
73+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
10374
#define PIN_GPIO1_VALUE (PIN_DS_1 | PIN_FPX_EN \
104-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
75+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
10576
#define PIN_GPIO2_VALUE (PIN_DS_1 | PIN_FPX_EN \
106-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
77+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
10778
#define PIN_RST_N_VALUE (PIN_DS_1 | PIN_FPU_EN \
108-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
79+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
10980
#define PIN_WCI_2_RXD_VALUE (PIN_DS_1 | PIN_FPU_EN \
110-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
81+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
11182
#define PIN_WCI_2_TXD_VALUE (PIN_DS_1 | PIN_FPX_EN \
112-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
83+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
11384
#define PIN_INT_VALUE (PIN_DS_1 | PIN_FPX_EN \
114-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
85+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
11586
#define PIN_MTMS_VALUE (PIN_DS_1 | PIN_FPU_EN \
116-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
87+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
11788
#define PIN_MTCK_VALUE (PIN_DS_1 | PIN_FPX_EN \
118-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
89+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
11990
#define PIN_U0TXD_VALUE (PIN_DS_1 | PIN_FPX_EN \
120-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_O_EN)
91+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
12192
#define PIN_U0RXD_VALUE (PIN_DS_1 | PIN_FPU_EN \
122-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
93+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
12394
#define PIN_U0RTS_VALUE (PIN_DS_1 | PIN_FPX_EN \
124-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_O_EN)
95+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
12596
#define PIN_U0CTS_VALUE (PIN_DS_1 | PIN_FPU_EN \
126-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
127-
128-
#if defined(CONFIG_SOC_UWP5662)
129-
#define PIN_SD_D3_VALUE (PIN_DS_5 | PIN_FPX_EN \
130-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
131-
#define PIN_SD_D2_VALUE (PIN_DS_5 | PIN_FPX_EN \
132-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
133-
#define PIN_SD_D1_VALUE (PIN_DS_5 | PIN_FPX_EN \
134-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
135-
#define PIN_SD_D0_VALUE (PIN_DS_5 | PIN_FPX_EN \
136-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
137-
#define PIN_SD_CMD_VALUE (PIN_DS_5 | PIN_FPX_EN \
138-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
139-
#define PIN_SD_CLK_VALUE (PIN_DS_5 | PIN_FPX_EN \
140-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
141-
#elif defined(CONFIG_SOC_UWP5661)
97+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
14298
#define PIN_SD_D3_VALUE (PIN_DS_2 | PIN_FPX_EN \
143-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
99+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
144100
#define PIN_SD_D2_VALUE (PIN_DS_2 | PIN_FPX_EN \
145-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
101+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
146102
#define PIN_SD_D1_VALUE (PIN_DS_2 | PIN_FPX_EN \
147-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
103+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
148104
#define PIN_SD_D0_VALUE (PIN_DS_2 | PIN_FPX_EN \
149-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
105+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
150106
#define PIN_SD_CMD_VALUE (PIN_DS_2 | PIN_FPX_EN \
151-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
107+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
152108
#define PIN_SD_CLK_VALUE (PIN_DS_2 | PIN_FPX_EN \
153-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
154-
#endif
109+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
155110
/*add new pin*/
156111
#define PIN_GPIO3_VALUE (PIN_DS_1 | PIN_FPX_EN \
157-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
158-
#define PIN_ESMD3_VALUE (PIN_DS_1 | PIN_FPX_EN \
159-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
160-
161-
#if defined(CONFIG_SOC_UWP5662)
162-
#define PIN_ESMD2_VALUE (PIN_DS_1 | PIN_FPU_EN \
163-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_I_EN)
164-
#elif defined(CONFIG_SOC_UWP5661)
112+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
113+
#define PIN_ESMD3_VALUE (PIN_DS_1 | PIN_FPU_EN \
114+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
165115
#define PIN_ESMD2_VALUE (PIN_DS_1 | PIN_FPU_EN \
166-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
167-
#endif
168-
169-
#define PIN_ESMD1_VALUE (PIN_DS_1 | PIN_FPD_EN \
170-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
171-
#define PIN_ESMD0_VALUE (PIN_DS_1 | PIN_FPD_EN \
172-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
173-
#define PIN_ESMCSN_VALUE (PIN_DS_1 | PIN_FPD_EN \
174-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
175-
#define PIN_ESMSMP_VALUE (PIN_DS_1 | PIN_FPD_EN \
176-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
177-
#define PIN_ESMCLK_VALUE (PIN_DS_1 | PIN_FPD_EN \
178-
| PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
116+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
117+
#define PIN_ESMD1_VALUE (PIN_DS_1 | PIN_FPU_EN \
118+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
119+
#define PIN_ESMD0_VALUE (PIN_DS_1 | PIN_FPU_EN \
120+
| PIN_FUNC_DEF | PIN_SPD_EN | PIN_WPUS_DEF | PIN_Z_EN)
121+
#define PIN_ESMCSN_VALUE (PIN_DS_1 | PIN_FPX_EN \
122+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
123+
#define PIN_ESMSMP_VALUE (PIN_DS_1 | PIN_FPX_EN \
124+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_Z_EN)
125+
#define PIN_ESMCLK_VALUE (PIN_DS_1 | PIN_FPX_EN \
126+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
179127
#define PIN_U3TXD_VALUE (PIN_DS_1 | PIN_FPX_EN \
180-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
128+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
181129
#define PIN_U3RXD_VALUE (PIN_DS_1 | PIN_FPU_EN \
182-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
130+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
183131

184132
#define PIN_RFCTL0_VALUE (PIN_DS_1 | PIN_FPX_EN \
185-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
133+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
186134
#define PIN_RFCTL1_VALUE (PIN_DS_1 | PIN_FPX_EN \
187-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
135+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
188136
#define PIN_RFCTL2_VALUE (PIN_DS_1 | PIN_FPX_EN \
189-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
137+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
190138
#define PIN_RFCTL3_VALUE (PIN_DS_1 | PIN_FPX_EN \
191-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
139+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
192140
#define PIN_RFCTL4_VALUE (PIN_DS_1 | PIN_FPX_EN \
193-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
141+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
194142
#define PIN_RFCTL5_VALUE (PIN_DS_1 | PIN_FPX_EN \
195-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
143+
| PIN_FUNC_3 | PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
196144
#define PIN_RFCTL6_VALUE (PIN_DS_1 | PIN_FPX_EN \
197-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
145+
| PIN_FUNC_3 | PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
198146
#define PIN_RFCTL7_VALUE (PIN_DS_1 | PIN_FPX_EN \
199-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
147+
| PIN_FUNC_3 | PIN_SPX_EN | PIN_WPUS_DEF | PIN_I_EN)
200148
#define PIN_GNSS_LNA_EN_VALUE (PIN_DS_1 | PIN_FPX_EN \
201-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
149+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
202150
#define PIN_U1TXD_VALUE (PIN_DS_1 | PIN_FPX_EN \
203-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
151+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
204152
#define PIN_U1RXD_VALUE (PIN_DS_1 | PIN_FPU_EN \
205-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
153+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
206154
#define PIN_U1RTS_VALUE (PIN_DS_1 | PIN_FPX_EN \
207-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
155+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
208156
#define PIN_U1CTS_VALUE (PIN_DS_1 | PIN_FPU_EN \
209-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
157+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
210158
#define PIN_PCIE_CLKREQ_L_VALUE (PIN_DS_1 | PIN_FPX_EN \
211-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
159+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
212160
#define PIN_PCIE_RST_L_VALUE (PIN_DS_1 | PIN_FPU_EN \
213-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
161+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
214162
#define PIN_PCIE_WAKE_L_VALUE (PIN_DS_1 | PIN_FPX_EN \
215-
| PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
163+
| PIN_FUNC_DEF | PIN_SPX_EN | PIN_WPUS_DEF | PIN_O_EN)
216164
#define PIN_CHIP_EN_VALUE (PIN_DS_1 | PIN_FPU_EN \
217-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
218-
219-
#define PIN_U2TXD_VALUE (PIN_DS_1 | PIN_FPX_EN \
220-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_Z_EN)
221-
#define PIN_U2RXD_VALUE (PIN_DS_1 | PIN_FPU_EN \
222-
| PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
165+
| PIN_FUNC_DEF | PIN_SPU_EN | PIN_WPUS_DEF | PIN_I_EN)
223166

224167
/*******************redefined pinmap ***************************/
225168

‎drivers/include/hal_pinmux.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static inline void uwp_pmux_func_clear(u32_t pin)
9595
u32_t pin_reg = PINMUX_PIN_REG(pin);
9696
u32_t conf = sys_read32(pin_reg);
9797

98-
conf &= (~(PIN_FUNC_5));
98+
conf &= (~(PMUX_PIN_FUNC(1)));
9999
sys_write32(conf, pin_reg);
100100
}
101101

@@ -104,7 +104,7 @@ static inline void uwp_pmux_func_set(u32_t pin, u32_t func)
104104
u32_t pin_reg = PINMUX_PIN_REG(pin);
105105
u32_t conf = sys_read32(pin_reg);
106106

107-
conf |= func;
107+
conf |= (PMUX_PIN_FUNC(func));
108108
sys_write32(conf, pin_reg);
109109
}
110110

0 commit comments

Comments
 (0)