Author: wmb
Date: Fri Aug 31 01:52:44 2012
New Revision: 3259
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3259
Log:
OLPC ARM - Now that all TWSI child devices have been converted to use the new factoring, removed the old top-level /twsi node from the device tree and removed the global TWSI driver code. The only global references to twsi are now in the suspend/resume code (to be fixed) and an incidental one in MFPR pin attributes.
Modified:
cpu/arm/olpc/build-fw.fth
cpu/arm/olpc/prefw.fth
cpu/arm/olpc/twsi-i2c.fth
Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth Fri Aug 31 01:42:31 2012 (r3258)
+++ cpu/arm/olpc/build-fw.fth Fri Aug 31 01:52:44 2012 (r3259)
@@ -10,7 +10,6 @@
: init-stuff
acgr-clocks-on
init-timers
- init-twsi
;
warning @ warning off
: stand-init-io
Modified: cpu/arm/olpc/prefw.fth
==============================================================================
--- cpu/arm/olpc/prefw.fth Fri Aug 31 01:42:31 2012 (r3258)
+++ cpu/arm/olpc/prefw.fth Fri Aug 31 01:52:44 2012 (r3259)
@@ -229,7 +229,6 @@
fload ${BP}/cpu/arm/mmp2/irq.fth
fload ${BP}/cpu/arm/mmp2/timer.fth
fload ${BP}/cpu/arm/mmp2/gpio.fth
-fload ${BP}/cpu/arm/mmp2/twsi.fth
fload ${BP}/cpu/arm/mmp2/mfpr.fth
fload ${BP}/cpu/arm/mmp2/twsi-package.fth
Modified: cpu/arm/olpc/twsi-i2c.fth
==============================================================================
--- cpu/arm/olpc/twsi-i2c.fth Fri Aug 31 01:42:31 2012 (r3258)
+++ cpu/arm/olpc/twsi-i2c.fth Fri Aug 31 01:52:44 2012 (r3259)
@@ -1,14 +1,16 @@
purpose: Device tree nodes for board-specific I2C buses implemented by TWSI hardware
-: make-twsi-node " ${BP}/cpu/arm/mmp2/twsi-node.fth" included ;
+\ We omit nodes for unconnected TWSI channels
+\ 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 make-twsi-node \ TWSI1
- h# d4031000 2 0 true true 3 make-twsi-node \ TWSI2
-\ h# d4032000 3 1 true true N make-twsi-node \ TWSI3
- h# d4033000 4 2 true true 5 make-twsi-node \ TWSI4
-\ h# d4038000 d# 30 3 true true N make-twsi-node \ TWSI5
- h# d4034000 d# 31 4 true true 4 make-twsi-node \ TWSI6
+ 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
[ifdef] soon-olpc-cl2 \ this breaks cl4-a1 boards, which ofw calls cl2.
dev /i2c at d4033000 \ TWSI4