projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d544177
dbb88d5
)
Merge branch 'CR_845_FPGA-V1.0-VIN_update_changhuang.liang' into 'jh7110_fpga_dev_5.15'
author
andy.hu
<andy.hu@starfivetech.com>
Thu, 28 Apr 2022 11:38:27 +0000
(11:38 +0000)
committer
andy.hu
<andy.hu@starfivetech.com>
Thu, 28 Apr 2022 11:38:27 +0000
(11:38 +0000)
Cr 845 fpga v1.0 vin update changhuang.liang
See merge request sdk/sft-riscvpi-linux-5.10!35
1
2
arch/riscv/boot/dts/starfive/jh7110-common.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/riscv/boot/dts/starfive/jh7110.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/riscv/boot/dts/starfive/jh7110-common.dtsi
Simple merge
diff --cc
arch/riscv/boot/dts/starfive/jh7110.dtsi
index
5bd497d
,
53f348d
..
4d83468
mode 100644,100755..100755
---
1
/
arch/riscv/boot/dts/starfive/jh7110.dtsi
---
2
/
arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/
arch/riscv/boot/dts/starfive/jh7110.dtsi
diff --cc
arch/riscv/boot/dts/starfive/jh7110_pinctrl.dtsi
Simple merge