From 0dfe55685842caf1beab1fa90936a3be3f227383 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 8 May 2019 09:08:25 +0200 Subject: mmp2/galcore: fix a typo --- cpu/arm/mmp2/galcore.fth | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth index faefeaf3..b7d75dc9 100644 --- a/cpu/arm/mmp2/galcore.fth +++ b/cpu/arm/mmp2/galcore.fth @@ -11,7 +11,7 @@ new-device [ifdef] mmp2 8 encode-int " interrupts" property " /interrupt-controller" encode-phandle " interrupt-parent" property - " galcore 2D" encode-string encode+ " interrupt-names" property + " galcore 2D" encode-string " interrupt-names" property [then] [ifdef] mmp3 @@ -20,7 +20,6 @@ new-device " galcore 3D" encode-string " galcore 2D" encode-string encode+ " interrupt-names" property [then] - " /clocks" encode-phandle mmp2-gc-clk# encode-int encode+ " clocks" property " GCCLK" " clock-names" string-property finish-device -- cgit 1.2.3-korg From 72c676ac00733e8f504129279da8265571506988 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 8 May 2019 09:01:03 +0200 Subject: mmp2/clk: provide some more clocks ...and a power domain for the GPU. --- cpu/arm/mmp2/clk.fth | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cpu/arm/mmp2/clk.fth b/cpu/arm/mmp2/clk.fth index eb208e5d..118ba9b4 100644 --- a/cpu/arm/mmp2/clk.fth +++ b/cpu/arm/mmp2/clk.fth @@ -2,6 +2,7 @@ purpose: MMP2 clock management \ From include/dt-bindings/clock/marvell,mmp2.h +d# 27 constant mmp2-usb-pll-clk# d# 60 constant mmp2-twsi0-clk# d# 61 constant mmp2-twsi1-clk# d# 63 constant mmp2-twsi3-clk# @@ -24,11 +25,17 @@ d# 104 constant mmp2-sdh3-clk# d# 105 constant mmp2-usb-clk# d# 112 constant mmp2-ccic0-clk# d# 120 constant mmp2-disp0-lcdc-clk# +d# 121 constant mmp2-gpu-gc-mux-clk# +d# 122 constant mmp2-gpu-gc-clk# +d# 123 constant mmp2-gpu-bus-mux-clk# +d# 124 constant mmp2-gpu-bus-clk# + +\ From include/dt-bindings/power/marvell,mmp2.h +d# 0 constant mmp2-gpu-power-domain# \ FIXME: Not official clock numbers! d# 10000 constant mmp2-audio-clk# d# 10001 constant mmp2-vmeta-clk# -d# 10002 constant mmp2-gc-clk# 0 0 " " " /" begin-package " clocks" name @@ -46,6 +53,7 @@ h# d401.5000 encode-int encode+ h# 1000 encode-int encode+ 1 " #clock-cells" integer-property 1 " #reset-cells" integer-property +1 " #power-domain-cells" integer-property \ value clr-mask reg : twsi0-clk h# 3 h# 77 h# 04 +apbc ; -- cgit 1.2.3-korg From 273995fb1d99eb7d0e4372ed46c69e7c7a9db72c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 8 May 2019 09:04:01 +0200 Subject: olpc: include mmp2/galcore on MMP2 --- cpu/arm/mmp2/galcore.fth | 8 -------- cpu/arm/olpc/build-fw.fth | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth index b7d75dc9..3fb0a36a 100644 --- a/cpu/arm/mmp2/galcore.fth +++ b/cpu/arm/mmp2/galcore.fth @@ -8,17 +8,9 @@ new-device " gpu" device-name " mrvl,galcore" +compatible gpu-pa /gpu reg -[ifdef] mmp2 8 encode-int " interrupts" property " /interrupt-controller" encode-phandle " interrupt-parent" property " galcore 2D" encode-string " interrupt-names" property -[then] - -[ifdef] mmp3 - d# 0 encode-int 2 encode-int encode+ " interrupts" property - " /interrupt-controller/interrupt-controller@1c0" encode-phandle " interrupt-parent" property - " galcore 3D" encode-string " galcore 2D" encode-string encode+ " interrupt-names" property -[then] " /clocks" encode-phandle mmp2-gc-clk# encode-int encode+ " clocks" property " GCCLK" " clock-names" string-property diff --git a/cpu/arm/olpc/build-fw.fth b/cpu/arm/olpc/build-fw.fth index 41d1b393..66466dbe 100644 --- a/cpu/arm/olpc/build-fw.fth +++ b/cpu/arm/olpc/build-fw.fth @@ -265,6 +265,9 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth end-package fload ${BP}/cpu/arm/olpc/lcd.fth +[ifdef] mmp2 +fload ${BP}/cpu/arm/mmp2/galcore.fth +[then] [ifdef] mmp3 fload ${BP}/cpu/arm/mmp3/galcore.fth [then] -- cgit 1.2.3-korg From 77645a28ca81d6f91576da7832b91d8b5b39d426 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 8 May 2019 09:16:24 +0200 Subject: mmp2/galcore: make compatible with vivante,gc --- cpu/arm/mmp2/galcore.fth | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth index 3fb0a36a..8a10c875 100644 --- a/cpu/arm/mmp2/galcore.fth +++ b/cpu/arm/mmp2/galcore.fth @@ -6,13 +6,20 @@ h# 1000 constant /gpu dev / new-device " gpu" device-name - " mrvl,galcore" +compatible + " vivante,gc" +compatible gpu-pa /gpu reg 8 encode-int " interrupts" property " /interrupt-controller" encode-phandle " interrupt-parent" property - " galcore 2D" encode-string " interrupt-names" property - " /clocks" encode-phandle mmp2-gc-clk# encode-int encode+ " clocks" property - " GCCLK" " clock-names" string-property + " /clocks" encode-phandle mmp2-gpu-gc-clk# encode-int encode+ + " /clocks" encode-phandle encode+ mmp2-gpu-bus-clk# encode-int encode+ + " clocks" property + + " core" encode-string + " bus" encode-string encode+ + " clock-names" property + + " /clocks" encode-phandle mmp2-gpu-power-domain# encode-int encode+ + " power-domains" property finish-device device-end -- cgit 1.2.3-korg From 5e32beeab6621735e2fd384cdc311ed72db1fb48 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 8 May 2019 09:18:41 +0200 Subject: mmp2/galcore: drive the BUS and GC clocks from USB_PLL --- cpu/arm/mmp2/galcore.fth | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth index 8a10c875..cbf1eabf 100644 --- a/cpu/arm/mmp2/galcore.fth +++ b/cpu/arm/mmp2/galcore.fth @@ -21,5 +21,13 @@ new-device " /clocks" encode-phandle mmp2-gpu-power-domain# encode-int encode+ " power-domains" property + + " /clocks" encode-phandle mmp2-gpu-gc-mux-clk# encode-int encode+ + " /clocks" encode-phandle encode+ mmp2-gpu-bus-mux-clk# encode-int encode+ + " assigned-clocks" property + + " /clocks" encode-phandle mmp2-usb-pll-clk# encode-int encode+ + " /clocks" encode-phandle encode+ mmp2-usb-pll-clk# encode-int encode+ + " assigned-clock-parents" property finish-device device-end -- cgit 1.2.3-korg