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

MIPS: dts: unit address should not have 0x prefix #84

Open
wants to merge 1 commit into
base: ci20-v3.18
Choose a base branch
from
Open
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
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/ci20.dts
Original file line number Diff line number Diff line change
Expand Up @@ -193,22 +193,22 @@
reg = <0x0 0x0 0x0 0x800000>;
};

partition@0x800000 {
partition@800000 {
label = "u-boot";
reg = <0x0 0x800000 0x0 0x200000>;
};

partition@0xa00000 {
partition@a00000 {
label = "u-boot-env";
reg = <0x0 0xa00000 0x0 0x200000>;
};

partition@0xc00000 {
partition@c00000 {
label = "boot";
reg = <0x0 0xc00000 0x0 0x4000000>;
};

partition@0x8c00000 {
partition@8c00000 {
label = "system";
reg = <0x0 0x4c00000 0x1 0xfb400000>;
};
Expand Down Expand Up @@ -344,7 +344,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pins_i2c2_data>;

ov5640@0x3C {
ov5640@3C {
compatible = "omnivision,ov5640";
reg = <0x3C>;

Expand Down
32 changes: 16 additions & 16 deletions arch/mips/boot/dts/jz4780.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@
#size-cells = <1>;
ranges = <>;

tcu@0x10002000 {
tcu@10002000 {
compatible = "ingenic,jz4780-tcu";
reg = <0x10002000 0x140>;

interrupt-parent = <&intc>;
interrupts = <27 26 25>;
};

watchdog: jz47xx-watchdog@0x10002000 {
watchdog: jz47xx-watchdog@10002000 {
compatible = "ingenic,jz4780-watchdog";
reg = <0x10002000 0x100>;

Expand Down Expand Up @@ -121,7 +121,7 @@

};

pinctrl@0x10010000 {
pinctrl@10010000 {
compatible = "ingenic,jz4780-pinctrl";
reg = <0x10010000 0x600>;

Expand Down Expand Up @@ -509,7 +509,7 @@
clock-names = "baud", "module";
};

i2c0: i2c0@0x10050000 {
i2c0: i2c0@10050000 {
compatible = "ingenic,jz4780-i2c";
reg = <0x10050000 0x1000>;

Expand All @@ -522,7 +522,7 @@
#size-cells = <0>;
};

i2c1: i2c1@0x10051000 {
i2c1: i2c1@10051000 {
compatible = "ingenic,jz4780-i2c";
reg = <0x10051000 0x1000>;

Expand All @@ -535,7 +535,7 @@
#size-cells = <0>;
};

i2c2: i2c2@0x10052000 {
i2c2: i2c2@10052000 {
compatible = "ingenic,jz4780-i2c";
reg = <0x10052000 0x1000>;

Expand All @@ -548,7 +548,7 @@
#size-cells = <0>;
};

i2c3: i2c3@0x10053000 {
i2c3: i2c3@10053000 {
compatible = "ingenic,jz4780-i2c";
reg = <0x10053000 0x1000>;

Expand All @@ -561,7 +561,7 @@
#size-cells = <0>;
};

i2c4: i2c4@0x10054000 {
i2c4: i2c4@10054000 {
compatible = "ingenic,jz4780-i2c";
reg = <0x10054000 0x1000>;

Expand All @@ -574,7 +574,7 @@
#size-cells = <0>;
};

lpcr: lcr@0x10000004 {
lpcr: lcr@10000004 {
compatible = "ingenic,jz4780-lcr";
reg = <0x10000004 0x4>;

Expand All @@ -588,7 +588,7 @@
};
};

adc@0x10070000 {
adc@10070000 {
compatible = "ingenic,jz4780-adc";
reg = <0x10070000 0x30>;

Expand All @@ -607,7 +607,7 @@
ranges = <>;


lcd: jz4780-lcdk@0x13050000 {
lcd: jz4780-lcdk@13050000 {
compatible = "ingenic,jz4780-lcd";
reg = <0x13050000 0x1800>;

Expand All @@ -621,7 +621,7 @@
ddc = <&i2c4>;
};

cim: jz4780-cim@0x13060000 {
cim: jz4780-cim@13060000 {
compatible = "ingenic,jz4780-cim";
reg = <0x13060000 0x68>;
reg-shift = <2>;
Expand All @@ -636,7 +636,7 @@
clock-names = "cim", "module";
};

hdmi: jz4780-hdmi3@0x10180000 {
hdmi: jz4780-hdmi3@10180000 {
compatible = "synopsys,dwc-hdmi";
reg = <0x10180000 0x8000>;
reg-shift = <2>;
Expand Down Expand Up @@ -726,7 +726,7 @@
dma-names = "rx-tx";
};

ehci: jz4780-ehci@0x13490000 {
ehci: jz4780-ehci@13490000 {
compatible = "ingenic,jz4780-ehci";
reg = <0x13490000 0x10000>;

Expand All @@ -736,7 +736,7 @@
clocks = <&cgu JZ4780_CLK_UHC>;
};

ohci: jz4780-ohci@0x134a0000 {
ohci: jz4780-ohci@134a0000 {
compatible = "ingenic,jz4780-ohci";
reg = <0x134a0000 0x10000>;

Expand All @@ -761,7 +761,7 @@
#phy-cells = <0>;
};

usb_otg: jz4780-otg@0x13500000 {
usb_otg: jz4780-otg@13500000 {
compatible = "snps,dwc2";
reg = <0x13500000 0x40000>;

Expand Down