enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/pcmcia/sa1111_jornada720.c
..
..
@@ -6,29 +6,62 @@
6
6
  *
7
7
  */
8
8
 #include <linux/module.h>
9
-#include <linux/kernel.h>
10
9
 #include <linux/device.h>
11
10
 #include <linux/errno.h>
11
+#include <linux/gpio/consumer.h>
12
12
 #include <linux/init.h>
13
13
 #include <linux/io.h>
14
14
 
15
15
 #include <mach/hardware.h>
16
-#include <asm/hardware/sa1111.h>
17
16
 #include <asm/mach-types.h>
18
17
 
19
18
 #include "sa1111_generic.h"
20
19
 
21
-/* Does SOCKET1_3V actually do anything? */
22
-#define SOCKET0_POWER	GPIO_GPIO0
23
-#define SOCKET0_3V	GPIO_GPIO2
24
-#define SOCKET1_POWER	(GPIO_GPIO1 | GPIO_GPIO3)
25
-#define SOCKET1_3V	GPIO_GPIO3
20
+/*
21
+ * Socket 0 power: GPIO A0
22
+ * Socket 0 3V: GPIO A2
23
+ * Socket 1 power: GPIO A1 & GPIO A3
24
+ * Socket 1 3V: GPIO A3
25
+ * Does Socket 1 3V actually do anything?
26
+ */
27
+enum {
28
+	J720_GPIO_PWR,
29
+	J720_GPIO_3V,
30
+	J720_GPIO_MAX,
31
+};
32
+struct jornada720_data {
33
+	struct gpio_desc *gpio[J720_GPIO_MAX];
34
+};
35
+
36
+static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
37
+{
38
+	struct device *dev = skt->socket.dev.parent;
39
+	struct jornada720_data *j;
40
+
41
+	j = devm_kzalloc(dev, sizeof(*j), GFP_KERNEL);
42
+	if (!j)
43
+		return -ENOMEM;
44
+
45
+	j->gpio[J720_GPIO_PWR] = devm_gpiod_get(dev, skt->nr ? "s1-power" :
46
+						"s0-power", GPIOD_OUT_LOW);
47
+	if (IS_ERR(j->gpio[J720_GPIO_PWR]))
48
+		return PTR_ERR(j->gpio[J720_GPIO_PWR]);
49
+
50
+	j->gpio[J720_GPIO_3V] = devm_gpiod_get(dev, skt->nr ? "s1-3v" :
51
+					       "s0-3v", GPIOD_OUT_LOW);
52
+	if (IS_ERR(j->gpio[J720_GPIO_3V]))
53
+		return PTR_ERR(j->gpio[J720_GPIO_3V]);
54
+
55
+	skt->driver_data = j;
56
+
57
+	return 0;
58
+}
26
59
 
27
60
 static int
28
61
 jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
29
62
 {
30
-	struct sa1111_pcmcia_socket *s = to_skt(skt);
31
-	unsigned int pa_dwr_mask, pa_dwr_set;
63
+	struct jornada720_data *j = skt->driver_data;
64
+	DECLARE_BITMAP(values, J720_GPIO_MAX) = { 0, };
32
65
 	int ret;
33
66
 
34
67
 	printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
..
..
@@ -36,35 +69,34 @@
36
69
 
37
70
 	switch (skt->nr) {
38
71
 	case 0:
39
-		pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
40
-
41
72
 		switch (state->Vcc) {
42
73
 		default:
43
74
 		case  0:
44
-			pa_dwr_set = 0;
75
+			__assign_bit(J720_GPIO_PWR, values, 0);
76
+			__assign_bit(J720_GPIO_3V, values, 0);
45
77
 			break;
46
78
 		case 33:
47
-			pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
79
+			__assign_bit(J720_GPIO_PWR, values, 1);
80
+			__assign_bit(J720_GPIO_3V, values, 1);
48
81
 			break;
49
82
 		case 50:
50
-			pa_dwr_set = SOCKET0_POWER;
83
+			__assign_bit(J720_GPIO_PWR, values, 1);
84
+			__assign_bit(J720_GPIO_3V, values, 0);
51
85
 			break;
52
86
 		}
53
87
 		break;
54
88
 
55
89
 	case 1:
56
-		pa_dwr_mask = SOCKET1_POWER;
57
-
58
90
 		switch (state->Vcc) {
59
91
 		default:
60
92
 		case 0:
61
-			pa_dwr_set = 0;
93
+			__assign_bit(J720_GPIO_PWR, values, 0);
94
+			__assign_bit(J720_GPIO_3V, values, 0);
62
95
 			break;
63
96
 		case 33:
64
-			pa_dwr_set = SOCKET1_POWER;
65
-			break;
66
97
 		case 50:
67
-			pa_dwr_set = SOCKET1_POWER;
98
+			__assign_bit(J720_GPIO_PWR, values, 1);
99
+			__assign_bit(J720_GPIO_3V, values, 1);
68
100
 			break;
69
101
 		}
70
102
 		break;
..
..
@@ -81,13 +113,15 @@
81
113
 
82
114
 	ret = sa1111_pcmcia_configure_socket(skt, state);
83
115
 	if (ret == 0)
84
-		sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
116
+		ret = gpiod_set_array_value_cansleep(J720_GPIO_MAX, j->gpio,
117
+						     NULL, values);
85
118
 
86
119
 	return ret;
87
120
 }
88
121
 
89
122
 static struct pcmcia_low_level jornada720_pcmcia_ops = {
90
123
 	.owner			= THIS_MODULE,
124
+	.hw_init		= jornada720_pcmcia_hw_init,
91
125
 	.configure_socket	= jornada720_pcmcia_configure_socket,
92
126
 	.first			= 0,
93
127
 	.nr			= 2,
..
..
@@ -95,15 +129,8 @@
95
129
 
96
130
 int pcmcia_jornada720_init(struct sa1111_dev *sadev)
97
131
 {
98
-	unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
99
-
100
132
 	/* Fixme: why messing around with SA11x0's GPIO1? */
101
133
 	GRER |= 0x00000002;
102
-
103
-	/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
104
-	sa1111_set_io_dir(sadev, pin, 0, 0);
105
-	sa1111_set_io(sadev, pin, 0);
106
-	sa1111_set_sleep_io(sadev, pin, 0);
107
134
 
108
135
 	sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
109
136
 	return sa1111_pcmcia_add(sadev, &jornada720_pcmcia_ops,