shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'gemini-dts-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2023-01-25 16:55:32 +01:00
parent 1ba4a8a6ce 776e8ee7a3
commit d5d4804128
4 changed files with 31 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/boot/dts/gemini-dlink-dns-313.dts
View File

@@ -80,6 +80,15 @@
#cooling-cells = <2>;
};
/*
* This is the type B USB connector on the device,
* a GPIO-controlled USB VBUS detect
*/
usb1_phy: phy {
compatible = "gpio-usb-b-connector", "usb-b-connector";
#phy-cells = <0>;
vbus-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
};
/* Global Mixed-Mode Technology G751 mounted on GPIO I2C */
i2c {
@@ -164,6 +173,8 @@
compatible = "cortina,gemini-flash", "jedec-flash";
status = "okay";
reg = <0x30000000 0x00080000>;
#address-cells = <1>;
#size-cells = <1>;
/*
* This "RedBoot" is the Storlink derivative.
@@ -300,5 +311,13 @@
ide@63000000 {
status = "okay";
};
usb@69000000 {
status = "okay";
dr_mode = "peripheral";
usb-phy = <&usb1_phy>;
pinctrl-names = "default";
pinctrl-0 = <&usb_default_pins>;
};
};
};

31
arch/arm/boot/dts/gemini-wbd111.dts
View File

@@ -87,33 +87,10 @@
/* 8MB of flash */
reg = <0x30000000 0x00800000>;
partition@0 {
label = "RedBoot";
reg = <0x00000000 0x00020000>;
read-only;
};
partition@20000 {
label = "kernel";
reg = <0x00020000 0x00100000>;
};
partition@120000 {
label = "rootfs";
reg = <0x00120000 0x006a0000>;
};
partition@7c0000 {
label = "VCTL";
reg = <0x007c0000 0x00010000>;
read-only;
};
partition@7d0000 {
label = "cfg";
reg = <0x007d0000 0x00010000>;
read-only;
};
partition@7e0000 {
label = "FIS";
reg = <0x007e0000 0x00010000>;
read-only;
partitions {
compatible = "redboot-fis";
/* Eraseblock at 0x7e0000 */
fis-index-block = <0x3f>;
};
};

31
arch/arm/boot/dts/gemini-wbd222.dts
View File

@@ -91,33 +91,10 @@
/* 8MB of flash */
reg = <0x30000000 0x00800000>;
partition@0 {
label = "RedBoot";
reg = <0x00000000 0x00020000>;
read-only;
};
partition@20000 {
label = "kernel";
reg = <0x00020000 0x00100000>;
};
partition@120000 {
label = "rootfs";
reg = <0x00120000 0x006a0000>;
};
partition@7c0000 {
label = "VCTL";
reg = <0x007c0000 0x00010000>;
read-only;
};
partition@7d0000 {
label = "cfg";
reg = <0x007d0000 0x00010000>;
read-only;
};
partition@7e0000 {
label = "FIS";
reg = <0x007e0000 0x00010000>;
read-only;
partitions {
compatible = "redboot-fis";
/* Eraseblock at 0x7e0000 */
fis-index-block = <0x3f>;
};
};

8
arch/arm/boot/dts/gemini.dtsi
View File

@@ -22,8 +22,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pflash_default_pins>;
bank-width = <2>;
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
};
@@ -441,7 +439,7 @@
};
usb0: usb@68000000 {
compatible = "cortina,gemini-usb", "faraday,fotg210";
compatible = "cortina,gemini-usb", "faraday,fotg200";
reg = <0x68000000 0x1000>;
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
resets = <&syscon GEMINI_RESET_USB0>;
@@ -457,12 +455,14 @@
*/
pinctrl-names = "default";
pinctrl-0 = <&usb_default_pins>;
/* Default to host mode */
dr_mode = "host";
syscon = <&syscon>;
status = "disabled";
};
usb1: usb@69000000 {
compatible = "cortina,gemini-usb", "faraday,fotg210";
compatible = "cortina,gemini-usb", "faraday,fotg200";
reg = <0x69000000 0x1000>;
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
resets = <&syscon GEMINI_RESET_USB1>;