Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Linaro
qcomlt
demos
linux
Commits
a89ef75a
Commit
a89ef75a
authored
1 year ago
by
Geert Uytterhoeven
Browse files
Options
Downloads
Plain Diff
Merge branch 'renesas-dts-for-v6.8' into renesas-next
parents
c11a6389
95d516f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/boot/dts/renesas/r9a06g032.dtsi
+1
-1
1 addition, 1 deletion
arch/arm/boot/dts/renesas/r9a06g032.dtsi
arch/arm64/boot/dts/renesas/r9a09g011.dtsi
+1
-1
1 addition, 1 deletion
arch/arm64/boot/dts/renesas/r9a09g011.dtsi
with
2 additions
and
2 deletions
arch/arm/boot/dts/renesas/r9a06g032.dtsi
+
1
−
1
View file @
a89ef75a
...
...
@@ -437,7 +437,7 @@ gic: interrupt-controller@44101000 {
};
can0: can@52104000 {
compatible = "renesas,r9a06g032-sja1000","renesas,rzn1-sja1000";
compatible = "renesas,r9a06g032-sja1000",
"renesas,rzn1-sja1000";
reg = <0x52104000 0x800>;
reg-io-width = <4>;
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
...
...
This diff is collapsed.
Click to expand it.
arch/arm64/boot/dts/renesas/r9a09g011.dtsi
+
1
−
1
View file @
a89ef75a
...
...
@@ -163,7 +163,7 @@ usb3peri: usb3peri@85070000 {
};
avb: ethernet@a3300000 {
compatible = "renesas,etheravb-r9a09g011","renesas,etheravb-rzv2m";
compatible = "renesas,etheravb-r9a09g011",
"renesas,etheravb-rzv2m";
reg = <0 0xa3300000 0 0x800>;
interrupts = <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>, /* ch0: Rx0 BE */
<GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH>, /* ch1: Rx1 NC */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment