aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-02-20 22:47:46 +0100
committerLubomir Rintel <lkundrak@v3.sk>2019-04-19 07:28:33 +0200
commit549837e8aed9e43eaf704cae2c5cb3351a24014d (patch)
tree9613b0c4a7e4f739cc0b0cb2fe3b2cde7b8abca2
parentc409336df33d6522a1ff9afcb34d412d1015bcce (diff)
downloadopenfirmware-549837e8aed9e43eaf704cae2c5cb3351a24014d.tar.gz
mmp2: switch TWSI to clock from /clocks
-rw-r--r--cpu/arm/mmp2/twsi-node.fth2
-rw-r--r--cpu/arm/olpc/twsi-i2c.fth14
2 files changed, 8 insertions, 8 deletions
diff --git a/cpu/arm/mmp2/twsi-node.fth b/cpu/arm/mmp2/twsi-node.fth
index bc6ba69e..c24e95f2 100644
--- a/cpu/arm/mmp2/twsi-node.fth
+++ b/cpu/arm/mmp2/twsi-node.fth
@@ -17,7 +17,7 @@ new-device
[then] ( baseadr clock# irq# )
" interrupts" integer-property ( baseadr clock# )
-" /apbc" encode-phandle rot encode-int encode+ " clocks" property
+" /clocks" encode-phandle rot encode-int encode+ " clocks" property
h# 1000 reg ( )
1 " #address-cells" integer-property
diff --git a/cpu/arm/olpc/twsi-i2c.fth b/cpu/arm/olpc/twsi-i2c.fth
index d544f4d7..0f0e4c74 100644
--- a/cpu/arm/olpc/twsi-i2c.fth
+++ b/cpu/arm/olpc/twsi-i2c.fth
@@ -4,13 +4,13 @@ purpose: Device tree nodes for board-specific I2C buses implemented by TWSI hard
\ The unit# properties are chosen so that GPIO I2C nodes get lower addresses.
\ Some Linux drivers expect to find devices on specific I2C bus numbers.
-\ baseadr clk irq mux? fast? unit#
- h# d4011000 1 7 false true 2 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI1
- h# d4031000 2 0 true true 3 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI2
-\ h# d4032000 3 1 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI3
- h# d4033000 4 2 true true 5 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI4
-\ h# d4038000 d# 30 3 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI5
- h# d4034000 d# 31 4 true true 4 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI6
+\ baseadr clk irq mux? fast? unit#
+ h# d4011000 mmp2-twsi0-clk# 7 false true 2 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI1
+ h# d4031000 mmp2-twsi1-clk# 0 true true 3 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI2
+\ h# d4032000 mmp2-twsi2-clk# 1 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI3
+ h# d4033000 mmp2-twsi3-clk# 2 true true 5 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI4
+\ h# d4038000 mmp2-twsi4-clk# 3 true true N fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI5
+ h# d4034000 mmp2-twsi5-clk# 4 true true 4 fload ${BP}/cpu/arm/mmp2/twsi-node.fth \ TWSI6
devalias i2c2 /i2c@d4011000
devalias i2c3 /i2c@d4031000