Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Starlight DTS fixes and cleanups #13

Merged
merged 14 commits into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ properties:

dma-channels:
minimum: 1
maximum: 8
maximum: 16

snps,dma-masters:
description: |
Expand All @@ -71,14 +71,14 @@ properties:
Channel priority specifier associated with the DMA channels.
$ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 1
maxItems: 8
maxItems: 16

snps,block-size:
description: |
Channel block size specifier associated with the DMA channels.
$ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 1
maxItems: 8
maxItems: 16

snps,axi-max-burst-len:
description: |
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/usb/cdns,usb3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ properties:
interrupts:
minItems: 3
items:
- description: OTG/DRD controller interrupt
- description: XHCI host controller interrupt
- description: Device controller interrupt
- description: OTG/DRD controller interrupt
- description: interrupt used to wake up core, e.g when usbcmd.rs is
cleared by xhci core, this interrupt is optional

Expand Down
90 changes: 64 additions & 26 deletions arch/riscv/boot/dts/starfive/jh7100-starlight.dts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
#include <dt-bindings/leds/common.h>

/ {
#address-cells = <2>;
#size-cells = <2>;
compatible = "beagle,beaglev-starlight-jh7100";
model = "BeagleV Starlight Beta";
compatible = "beagle,beaglev-starlight-jh7100", "starfive,jh7100";

aliases {
mshc0 = &sdio0;
Expand All @@ -25,6 +23,11 @@
timebase-frequency = <6250000>;
};

memory@80000000 {
device_type = "memory";
reg = <0x0 0x80000000 0x2 0x0>;
};

leds {
compatible = "gpio-leds";

Expand All @@ -37,25 +40,47 @@
};
};

reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;

linux,cma {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x28000000>;
alignment = <0x0 0x1000>;
alloc-ranges = <0x0 0xa0000000 0x0 0x28000000>;
linux,cma-default;
};

jpu_reserved: framebuffer@c9000000 {
reg = <0x0 0xc9000000 0x0 0x4000000>;
};

nvdla_reserved: framebuffer@d0000000 {
reg = <0x0 0xd0000000 0x0 0x28000000>;
};

vin_reserved: framebuffer@f9000000 {
compatible = "shared-dma-pool";
no-map;
reg = <0x0 0xf9000000 0x0 0x1000000>;
};

sffb_reserved: framebuffer@fb000000 {
compatible = "shared-dma-pool";
no-map;
reg = <0x0 0xfb000000 0x0 0x2000000>;
};
};

wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
};
};

&uart0 {
status = "okay";
};

&uart3 {
status = "okay";
};

&usb3 {
dr_mode = "host";
status = "okay";
};

&i2c0 {
imx219@10 {
compatible = "imx219";
Expand Down Expand Up @@ -121,16 +146,6 @@
};
};

&spi2 {
status = "okay";

spi_dev0: spi@0 {
compatible = "rohm,dh2228fv";
spi-max-frequency = <10000000>;
reg = <0>;
};
};

&sdio0 {
broken-cd;
bus-width = <4>;
Expand Down Expand Up @@ -388,3 +403,26 @@
*/
};
};

&spi2 {
status = "okay";

spi_dev0: spi@0 {
compatible = "rohm,dh2228fv";
spi-max-frequency = <10000000>;
reg = <0>;
};
};

&uart0 {
status = "okay";
};

&uart3 {
status = "okay";
};

&usb3 {
dr_mode = "host";
status = "okay";
};
Loading