projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
sun9i-a80.dtsi
diff --git
a/arch/arm/dts/sun9i-a80.dtsi
b/arch/arm/dts/sun9i-a80.dtsi
index d3dece2eea7213c75fd0d871605afd83f9caa5c5..a43ad779ee2f68546a26da570f19ba601c2dc15b 100644
(file)
--- a/
arch/arm/dts/sun9i-a80.dtsi
+++ b/
arch/arm/dts/sun9i-a80.dtsi
@@
-18,11
+18,6
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
@@
-289,7
+284,7
@@
"ahb0_ss", "ahb0_sd", "ahb0_nand1",
"ahb0_nand0", "ahb0_sdram",
"ahb0_mipi_hsi", "ahb0_sata", "ahb0_ts",
"ahb0_ss", "ahb0_sd", "ahb0_nand1",
"ahb0_nand0", "ahb0_sdram",
"ahb0_mipi_hsi", "ahb0_sata", "ahb0_ts",
- "ahb0_spi0","ahb0_spi1", "ahb0_spi2",
+ "ahb0_spi0",
"ahb0_spi1", "ahb0_spi2",
"ahb0_spi3";
};
"ahb0_spi3";
};
@@
-570,6
+565,12
@@
clocks = <&osc24M>;
};
clocks = <&osc24M>;
};
+ wdt: watchdog@06000ca0 {
+ compatible = "allwinner,sun6i-a31-wdt";
+ reg = <0x06000ca0 0x20>;
+ interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
pio: pinctrl@06000800 {
compatible = "allwinner,sun9i-a80-pinctrl";
reg = <0x06000800 0x400>;
pio: pinctrl@06000800 {
compatible = "allwinner,sun9i-a80-pinctrl";
reg = <0x06000800 0x400>;