enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/pcmcia/sa1111_lubbock.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * linux/drivers/pcmcia/pxa2xx_lubbock.c
3
4
  *
..
..
@@ -5,14 +6,9 @@
5
6
  * Created:	Jan 10, 2002
6
7
  * Copyright:	MontaVista Software Inc.
7
8
  *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2 as
10
- * published by the Free Software Foundation.
11
- *
12
9
  * Originally based upon linux/drivers/pcmcia/sa1100_neponset.c
13
10
  *
14
11
  * Lubbock PCMCIA specific routines.
15
- *
16
12
  */
17
13
 #include <linux/module.h>
18
14
 #include <linux/kernel.h>
..
..
@@ -24,19 +20,30 @@
24
20
 #include <mach/hardware.h>
25
21
 #include <asm/hardware/sa1111.h>
26
22
 #include <asm/mach-types.h>
27
-#include <mach/lubbock.h>
28
23
 
29
24
 #include "sa1111_generic.h"
25
+#include "max1600.h"
26
+
27
+static int lubbock_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
28
+{
29
+	struct max1600 *m;
30
+	int ret;
31
+
32
+	ret = max1600_init(skt->socket.dev.parent, &m,
33
+			   skt->nr ? MAX1600_CHAN_B : MAX1600_CHAN_A,
34
+			   MAX1600_CODE_HIGH);
35
+	if (ret == 0)
36
+		skt->driver_data = m;
37
+
38
+	return ret;
39
+}
30
40
 
31
41
 static int
32
42
 lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
33
43
 				const socket_state_t *state)
34
44
 {
35
-	struct sa1111_pcmcia_socket *s = to_skt(skt);
36
-	unsigned int pa_dwr_mask, pa_dwr_set, misc_mask, misc_set;
45
+	struct max1600 *m = skt->driver_data;
37
46
 	int ret = 0;
38
-
39
-	pa_dwr_mask = pa_dwr_set = misc_mask = misc_set = 0;
40
47
 
41
48
 	/* Lubbock uses the Maxim MAX1602, with the following connections:
42
49
 	 *
..
..
@@ -71,74 +78,7 @@
71
78
  again:
72
79
 	switch (skt->nr) {
73
80
 	case 0:
74
-		pa_dwr_mask = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
75
-
76
-		switch (state->Vcc) {
77
-		case 0: /* Hi-Z */
78
-			break;
79
-
80
-		case 33: /* VY */
81
-			pa_dwr_set |= GPIO_A3;
82
-			break;
83
-
84
-		case 50: /* VX */
85
-			pa_dwr_set |= GPIO_A2;
86
-			break;
87
-
88
-		default:
89
-			printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
90
-			       __func__, state->Vcc);
91
-			ret = -1;
92
-		}
93
-
94
-		switch (state->Vpp) {
95
-		case 0: /* Hi-Z */
96
-			break;
97
-
98
-		case 120: /* 12IN */
99
-			pa_dwr_set |= GPIO_A1;
100
-			break;
101
-
102
-		default: /* VCC */
103
-			if (state->Vpp == state->Vcc)
104
-				pa_dwr_set |= GPIO_A0;
105
-			else {
106
-				printk(KERN_ERR "%s(): unrecognized Vpp %u\n",
107
-				       __func__, state->Vpp);
108
-				ret = -1;
109
-				break;
110
-			}
111
-		}
112
-		break;
113
-
114
81
 	case 1:
115
-		misc_mask = (1 << 15) | (1 << 14);
116
-
117
-		switch (state->Vcc) {
118
-		case 0: /* Hi-Z */
119
-			break;
120
-
121
-		case 33: /* VY */
122
-			misc_set |= 1 << 15;
123
-			break;
124
-
125
-		case 50: /* VX */
126
-			misc_set |= 1 << 14;
127
-			break;
128
-
129
-		default:
130
-			printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
131
-			       __func__, state->Vcc);
132
-			ret = -1;
133
-			break;
134
-		}
135
-
136
-		if (state->Vpp != state->Vcc && state->Vpp != 0) {
137
-			printk(KERN_ERR "%s(): CF slot cannot support Vpp %u\n",
138
-			       __func__, state->Vpp);
139
-			ret = -1;
140
-			break;
141
-		}
142
82
 		break;
143
83
 
144
84
 	default:
..
..
@@ -147,11 +87,8 @@
147
87
 
148
88
 	if (ret == 0)
149
89
 		ret = sa1111_pcmcia_configure_socket(skt, state);
150
-
151
-	if (ret == 0) {
152
-		lubbock_set_misc_wr(misc_mask, misc_set);
153
-		sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
154
-	}
90
+	if (ret == 0)
91
+		ret = max1600_configure(m, state->Vcc, state->Vpp);
155
92
 
156
93
 #if 1
157
94
 	if (ret == 0 && state->Vcc == 33) {
..
..
@@ -175,8 +112,7 @@
175
112
 			/*
176
113
 			 * Switch to 5V,  Configure socket with 5V voltage
177
114
 			 */
178
-			lubbock_set_misc_wr(misc_mask, 0);
179
-			sa1111_set_io(s->dev, pa_dwr_mask, 0);
115
+			max1600_configure(m, 0, 0);
180
116
 
181
117
 			/*
182
118
 			 * It takes about 100ms to turn off Vcc.
..
..
@@ -201,6 +137,7 @@
201
137
 
202
138
 static struct pcmcia_low_level lubbock_pcmcia_ops = {
203
139
 	.owner			= THIS_MODULE,
140
+	.hw_init		= lubbock_pcmcia_hw_init,
204
141
 	.configure_socket	= lubbock_pcmcia_configure_socket,
205
142
 	.first			= 0,
206
143
 	.nr			= 2,
..
..
@@ -210,17 +147,6 @@
210
147
 
211
148
 int pcmcia_lubbock_init(struct sa1111_dev *sadev)
212
149
 {
213
-	/*
214
-	 * Set GPIO_A<3:0> to be outputs for the MAX1600,
215
-	 * and switch to standby mode.
216
-	 */
217
-	sa1111_set_io_dir(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);
218
-	sa1111_set_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
219
-	sa1111_set_sleep_io(sadev, GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
220
-
221
-	/* Set CF Socket 1 power to standby mode. */
222
-	lubbock_set_misc_wr((1 << 15) | (1 << 14), 0);
223
-
224
150
 	pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops);
225
151
 	pxa2xx_configure_sockets(&sadev->dev, &lubbock_pcmcia_ops);
226
152
 	return sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops,