summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/o2d.dtsi
diff options
context:
space:
mode:
authorGrant Likely2013-02-08 09:02:51 +0100
committerAnatolij Gustschin2013-02-11 22:48:09 +0100
commitfa59f178552f927bd96771ba84e9706655bea705 (patch)
tree1c3eefdca5d5b433d9a4c80693452989e69a382d /arch/powerpc/boot/dts/o2d.dtsi
parentpowerpc/5200: Add Lite5200 on-board LEDs as devices (diff)
downloadkernel-qcow2-linux-fa59f178552f927bd96771ba84e9706655bea705.tar.gz
kernel-qcow2-linux-fa59f178552f927bd96771ba84e9706655bea705.tar.xz
kernel-qcow2-linux-fa59f178552f927bd96771ba84e9706655bea705.zip
powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files
The DTC labels feature allows a dts file to reference a node without having to reproduce the entire node hierarchy above it. We can use this to simplify the MPC5200 board dts files by referencing the gpt nodes by label. Cc: Anatolij Gustschin <agust@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> [agust: fixed gpt7 phandle in the csi node of o2d.dtsi] Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc/boot/dts/o2d.dtsi')
-rw-r--r--arch/powerpc/boot/dts/o2d.dtsi27
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/powerpc/boot/dts/o2d.dtsi b/arch/powerpc/boot/dts/o2d.dtsi
index 24f668039295..cf073e693f24 100644
--- a/arch/powerpc/boot/dts/o2d.dtsi
+++ b/arch/powerpc/boot/dts/o2d.dtsi
@@ -12,6 +12,13 @@
/include/ "mpc5200b.dtsi"
+&gpt0 {
+ gpio-controller;
+ fsl,has-wdt;
+ fsl,wdt-on-boot = <0>;
+};
+&gpt1 { gpio-controller; };
+
/ {
model = "ifm,o2d";
compatible = "ifm,o2d";
@@ -22,24 +29,6 @@
soc5200@f0000000 {
- gpio_simple: gpio@b00 {
- };
-
- timer@600 { // General Purpose Timer
- #gpio-cells = <2>;
- gpio-controller;
- fsl,has-wdt;
- fsl,wdt-on-boot = <0>;
- };
-
- timer@610 {
- #gpio-cells = <2>;
- gpio-controller;
- };
-
- timer7: timer@670 {
- };
-
rtc@800 {
status = "disabled";
};
@@ -118,7 +107,7 @@
csi@3,0 {
compatible = "ifm,o2d-csi";
reg = <3 0 0x00100000>;
- ifm,csi-clk-handle = <&timer7>;
+ ifm,csi-clk-handle = <&gpt7>;
gpios = <&gpio_simple 23 0 /* imag_capture */
&gpio_simple 26 0 /* imag_reset */
&gpio_simple 29 0>; /* imag_master_en */