forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e 
 kernel/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
....@@ -20,7 +20,7 @@
2020 	leds {
2121 		compatible = "gpio-leds";
2222 
23
-		blue {
23
+		led-blue {
2424 			label = "vega-s95:blue:on";
2525 			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
2626 			default-state = "on";
....@@ -28,10 +28,10 @@
2828 		};
2929 	};
3030 
31
-	usb_vbus: regulator-usb0-vbus {
31
+	usb_pwr: regulator-usb-pwrs {
3232 		compatible = "regulator-fixed";
3333 
34
-		regulator-name = "USB0_VBUS";
34
+		regulator-name = "USB_PWR";
3535 
3636 		regulator-min-microvolt = <5000000>;
3737 		regulator-max-microvolt = <5000000>;
....@@ -40,18 +40,32 @@
4040 		enable-active-high;
4141 	};
4242 
43
+	vddio_boot: regulator-vddio_boot {
44
+		compatible = "regulator-fixed";
45
+		regulator-name = "VDDIO_BOOT";
46
+		regulator-min-microvolt = <1800000>;
47
+		regulator-max-microvolt = <1800000>;
48
+	};
49
+
50
+	vddao_3v3: regulator-vddao_3v3 {
51
+		compatible = "regulator-fixed";
52
+		regulator-name = "VDDAO_3V3";
53
+		regulator-min-microvolt = <3300000>;
54
+		regulator-max-microvolt = <3300000>;
55
+	};
56
+
57
+	vddio_ao18: regulator-vddio_ao18 {
58
+		compatible = "regulator-fixed";
59
+		regulator-name = "VDDIO_AO18";
60
+		regulator-min-microvolt = <1800000>;
61
+		regulator-max-microvolt = <1800000>;
62
+	};
63
+
4364 	vcc_3v3: regulator-vcc_3v3 {
4465 		compatible = "regulator-fixed";
4566 		regulator-name = "VCC_3V3";
4667 		regulator-min-microvolt = <3300000>;
4768 		regulator-max-microvolt = <3300000>;
48
-	};
49
-
50
-	vcc_1v8: regulator-vcc_1v8 {
51
-		compatible = "regulator-fixed";
52
-		regulator-name = "VCC_1V8";
53
-		regulator-min-microvolt = <1800000>;
54
-		regulator-max-microvolt = <1800000>;
5569 	};
5670 
5771 	emmc_pwrseq: emmc-pwrseq {
....@@ -66,13 +80,30 @@
6680 		pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
6781 	};
6882 
83
+	hdmi-connector {
84
+		compatible = "hdmi-connector";
85
+		type = "a";
86
+
87
+		port {
88
+			hdmi_connector_in: endpoint {
89
+				remote-endpoint = <&hdmi_tx_tmds_out>;
90
+			};
91
+		};
92
+	};
93
+
6994 	sdio_pwrseq: sdio-pwrseq {
7095 		compatible = "mmc-pwrseq-simple";
71
-		reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>,
72
-				<&gpio GPIOX_20 GPIO_ACTIVE_LOW>;
96
+		reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
7397 		clocks = <&wifi32k>;
7498 		clock-names = "ext_clock";
7599 	};
100
+};
101
+
102
+&cec_AO {
103
+	status = "okay";
104
+	pinctrl-0 = <&ao_cec_pins>;
105
+	pinctrl-names = "default";
106
+	hdmi-phandle = <&hdmi_tx>;
76107 };
77108 
78109 &ethmac {
....@@ -85,10 +116,6 @@
85116 
86117 	amlogic,tx-delay-ns = <2>;
87118 
88
-	snps,reset-gpio = <&gpio GPIOZ_14 0>;
89
-	snps,reset-delays-us = <0 10000 1000000>;
90
-	snps,reset-active-low;
91
-
92119 	mdio {
93120 		compatible = "snps,dwmac-mdio";
94121 		#address-cells = <1>;
....@@ -97,7 +124,27 @@
97124 		eth_phy0: ethernet-phy@0 {
98125 			/* Realtek RTL8211F (0x001cc916) */
99126 			reg = <0>;
127
+
128
+			reset-assert-us = <10000>;
129
+			reset-deassert-us = <80000>;
130
+			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
131
+
132
+			interrupt-parent = <&gpio_intc>;
133
+			/* MAC_INTR on GPIOZ_15 */
134
+			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
100135 		};
136
+	};
137
+};
138
+
139
+&hdmi_tx {
140
+	status = "okay";
141
+	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
142
+	pinctrl-names = "default";
143
+};
144
+
145
+&hdmi_tx_tmds_port {
146
+	hdmi_tx_tmds_out: endpoint {
147
+		remote-endpoint = <&hdmi_connector_in>;
101148 	};
102149 };
103150 
....@@ -105,6 +152,7 @@
105152 	status = "okay";
106153 	pinctrl-0 = <&remote_input_ao_pins>;
107154 	pinctrl-names = "default";
155
+	linux,rc-map-name = "rc-vega-s9x";
108156 };
109157 
110158 &pwm_ef {
....@@ -115,10 +163,15 @@
115163 	clock-names = "clkin0";
116164 };
117165 
166
+&saradc {
167
+	status = "okay";
168
+	vref-supply = <&vddio_ao18>;
169
+};
170
+
118171 /* Wireless SDIO Module */
119172 &sd_emmc_a {
120173 	status = "okay";
121
-	pinctrl-0 = <&sdio_pins &sdio_irq_pins>;
174
+	pinctrl-0 = <&sdio_pins>;
122175 	pinctrl-1 = <&sdio_clk_gate_pins>;
123176 	pinctrl-names = "default", "clk-gate";
124177 	#address-cells = <1>;
....@@ -126,15 +179,18 @@
126179 
127180 	bus-width = <4>;
128181 	cap-sd-highspeed;
129
-	max-frequency = <100000000>;
182
+	max-frequency = <50000000>;
130183 
131184 	non-removable;
132185 	disable-wp;
133186 
187
+	/* WiFi firmware requires power to be kept while in suspend */
188
+	keep-power-in-suspend;
189
+
134190 	mmc-pwrseq = <&sdio_pwrseq>;
135191 
136
-	vmmc-supply = <&vcc_3v3>;
137
-	vqmmc-supply = <&vcc_1v8>;
192
+	vmmc-supply = <&vddao_3v3>;
193
+	vqmmc-supply = <&vddio_boot>;
138194 
139195 	brcmf: wifi@1 {
140196 		reg = <1>;
....@@ -151,13 +207,13 @@
151207 
152208 	bus-width = <4>;
153209 	cap-sd-highspeed;
154
-	max-frequency = <100000000>;
210
+	max-frequency = <50000000>;
155211 	disable-wp;
156212 
157
-	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
158
-	cd-inverted;
213
+	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
159214 
160
-	vmmc-supply = <&vcc_3v3>;
215
+	vmmc-supply = <&vddao_3v3>;
216
+	vqmmc-supply = <&vcc_3v3>;
161217 };
162218 
163219 /* eMMC */
....@@ -177,9 +233,25 @@
177233 
178234 	mmc-pwrseq = <&emmc_pwrseq>;
179235 	vmmc-supply = <&vcc_3v3>;
180
-	vmmcq-sumpply = <&vcc_1v8>;
236
+	vqmmc-supply = <&vddio_boot>;
181237 };
182238 
239
+/* This is connected to the Bluetooth module: */
240
+&uart_A {
241
+	status = "okay";
242
+	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
243
+	pinctrl-names = "default";
244
+
245
+	bluetooth {
246
+		compatible = "brcm,bcm43438-bt";
247
+		shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
248
+		max-speed = <2000000>;
249
+		clocks = <&wifi32k>;
250
+		clock-names = "lpo";
251
+	};
252
+};
253
+
254
+/* This UART is brought out to the DB9 connector */
183255 &uart_AO {
184256 	status = "okay";
185257 	pinctrl-0 = <&uart_ao_a_pins>;
....@@ -188,7 +260,7 @@
188260 
189261 &usb0_phy {
190262 	status = "okay";
191
-	phy-supply = <&usb_vbus>;
263
+	phy-supply = <&usb_pwr>;
192264 };
193265 
194266 &usb1_phy {