tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gemini-dts-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt
Gemini DTS additions and fixes for the v6.3 kernel cycle:
- Fix a schema warning by pushing down flash address/size to
each device tree.
- Use RedBoot partition parsing properly on Wiliboard devices.
- Fix the FOTG200 USB block version.
- Activate device mode on the DNS-313 now that we merged the
necessary USB changes.
* tag 'gemini-dts-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: gemini: Enable DNS313 FOTG210 as periph
ARM: dts: gemini: Fix USB block version
ARM: dts: gemini: wbd222: Use RedBoot partion parser
ARM: dts: gemini: wbd111: Use RedBoot partion parser
ARM: dts: gemini: Push down flash address/size cells
Link: https://lore.kernel.org/r/CACRpkdb=dDD-y91jdEM01iuioJVDgDwMgS8F46iN84vw_V8BvA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+31
-58
+19
arch/arm/boot/dts/gemini-dlink-dns-313.dts
+19
arch/arm/boot/dts/gemini-dlink-dns-313.dts
···
80
80
#cooling-cells = <2>;
81
81
};
82
82
83
+
/*
84
+
* This is the type B USB connector on the device,
85
+
* a GPIO-controlled USB VBUS detect
86
+
*/
87
+
usb1_phy: phy {
88
+
compatible = "gpio-usb-b-connector", "usb-b-connector";
89
+
#phy-cells = <0>;
90
+
vbus-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
91
+
};
83
92
84
93
/* Global Mixed-Mode Technology G751 mounted on GPIO I2C */
85
94
i2c {
···
173
164
compatible = "cortina,gemini-flash", "jedec-flash";
174
165
status = "okay";
175
166
reg = <0x30000000 0x00080000>;
167
+
#address-cells = <1>;
168
+
#size-cells = <1>;
176
169
177
170
/*
178
171
* This "RedBoot" is the Storlink derivative.
···
310
299
311
300
ide@63000000 {
312
301
status = "okay";
302
+
};
303
+
304
+
usb@69000000 {
305
+
status = "okay";
306
+
dr_mode = "peripheral";
307
+
usb-phy = <&usb1_phy>;
308
+
pinctrl-names = "default";
309
+
pinctrl-0 = <&usb_default_pins>;
313
310
};
314
311
};
315
312
};
+4
-27
arch/arm/boot/dts/gemini-wbd111.dts
+4
-27
arch/arm/boot/dts/gemini-wbd111.dts
···
87
87
/* 8MB of flash */
88
88
reg = <0x30000000 0x00800000>;
89
89
90
-
partition@0 {
91
-
label = "RedBoot";
92
-
reg = <0x00000000 0x00020000>;
93
-
read-only;
94
-
};
95
-
partition@20000 {
96
-
label = "kernel";
97
-
reg = <0x00020000 0x00100000>;
98
-
};
99
-
partition@120000 {
100
-
label = "rootfs";
101
-
reg = <0x00120000 0x006a0000>;
102
-
};
103
-
partition@7c0000 {
104
-
label = "VCTL";
105
-
reg = <0x007c0000 0x00010000>;
106
-
read-only;
107
-
};
108
-
partition@7d0000 {
109
-
label = "cfg";
110
-
reg = <0x007d0000 0x00010000>;
111
-
read-only;
112
-
};
113
-
partition@7e0000 {
114
-
label = "FIS";
115
-
reg = <0x007e0000 0x00010000>;
116
-
read-only;
90
+
partitions {
91
+
compatible = "redboot-fis";
92
+
/* Eraseblock at 0x7e0000 */
93
+
fis-index-block = <0x3f>;
117
94
};
118
95
};
119
96
+4
-27
arch/arm/boot/dts/gemini-wbd222.dts
+4
-27
arch/arm/boot/dts/gemini-wbd222.dts
···
91
91
/* 8MB of flash */
92
92
reg = <0x30000000 0x00800000>;
93
93
94
-
partition@0 {
95
-
label = "RedBoot";
96
-
reg = <0x00000000 0x00020000>;
97
-
read-only;
98
-
};
99
-
partition@20000 {
100
-
label = "kernel";
101
-
reg = <0x00020000 0x00100000>;
102
-
};
103
-
partition@120000 {
104
-
label = "rootfs";
105
-
reg = <0x00120000 0x006a0000>;
106
-
};
107
-
partition@7c0000 {
108
-
label = "VCTL";
109
-
reg = <0x007c0000 0x00010000>;
110
-
read-only;
111
-
};
112
-
partition@7d0000 {
113
-
label = "cfg";
114
-
reg = <0x007d0000 0x00010000>;
115
-
read-only;
116
-
};
117
-
partition@7e0000 {
118
-
label = "FIS";
119
-
reg = <0x007e0000 0x00010000>;
120
-
read-only;
94
+
partitions {
95
+
compatible = "redboot-fis";
96
+
/* Eraseblock at 0x7e0000 */
97
+
fis-index-block = <0x3f>;
121
98
};
122
99
};
123
100
+4
-4
arch/arm/boot/dts/gemini.dtsi
+4
-4
arch/arm/boot/dts/gemini.dtsi
···
22
22
pinctrl-names = "default";
23
23
pinctrl-0 = <&pflash_default_pins>;
24
24
bank-width = <2>;
25
-
#address-cells = <1>;
26
-
#size-cells = <1>;
27
25
status = "disabled";
28
26
};
29
27
···
439
441
};
440
442
441
443
usb0: usb@68000000 {
442
-
compatible = "cortina,gemini-usb", "faraday,fotg210";
444
+
compatible = "cortina,gemini-usb", "faraday,fotg200";
443
445
reg = <0x68000000 0x1000>;
444
446
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
445
447
resets = <&syscon GEMINI_RESET_USB0>;
···
455
457
*/
456
458
pinctrl-names = "default";
457
459
pinctrl-0 = <&usb_default_pins>;
460
+
/* Default to host mode */
461
+
dr_mode = "host";
458
462
syscon = <&syscon>;
459
463
status = "disabled";
460
464
};
461
465
462
466
usb1: usb@69000000 {
463
-
compatible = "cortina,gemini-usb", "faraday,fotg210";
467
+
compatible = "cortina,gemini-usb", "faraday,fotg200";
464
468
reg = <0x69000000 0x1000>;
465
469
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
466
470
resets = <&syscon GEMINI_RESET_USB1>;