Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: mvebu: Move mv98dx3236 clock bindings

Previously the coreclk binding for the 98dx3236 SoC was inherited from
the armada-370/xp. This block is present in as much as it is possible to
read from the register location without causing any harm. However the
actual sampled at reset values are reflected in the DFX block.

Moving the binding to the DFX block enables support for different clock
strapping options in hardware.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

authored by

Chris Packham and committed by
Gregory CLEMENT
b4bcfccb 43e28ba8

+25 -7
+7
Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
··· 31 31 4 = dclk (SDRAM Interface Clock) 32 32 5 = refclk (Reference Clock) 33 33 34 + The following is a list of provided IDs and clock names on 98dx3236: 35 + 0 = tclk (Internal Bus clock) 36 + 1 = cpuclk (CPU clock) 37 + 2 = ddrclk (DDR clock) 38 + 3 = mpll (MPLL Clock) 39 + 34 40 The following is a list of provided IDs and clock names on Kirkwood and Dove: 35 41 0 = tclk (Internal Bus clock) 36 42 1 = cpuclk (CPU0 clock) ··· 55 49 "marvell,armada-380-core-clock" - For Armada 380/385 SoC core clocks 56 50 "marvell,armada-390-core-clock" - For Armada 39x SoC core clocks 57 51 "marvell,armada-xp-core-clock" - For Armada XP SoC core clocks 52 + "marvell,mv98dx3236-core-clock" - For 98dx3236 family SoC core clocks 58 53 "marvell,dove-core-clock" - for Dove SoC core clocks 59 54 "marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180) 60 55 "marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC
+11
Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
··· 119 119 29 sata1lnk 120 120 30 sata1 SATA Host 1 121 121 122 + The following is a list of provided IDs for 98dx3236: 123 + ID Clock Peripheral 124 + ----------------------------------- 125 + 3 ge1 Gigabit Ethernet 1 126 + 4 ge0 Gigabit Ethernet 0 127 + 5 pex0 PCIe Cntrl 0 128 + 17 sdio SDHCI Host 129 + 18 usb0 USB Host 0 130 + 22 xor0 XOR DMA 0 131 + 122 132 The following is a list of provided IDs for Dove: 123 133 ID Clock Peripheral 124 134 ----------------------------------- ··· 179 169 "marvell,armada-380-gating-clock" - for Armada 380/385 SoC clock gating 180 170 "marvell,armada-390-gating-clock" - for Armada 39x SoC clock gating 181 171 "marvell,armada-xp-gating-clock" - for Armada XP SoC clock gating 172 + "marvell,mv98dx3236-gating-clock" - for 98dx3236 SoC clock gating 182 173 "marvell,dove-gating-clock" - for Dove SoC clock gating 183 174 "marvell,kirkwood-gating-clock" - for Kirkwood SoC clock gating 184 175 - reg : shall be the register address of the Clock Gating Control register
+7 -7
arch/arm/boot/dts/armada-xp-98dx3236.dtsi
··· 176 176 }; 177 177 178 178 gateclk: clock-gating-control@18220 { 179 - compatible = "marvell,armada-xp-gating-clock"; 179 + compatible = "marvell,mv98dx3236-gating-clock"; 180 180 reg = <0x18220 0x4>; 181 181 clocks = <&coreclk 0>; 182 - #clock-cells = <1>; 183 - }; 184 - 185 - coreclk: mvebu-sar@18230 { 186 - compatible = "marvell,mv98dx3236-core-clock"; 187 - reg = <0x18230 0x08>; 188 182 #clock-cells = <1>; 189 183 }; 190 184 ··· 257 263 #size-cells = <1>; 258 264 ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>; 259 265 reg = <MBUS_ID(0x08, 0x00) 0 0x100000>; 266 + 267 + coreclk: mvebu-sar@f8204 { 268 + compatible = "marvell,mv98dx3236-core-clock"; 269 + reg = <0xf8204 0x4>; 270 + #clock-cells = <1>; 271 + }; 260 272 261 273 dfx_coredivclk: corediv-clock@f8268 { 262 274 compatible = "marvell,mv98dx3236-corediv-clock";