ARM: shmobile: r8a73a4/ape6evm multiplatform
Subsystems (7)
Geert Uytterhoeven
maintainercover ARM: shmobile: r8a73a4/ape6evm multiplatform
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.
Thanks!
Geert Uytterhoeven (2):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
Laurent Pinchart (1):
ARM: shmobile: r8a73a4: Remove legacy code
Ulrich Hecht (6):
ARM: shmobile: r8a73a4: Add CPG register bits header
ARM: shmobile: r8a73a4: Common clock framework DT description
ARM: shmobile: ape6evm: Disable legacy clock initialization
ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
Documentation/devicetree/bindings/arm/shmobile.txt | 2 - MAINTAINERS | 1 - arch/arm/boot/dts/Makefile | 2 - arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 ----- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35 +- arch/arm/boot/dts/r8a73a4.dtsi | 333 +++++++++++ arch/arm/configs/ape6evm_defconfig | 109 ---- arch/arm/mach-shmobile/Kconfig | 25 - arch/arm/mach-shmobile/Makefile | 3 - arch/arm/mach-shmobile/Makefile.boot | 2 - arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 -- arch/arm/mach-shmobile/board-ape6evm.c | 286 --------- arch/arm/mach-shmobile/clock-r8a73a4.c | 659 --------------------- arch/arm/mach-shmobile/r8a73a4.h | 17 - arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +-------- include/dt-bindings/clock/r8a73a4-clock.h | 62 ++ 16 files changed, 412 insertions(+), 1613 deletions(-) delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts delete mode 100644 arch/arm/configs/ape6evm_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h
Signature · 12 lines
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH 1/9 ARM: shmobile: r8a73a4: Add CPG register bits header
From: Ulrich Hecht <[email protected]>
--- include/dt-bindings/clock/r8a73a4-clock.h | 62 +++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h
include/dt-bindings/clock/r8a73a4-clock.h new file +62 -0
@@ -0,0 +1,62 @@ +/* +* Copyright 2014 Ulrich Hecht +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __DT_BINDINGS_CLOCK_R8A73A4_H__ +#define __DT_BINDINGS_CLOCK_R8A73A4_H__ + +/* CPG */ +#define R8A73A4_CLK_MAIN 0 +#define R8A73A4_CLK_PLL0 1 +#define R8A73A4_CLK_PLL1 2 +#define R8A73A4_CLK_PLL2 3 +#define R8A73A4_CLK_PLL2S 4 +#define R8A73A4_CLK_PLL2H 5 +#define R8A73A4_CLK_Z 6 +#define R8A73A4_CLK_Z2 7 +#define R8A73A4_CLK_I 8 +#define R8A73A4_CLK_M3 9 +#define R8A73A4_CLK_B 10 +#define R8A73A4_CLK_M1 11 +#define R8A73A4_CLK_M2 12 +#define R8A73A4_CLK_ZX 13 +#define R8A73A4_CLK_ZS 14 +#define R8A73A4_CLK_HP 15 + +/* MSTP2 */ +#define R8A73A4_CLK_DMAC 18 +#define R8A73A4_CLK_SCIFB3 17 +#define R8A73A4_CLK_SCIFB2 16 +#define R8A73A4_CLK_SCIFB1 7 +#define R8A73A4_CLK_SCIFB0 6 +#define R8A73A4_CLK_SCIFA0 4 +#define R8A73A4_CLK_SCIFA1 3 + +/* MSTP3 */ +#define R8A73A4_CLK_CMT1 29 +#define R8A73A4_CLK_IIC1 23 +#define R8A73A4_CLK_IIC0 18 +#define R8A73A4_CLK_IIC7 17 +#define R8A73A4_CLK_IIC6 16 +#define R8A73A4_CLK_MMCIF0 15 +#define R8A73A4_CLK_SDHI0 14 +#define R8A73A4_CLK_SDHI1 13 +#define R8A73A4_CLK_SDHI2 12 +#define R8A73A4_CLK_MMCIF1 5 +#define R8A73A4_CLK_IIC2 0 + +/* MSTP4 */ +#define R8A73A4_CLK_IIC3 11 +#define R8A73A4_CLK_IIC4 10 +#define R8A73A4_CLK_IIC5 9 + +/* MSTP5 */ +#define R8A73A4_CLK_THERMAL 22 +#define R8A73A4_CLK_IIC8 15 + +#endif /* __DT_BINDINGS_CLOCK_R8A73A4_H__ */
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 2/9 ARM: shmobile: r8a73a4: Common clock framework DT description
In reply to Geert UytterhoevenFrom: Ulrich Hecht <[email protected]>
Declares all r8a73a4 clocks supported by the legacy clock framework.
--- arch/arm/boot/dts/r8a73a4.dtsi | 294 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+)
arch/arm/boot/dts/r8a73a4.dtsi +294 -0
@@ -9,6 +9,7 @@ * kind, whether express or implied. */ +#include <dt-bindings/clock/r8a73a4-clock.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h>
@@ -377,4 +378,297 @@ <0 0xf1006000 0 0x2000>; interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + + clocks { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* External root clocks */ + extalr_clk: extalr_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "extalr"; + }; + extal1_clk: extal1_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + clock-output-names = "extal1"; + }; + extal2_clk: extal2_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <48000000>; + clock-output-names = "extal2"; + }; + fsiack_clk: fsiack_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + /* This value must be overridden by the board. */ + clock-frequency = <0>; + clock-output-names = "fsiack"; + }; + fsibck_clk: fsibck_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + /* This value must be overridden by the board. */ + clock-frequency = <0>; + clock-output-names = "fsibck"; + }; + + /* Special CPG clocks */ + cpg_clocks: cpg_clocks at e6150000 { + compatible = "renesas,r8a73a4-cpg-clocks"; + reg = <0 0xe6150000 0 0x10000>; + clocks = <&extal1_clk>, <&extal2_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll0", "pll1", "pll2", + "pll2s", "pll2h", "z", "z2", + "i", "m3", "b", "m1", "m2", + "zx", "zs", "hp"; + }; + + /* Variable factor clocks (DIV6) */ + zb_clk: zb_clk at e6150010 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150010 0 4>; + clocks = <&pll1_div2_clk>, <0>, + <&cpg_clocks R8A73A4_CLK_PLL2S>, <0>; + #clock-cells = <0>; + clock-output-names = "zb"; + }; + sdhi0_clk: sdhi0_clk at e6150074 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150074 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "sdhi0ck"; + }; + sdhi1_clk: sdhi1_clk at e6150078 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150078 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "sdhi1ck"; + }; + sdhi2_clk: sdhi2_clk at e615007c { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615007c 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "sdhi2ck"; + }; + mmc0_clk: mmc0_clk at e6150240 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150240 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "mmc0"; + }; + mmc1_clk: mmc1_clk at e6150244 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150244 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "mmc1"; + }; + vclk1_clk: vclk1_clk at e6150008 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150008 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>, <&main_div2_clk>, + <&extalr_clk>, <0>, <0>; + #clock-cells = <0>; + clock-output-names = "vclk1"; + }; + vclk2_clk: vclk2_clk at e615000c { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615000c 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>, <&main_div2_clk>, + <&extalr_clk>, <0>, <0>; + #clock-cells = <0>; + clock-output-names = "vclk2"; + }; + vclk3_clk: vclk3_clk at e615001c { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615001c 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>, <&main_div2_clk>, + <&extalr_clk>, <0>, <0>; + #clock-cells = <0>; + clock-output-names = "vclk3"; + }; + vclk4_clk: vclk4_clk at e6150014 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150014 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>, <&main_div2_clk>, + <&extalr_clk>, <0>, <0>; + #clock-cells = <0>; + clock-output-names = "vclk4"; + }; + vclk5_clk: vclk5_clk at e6150034 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150034 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <0>, <&extal2_clk>, <&main_div2_clk>, + <&extalr_clk>, <0>, <0>; + #clock-cells = <0>; + clock-output-names = "vclk5"; + }; + fsia_clk: fsia_clk at e6150018 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150018 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <&fsiack_clk>, <0>; + #clock-cells = <0>; + clock-output-names = "fsia"; + }; + fsib_clk: fsib_clk at e6150090 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150090 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <&fsibck_clk>, <0>; + #clock-cells = <0>; + clock-output-names = "fsib"; + }; + mp_clk: mp_clk at e6150080 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150080 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <&extal2_clk>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "mp"; + }; + m4_clk: m4_clk at e6150098 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150098 0 4>; + clocks = <&cpg_clocks R8A73A4_CLK_PLL2S>; + #clock-cells = <0>; + clock-output-names = "m4"; + }; + hsi_clk: hsi_clk at e615026c { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615026c 0 4>; + clocks = <&cpg_clocks R8A73A4_CLK_PLL2H>, <&pll1_div2_clk>, + <&cpg_clocks R8A73A4_CLK_PLL2S>, <0>; + #clock-cells = <0>; + clock-output-names = "hsi"; + }; + spuv_clk: spuv_clk at e6150094 { + compatible = "renesas,r8a73a4-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150094 0 4>; + clocks = <&pll1_div2_clk>, <&cpg_clocks R8A73A4_CLK_PLL2S>, + <&extal2_clk>, <&extal2_clk>; + #clock-cells = <0>; + clock-output-names = "spuv"; + }; + + /* Fixed factor clocks */ + main_div2_clk: main_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A73A4_CLK_MAIN>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "main_div2"; + }; + pll0_div2_clk: pll0_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A73A4_CLK_PLL0>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "pll0_div2"; + }; + pll1_div2_clk: pll1_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A73A4_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "pll1_div2"; + }; + extal1_div2_clk: extal1_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&extal1_clk>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "extal1_div2"; + }; + + /* Gate clocks */ + mstp2_clks: mstp2_clks at e6150138 { + compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, + <&mp_clk>, <&mp_clk>, <&cpg_clocks R8A73A4_CLK_HP>; + #clock-cells = <1>; + clock-indices = < + R8A73A4_CLK_SCIFA0 R8A73A4_CLK_SCIFA1 + R8A73A4_CLK_SCIFB0 R8A73A4_CLK_SCIFB1 + R8A73A4_CLK_SCIFB2 R8A73A4_CLK_SCIFB3 + R8A73A4_CLK_DMAC + >; + clock-output-names = + "scifa0", "scifa1", "scifb0", "scifb1", + "scifb2", "scifb3", "dmac"; + }; + mstp3_clks: mstp3_clks at e615013c { + compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cpg_clocks R8A73A4_CLK_HP>, <&mmc1_clk>, + <&sdhi2_clk>, <&sdhi1_clk>, <&sdhi0_clk>, + <&mmc0_clk>, <&cpg_clocks R8A73A4_CLK_HP>, + <&cpg_clocks R8A73A4_CLK_HP>, <&cpg_clocks + R8A73A4_CLK_HP>, <&cpg_clocks + R8A73A4_CLK_HP>, <&extalr_clk>; + #clock-cells = <1>; + clock-indices = < + R8A73A4_CLK_IIC2 R8A73A4_CLK_MMCIF1 + R8A73A4_CLK_SDHI2 R8A73A4_CLK_SDHI1 + R8A73A4_CLK_SDHI0 R8A73A4_CLK_MMCIF0 + R8A73A4_CLK_IIC6 R8A73A4_CLK_IIC7 + R8A73A4_CLK_IIC0 R8A73A4_CLK_IIC1 + R8A73A4_CLK_CMT1 + >; + clock-output-names = + "iic2", "mmcif1", "sdhi2", "sdhi1", "sdhi0", + "mmcif0", "iic6", "iic7", "iic0", "iic1", + "cmt1"; + }; + mstp4_clks: mstp4_clks at e6150140 { + compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>; + clocks = <&main_div2_clk>, <&cpg_clocks R8A73A4_CLK_HP>, + <&cpg_clocks R8A73A4_CLK_HP>; + #clock-cells = <1>; + clock-indices = < + R8A73A4_CLK_IIC5 R8A73A4_CLK_IIC4 + R8A73A4_CLK_IIC3 + >; + clock-output-names = + "iic5", "iic4", "iic3"; + }; + mstp5_clks: mstp5_clks at e6150144 { + compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; + clocks = <&extal2_clk>, <&cpg_clocks R8A73A4_CLK_HP>; + #clock-cells = <1>; + clock-indices = < + R8A73A4_CLK_THERMAL R8A73A4_CLK_IIC8 + >; + clock-output-names = + "thermal", "iic8"; + }; + }; };
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 3/9 ARM: shmobile: ape6evm: Disable legacy clock initialization
In reply to Geert UytterhoevenFrom: Ulrich Hecht <[email protected]>
Disables r8a73a4_clock_init() if CCF is enabled.
--- arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/board-ape6evm-reference.c +2 -1
@@ -29,7 +29,7 @@static void __init ape6evm_add_standard_devices (void ) { - +#ifndef CONFIG_COMMON_CLK struct clk *parent;struct clk *mp;
@@ -43,6 +43,7 @@ static void __init ape6evm_add_standard_devices(void)clk_set_parent (mp, parent);clk_put (parent);clk_put (mp); +#endif of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); }
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 4/9 ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
In reply to Geert UytterhoevenFrom: Ulrich Hecht <[email protected]>
Assigns clocks to dmac, i2c*, cmt1, thermal, scif*, sdhi*, and mmcif*.
--- arch/arm/boot/dts/r8a73a4.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
arch/arm/boot/dts/r8a73a4.dtsi +30 -0
@@ -88,6 +88,7 @@ "ch8", "ch9", "ch10", "ch11", "ch12", "ch13", "ch14", "ch15", "ch16", "ch17", "ch18", "ch19"; + clocks = <&mstp2_clks R8A73A4_CLK_DMAC>; }; };
@@ -120,6 +121,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe60b0000 0 0x428>; interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp4_clks R8A73A4_CLK_IIC5>; status = "disabled"; };
@@ -128,6 +130,8 @@ compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_CMT1>; + clock-names = "fck"; renesas,channels-mask = <0xff>;
@@ -211,6 +215,7 @@ reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>; interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp5_clks R8A73A4_CLK_THERMAL>; }; i2c0: i2c at e6500000 {
@@ -219,6 +224,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6500000 0 0x428>; interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_IIC0>; status = "disabled"; };
@@ -228,6 +234,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6510000 0 0x428>; interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_IIC1>; status = "disabled"; };
@@ -237,6 +244,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6520000 0 0x428>; interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_IIC2>; status = "disabled"; };
@@ -246,6 +254,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6530000 0 0x428>; interrupts = <0 177 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp4_clks R8A73A4_CLK_IIC3>; status = "disabled"; };
@@ -255,6 +264,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6540000 0 0x428>; interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp4_clks R8A73A4_CLK_IIC4>; status = "disabled"; };
@@ -264,6 +274,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6550000 0 0x428>; interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_IIC6>; status = "disabled"; };
@@ -273,6 +284,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6560000 0 0x428>; interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_IIC7>; status = "disabled"; };
@@ -282,6 +294,7 @@ compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; reg = <0 0xe6570000 0 0x428>; interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp5_clks R8A73A4_CLK_IIC8>; status = "disabled"; };
@@ -289,6 +302,8 @@ compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6c20000 0 0x100>; interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFB0>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -296,6 +311,8 @@ compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6c30000 0 0x100>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFB1>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -303,6 +320,8 @@ compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; reg = <0 0xe6c40000 0 0x100>; interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -310,6 +329,8 @@ compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; reg = <0 0xe6c50000 0 0x100>; interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFA1>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -317,6 +338,8 @@ compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6ce0000 0 0x100>; interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFB2>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -324,6 +347,8 @@ compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6cf0000 0 0x100>; interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A73A4_CLK_SCIFB3>; + clock-names = "sci_ick"; status = "disabled"; };
@@ -331,6 +356,7 @@ compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee100000 0 0x100>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_SDHI0>; cap-sd-highspeed; status = "disabled"; };
@@ -339,6 +365,7 @@ compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee120000 0 0x100>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_SDHI1>; cap-sd-highspeed; status = "disabled"; };
@@ -347,6 +374,7 @@ compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee140000 0 0x100>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_SDHI2>; cap-sd-highspeed; status = "disabled"; };
@@ -355,6 +383,7 @@ compatible = "renesas,sh-mmcif"; reg = <0 0xee200000 0 0x80>; interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_MMCIF0>; reg-io-width = <4>; status = "disabled"; };
@@ -363,6 +392,7 @@ compatible = "renesas,sh-mmcif"; reg = <0 0xee220000 0 0x80>; interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A73A4_CLK_MMCIF1>; reg-io-width = <4>; status = "disabled"; };
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 5/9 ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
In reply to Geert UytterhoevenAdd a node for the Bus State Controller (BSC) on r8a73a4, to which multiple external devices can be connected.
The BSC is driven by the ZB clock, and located in PM domain C4. A reference to the latter will be added later.
---
v3:
- Add Tested-by,
- Move "ranges" before "reg",
v2:
- New.
--- arch/arm/boot/dts/r8a73a4.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/r8a73a4.dtsi +9 -0
@@ -409,6 +409,15 @@ interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + bsc: bus at fec10000 { + compatible = "renesas,bsc-r8a73a4", "renesas,bsc", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0 0x20000000>; + reg = <0 0xfec10000 0 0x400>; + clocks = <&zb_clk>; + }; + clocks { #address-cells = <2>; #size-cells = <2>;
Signature · 1 line
1.9.1
PATCH 5/9 ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
Hi Geert,
Thank you for the patch.
Quoted 8 lines · On Tuesday 20 January 2015 13:51:42 Geert Uytterhoeven wrote:
Add a node for the Bus State Controller (BSC) on r8a73a4, to which multiple external devices can be connected.
The BSC is driven by the ZB clock, and located in PM domain C4. A reference to the latter will be added later.
Signed-off-by Geert Uytterhoeven <[email protected]>Tested-by Ulrich Hecht <[email protected]>
Quoted 31 lines
---
v3:
- Add Tested-by,
- Move "ranges" before "reg",v2:
- New.--- arch/arm/boot/dts/r8a73a4.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)arch/arm/boot/dts/r8a73a4.dtsi +9
-0@@ -409,6 +409,15 @@ interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + bsc: bus at fec10000 { + compatible = "renesas,bsc-r8a73a4", "renesas,bsc", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0 0x20000000>; + reg = <0 0xfec10000 0 0x400>; + clocks = <&zb_clk>; + }; + clocks { #address-cells = <2>; #size-cells = <2>;
Signature · 3 lines
Regards, Laurent Pinchart
Geert Uytterhoeven
maintainerPATCH 6/9 ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
In reply to Geert UytterhoevenMove the Ethernet node from the ad-hoc lbsc node to the BSC node, as its connected to the Bus State Controller. This allows the system to know the right position of the Ethernet node in the clock and PM domain hierarchy, and manage the clock and PM domain appropriately.
---
v3:
- Add Tested-by,
v2:
- New.
--- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +15 -20
@@ -72,26 +72,6 @@ regulator-always-on; }; - lbsc { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0 0 0x20000000>; - - ethernet at 8000000 { - compatible = "smsc,lan9220", "smsc,lan9115"; - reg = <0x08000000 0x1000>; - interrupt-parent = <&irqc1>; - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; - phy-mode = "mii"; - reg-io-width = <4>; - smsc,irq-active-high; - smsc,irq-push-pull; - vdd33a-supply = <&ape6evm_fixed_3v3>; - vddvario-supply = <&ape6evm_fixed_1v8>; - }; - }; - leds { compatible = "gpio-leds"; led1 {
@@ -184,6 +164,21 @@ voltage-tolerance = <1>; /* 1% */ }; +&bsc { + ethernet at 8000000 { + compatible = "smsc,lan9220", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + phy-mode = "mii"; + reg-io-width = <4>; + smsc,irq-active-high; + smsc,irq-push-pull; + vdd33a-supply = <&ape6evm_fixed_3v3>; + vddvario-supply = <&ape6evm_fixed_1v8>; + }; +}; + &cmt1 { status = "okay"; };
Signature · 1 line
1.9.1
PATCH 6/9 ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
Hi Geert,
Thank you for the patch.
Quoted 7 lines · On Tuesday 20 January 2015 13:51:43 Geert Uytterhoeven wrote:
Move the Ethernet node from the ad-hoc lbsc node to the BSC node, as its connected to the Bus State Controller. This allows the system to know the right position of the Ethernet node in the clock and PM domain hierarchy, and manage the clock and PM domain appropriately.
Signed-off-by Geert Uytterhoeven <[email protected]>Tested-by Ulrich Hecht <[email protected]>
Quoted 65 lines
---
v3:
- Add Tested-by,v2:
- New.--- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35+++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
(quoted diff) +0
-0
b/arch/arm/boot/dts/r8a73a4-ape6evm.dtsindex0d50bef0123449f5..44c4cac1820a4dfe100644arch/arm/boot/dts/r8a73a4-ape6evm.dts +15
-20@@ -72,26 +72,6 @@ regulator-always-on; }; - lbsc { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0 0 0x20000000>; - - ethernet at 8000000 { - compatible = "smsc,lan9220", "smsc,lan9115"; - reg = <0x08000000 0x1000>; - interrupt-parent = <&irqc1>; - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; - phy-mode = "mii"; - reg-io-width = <4>; - smsc,irq-active-high; - smsc,irq-push-pull; - vdd33a-supply = <&ape6evm_fixed_3v3>; - vddvario-supply = <&ape6evm_fixed_1v8>; - }; - }; - leds { compatible = "gpio-leds"; led1 {@@ -184,6 +164,21 @@ voltage-tolerance = <1>; /* 1% */ }; +&bsc { + ethernet at 8000000 { + compatible = "smsc,lan9220", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + phy-mode = "mii"; + reg-io-width = <4>; + smsc,irq-active-high; + smsc,irq-push-pull; + vdd33a-supply = <&ape6evm_fixed_3v3>; + vddvario-supply = <&ape6evm_fixed_1v8>; + }; +}; + &cmt1 { status = "okay"; };
Signature · 3 lines
Regards, Laurent Pinchart
Geert Uytterhoeven
maintainerPATCH 7/9 ARM: shmobile: ape6evm-reference: Remove board C code and DT file
In reply to Geert UytterhoevenFrom: Ulrich Hecht <[email protected]>
Now that the r8a73a4 generic multiplatform case has the same features as the APE6EVM DT reference board code, we get rid of the latter. DT reference code in the future shall make use of the r8a73a4 multiplatform support code with the generic SoC machine vector.
--- Documentation/devicetree/bindings/arm/shmobile.txt | 2 - arch/arm/boot/dts/Makefile | 1 - arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 --------------------- arch/arm/mach-shmobile/Kconfig | 12 -- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ape6evm-reference.c | 61 -------- 7 files changed, 234 deletions(-) delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
Documentation/devicetree/bindings/arm/shmobile.txt +0 -2
@@ -37,8 +37,6 @@ Boards: compatible = "renesas,alt", "renesas,r8a7794" - APE6-EVM compatible = "renesas,ape6evm", "renesas,r8a73a4" - - APE6-EVM - Reference Device Tree Implementation - compatible = "renesas,ape6evm-reference", "renesas,r8a73a4" - Atmark Techno Armadillo-800 EVA compatible = "renesas,armadillo800eva" - BOCK-W
arch/arm/boot/dts/Makefile +0 -1
@@ -457,7 +457,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ r8a73a4-ape6evm.dtb \ - r8a73a4-ape6evm-reference.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts deleted +0 -156
156 lines not on this page · raw message
arch/arm/mach-shmobile/Kconfig +0 -12
@@ -147,18 +147,6 @@ config MACH_APE6EVM select SMSC_PHY if SMSC911X select USE_OF -config MACH_APE6EVM_REFERENCE - bool "APE6EVM board - Reference Device Tree Implementation" - depends on ARCH_R8A73A4 - select SMSC_PHY if SMSC911X - select USE_OF - ---help--- - Use reference implementation of APE6EVM board support - which makes a greater use of device tree at the expense - of not supporting a number of devices. - - This is intended to aid developers - config MACH_MACKEREL bool "mackerel board" depends on ARCH_SH7372
arch/arm/mach-shmobile/Makefile +0 -1
@@ -59,7 +59,6 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o else obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o -obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -1,7 +1,6 @@ # per-board load address for uImage loadaddr-y := loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 -loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
arch/arm/mach-shmobile/board-ape6evm-reference.c deleted +0 -61
61 lines not on this page · raw message
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 8/9 ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
In reply to Geert UytterhoevenFrom: Ulrich Hecht <[email protected]>
This removes the remains of the legacy ape6evm platform.
--- MAINTAINERS | 1 - arch/arm/boot/dts/Makefile | 1 - arch/arm/configs/ape6evm_defconfig | 109 ------------- arch/arm/mach-shmobile/Kconfig | 13 -- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ape6evm.c | 286 --------------------------------- 7 files changed, 412 deletions(-) delete mode 100644 arch/arm/configs/ape6evm_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
MAINTAINERS +0 -1
@@ -1384,7 +1384,6 @@ F: arch/arm/boot/dts/emev2* F: arch/arm/boot/dts/r7s* F: arch/arm/boot/dts/r8a* F: arch/arm/boot/dts/sh* -F: arch/arm/configs/ape6evm_defconfig F: arch/arm/configs/armadillo800eva_defconfig F: arch/arm/configs/bockw_defconfig F: arch/arm/configs/kzm9g_defconfig
arch/arm/boot/dts/Makefile +0 -1
@@ -456,7 +456,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-smdkv210.dtb \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ - r8a73a4-ape6evm.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \
arch/arm/configs/ape6evm_defconfig deleted +0 -109
109 lines not on this page · raw message
arch/arm/mach-shmobile/Kconfig +0 -13
@@ -113,13 +113,6 @@ config ARCH_SH73A0 select SH_INTC select RENESAS_INTC_IRQPIN -config ARCH_R8A73A4 - bool "R-Mobile APE6 (R8A73A40)" - select ARCH_RMOBILE - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - select RENESAS_IRQC - config ARCH_R8A7740 bool "R-Mobile A1 (R8A77400)" select ARCH_RMOBILE
@@ -141,12 +134,6 @@ config ARCH_R8A7779 comment "Renesas ARM SoCs Board Type" -config MACH_APE6EVM - bool "APE6EVM board" - depends on ARCH_R8A73A4 - select SMSC_PHY if SMSC911X - select USE_OF - config MACH_MACKEREL bool "mackerel board" depends on ARCH_SH7372
arch/arm/mach-shmobile/Makefile +0 -1
@@ -58,7 +58,6 @@ obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o else -obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -1,6 +1,5 @@ # per-board load address for uImage loadaddr-y := -loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
arch/arm/mach-shmobile/board-ape6evm.c deleted +0 -286
286 lines not on this page · raw message
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerPATCH 9/9 ARM: shmobile: r8a73a4: Remove legacy code
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
All r8a73a4 boards are now used with multiplatform kernels only. We can remove all the unused r8a73a4 legacy device and clock registration code.
--- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/clock-r8a73a4.c | 659 --------------------------------- arch/arm/mach-shmobile/r8a73a4.h | 17 - arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +------------- 4 files changed, 2 insertions(+), 948 deletions(-) delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h
arch/arm/mach-shmobile/Makefile +0 -1
@@ -23,7 +23,6 @@ ifndef CONFIG_COMMON_CLK obj-y += clock.o obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o -obj-$(CONFIG_ARCH_R8A73A4) += clock-r8a73a4.o obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o
arch/arm/mach-shmobile/clock-r8a73a4.c deleted +0 -659
659 lines not on this page · raw message
arch/arm/mach-shmobile/r8a73a4.h deleted +0 -17
@@ -1,17 +0,0 @@ -#ifndef __ASM_R8A73A4_H__ -#define __ASM_R8A73A4_H__ - -/* DMA slave IDs */ -enum { -SHDMA_SLAVE_INVALID , -SHDMA_SLAVE_MMCIF0_TX , -SHDMA_SLAVE_MMCIF0_RX , -SHDMA_SLAVE_MMCIF1_TX , -SHDMA_SLAVE_MMCIF1_RX , -}; - -void r8a73a4_add_standard_devices (void ); -void r8a73a4_clock_init (void ); -void r8a73a4_pinmux_init (void ); - -#endif /* __ASM_R8A73A4_H__ */
arch/arm/mach-shmobile/setup-r8a73a4.c +2 -271
286 lines not on this page · raw message
Signature · 1 line
1.9.1
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
In reply to Geert UytterhoevenQuoted 10 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.
Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.
Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
Quoted 26 lines
Thanks!
Geert Uytterhoeven (2):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSCLaurent Pinchart (1):
ARM: shmobile: r8a73a4: Remove legacy codeUlrich Hecht (6):
ARM: shmobile: r8a73a4: Add CPG register bits header
ARM: shmobile: r8a73a4: Common clock framework DT description
ARM: shmobile: ape6evm: Disable legacy clock initialization
ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platformDocumentation/devicetree/bindings/arm/shmobile.txt | 2 - MAINTAINERS | 1 - arch/arm/boot/dts/Makefile | 2 - arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 ----- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35 +- arch/arm/boot/dts/r8a73a4.dtsi | 333 +++++++++++ arch/arm/configs/ape6evm_defconfig | 109 ---- arch/arm/mach-shmobile/Kconfig | 25 - arch/arm/mach-shmobile/Makefile | 3 -
Quoted 8 lines
arch/arm/mach-shmobile/Makefile.boot | 2 - arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 -- arch/arm/mach-shmobile/board-ape6evm.c | 286 --------- arch/arm/mach-shmobile/clock-r8a73a4.c | 659 --------------------- arch/arm/mach-shmobile/r8a73a4.h | 17 - arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +-------- include/dt-bindings/clock/r8a73a4-clock.h | 62 ++ 16 files changed, 412 insertions(+), 1613 deletions(-)
More code removed, excellent!
Quoted 22 lines
delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts delete mode 100644 arch/arm/configs/ape6evm_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h create mode 100644 include/dt-bindings/clock/r8a73a4-clock.hSignature · 12 lines
1.9.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
Quoted 20 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.
Quoted 8 lines
Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next.
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
Quoted 26 lines · Simon Horman
Quoted 25 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
Quoted 7 lines
Quoted 3 lines
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next.
I have now had a chance to re-examine these patches and it seems to me that the first four patches of the series not depend on the BSC driver (or anything else). With that in mind I have queued them up in a new r8a73a4-ccf-for-v3.21 branch which is present in renesas-devel-20150123-v3.19-rc5.
Please take a moment to see if what I have done makes sense to you. In particular it would be nicer if these patches could go into 'regular' branches such as dt-for-v3.21 and soc-for-v3.21. However it seems to me that the SoC patch "ARM: shmobile: ape6evm: Disable legacy clock initialization" depends on the following two DT patche " "ARM: shmobile:
r8a73a4: Common clock framework DT description".
For reference this covers the following patches:
Enqueued (again):
Ulrich Hecht (6):
ARM: shmobile: r8a73a4: Add CPG register bits header
ARM: shmobile: r8a73a4: Common clock framework DT description
ARM: shmobile: ape6evm: Disable legacy clock initialization
ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
Left Unqueued:
Geert Uytterhoeven (2):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
Laurent Pinchart (1):
ARM: shmobile: r8a73a4: Remove legacy code
Ulrich Hecht (6):
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
Hi Simon,
Quoted 48 lines · Simon Horman
Quoted 24 lines · Simon Horman
Quoted 23 lines · Simon Horman
Quoted 8 lines · Geert Uytterhoeven
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
Quoted 7 lines
Quoted 3 lines
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next.
I have now had a chance to re-examine these patches and it seems to me that the first four patches of the series not depend on the BSC driver (or anything else). With that in mind I have queued them up in a new r8a73a4-ccf-for-v3.21 branch which is present in renesas-devel-20150123-v3.19-rc5.
Please take a moment to see if what I have done makes sense to you. In particular it would be nicer if these patches could go into 'regular' branches such as dt-for-v3.21 and soc-for-v3.21. However it seems to me that the SoC patch "ARM: shmobile: ape6evm: Disable legacy clock initialization" depends on the following two DT patche " "ARM: shmobile:
r8a73a4: Common clock framework DT description".For reference this covers the following patches:
Quoted 7 lines
Enqueued (again):
Ulrich Hecht (6):
ARM: shmobile: r8a73a4: Add CPG register bits header
ARM: shmobile: r8a73a4: Common clock framework DT description
ARM: shmobile: ape6evm: Disable legacy clock initialization
ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
OK, Thanks!
Quoted 6 lines
Left Unqueued:
Geert Uytterhoeven (2):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
Quoted 6 lines
Laurent Pinchart (1):
ARM: shmobile: r8a73a4: Remove legacy codeUlrich Hecht (6):
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
That's correct. Due to the non-working Ethernet in ape6evm-multiplatform, ape6evm-reference (and -legacy) cannot be removed.
The same is true for sh73a0/kzm9g.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
In reply to Simon HormanHi Simon,
Quoted 41 lines · On Friday 23 January 2015 13:23:04 Simon Horman wrote:
Quoted 26 lines · Simon Horman
Quoted 25 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
Quoted 7 lines
Quoted 3 lines
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next.
I have now had a chance to re-examine these patches and it seems to me that the first four patches of the series not depend on the BSC driver (or anything else). With that in mind I have queued them up in a new r8a73a4-ccf-for-v3.21 branch which is present in renesas-devel-20150123-v3.19-rc5.
Quoted 6 lines
Please take a moment to see if what I have done makes sense to you. In particular it would be nicer if these patches could go into 'regular' branches such as dt-for-v3.21 and soc-for-v3.21. However it seems to me that the SoC patch "ARM: shmobile: ape6evm: Disable legacy clock initialization" depends on the following two DT patche " "ARM: shmobile:
r8a73a4: Common clock framework DT description".
I've noticed you have dropped the following patches from your devel branch:
clk: shmobile: div6: Avoid changing divisor in .disable()
clk: shmobile: Add r8a7793 support
clk: shmobile: r8a7793: document CPG clock support
clk: shmobile: r8a73a4 common clock framework implementation
clk: shmobile: Add r8a73a4 SoC to MSTP bindings
clk: shmobile: Add R-Car Gen2 RCAN clock support
clk: shmobile: Add R-Car Gen2 ADSP clock support
I don't see those patches queued in Mike Turquette's CCF tree.
How should they be handled, and do they need to be delayed to v3.21 ?
Signature · 3 lines
Regards, Laurent Pinchart
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
Hi Laurent,
Quoted 19 lines · Laurent Pinchart
Quoted 7 lines · On Friday 23 January 2015 13:23:04 Simon Horman wrote:
Quoted 6 lines · Simon Horman
Quoted 5 lines · Simon Horman
Quoted 4 lines · Geert Uytterhoeven
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
I've noticed you have dropped the following patches from your devel branch:
clk: shmobile: div6: Avoid changing divisor in .disable()
clk: shmobile: Add r8a7793 support
clk: shmobile: r8a7793: document CPG clock support
clk: shmobile: r8a73a4 common clock framework implementation
clk: shmobile: Add r8a73a4 SoC to MSTP bindings
clk: shmobile: Add R-Car Gen2 RCAN clock support
clk: shmobile: Add R-Car Gen2 ADSP clock support
Quoted 3 lines
I don't see those patches queued in Mike Turquette's CCF tree.
How should they be handled, and do they need to be delayed to v3.21 ?
I sent a pull request for these 4 days ago, cfr.
https://lkml.org/lkml/2015/1/19/391, but so far Mike hasn't pulled yet, or hasn't published his updated tree yet.
I still hope this will happen soon...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
cover ARM: shmobile: r8a73a4/ape6evm multiplatform
In reply to Laurent PinchartQuoted 61 lines · Laurent Pinchart
Hi Simon,
Quoted 41 lines · On Friday 23 January 2015 13:23:04 Simon Horman wrote:
Quoted 26 lines · Simon Horman
Quoted 25 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series transitions the r8a73a4/ape6evm platform to support multiplatform only:
- Add CCF information to DT,
- Disable legacy clock if CCF is used,
- Add Bus State Controller node, and move the Ethernet node to it,
- Remove ape6evm-reference,
- Remove ape6evm-legacy and legacy support code.Quoted 8 lines
This series is based on renesas-drivers-2015-01-19-v3.19-rc5. It depends on renesas-devel-20150119-v3.19-rc5 (code-wise) and clk-shmobile-for-3.20 (functionality-wise), for which I've sent a pull request to Mike Turquette yesterday.
All of this was untested by me due to lack of hardware.
As Mike had previously acked the r8a73a4 CCF implementation, it's safe to apply after testing.Hi Geert, Hi Ulrich,
thanks for all your good work in getting this together. I have tested this and queued it up for v3.21.
Quoted 7 lines
Quoted 3 lines
I plan to push it to my devel branch later today. I plan to push it to my next branch and thus linux-next once clk-shmobile-for-3.20 appears in a v3.20-rc.
For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next.
I have now had a chance to re-examine these patches and it seems to me that the first four patches of the series not depend on the BSC driver (or anything else). With that in mind I have queued them up in a new r8a73a4-ccf-for-v3.21 branch which is present in renesas-devel-20150123-v3.19-rc5.
Quoted 6 lines
Please take a moment to see if what I have done makes sense to you. In particular it would be nicer if these patches could go into 'regular' branches such as dt-for-v3.21 and soc-for-v3.21. However it seems to me that the SoC patch "ARM: shmobile: ape6evm: Disable legacy clock initialization" depends on the following two DT patche " "ARM: shmobile:
r8a73a4: Common clock framework DT description".I've noticed you have dropped the following patches from your devel branch:
clk: shmobile: div6: Avoid changing divisor in .disable()
clk: shmobile: Add r8a7793 support
clk: shmobile: r8a7793: document CPG clock support
clk: shmobile: r8a73a4 common clock framework implementation
clk: shmobile: Add r8a73a4 SoC to MSTP bindings
clk: shmobile: Add R-Car Gen2 RCAN clock support
clk: shmobile: Add R-Car Gen2 ADSP clock support
Quoted 3 lines
I don't see those patches queued in Mike Turquette's CCF tree.
How should they be handled, and do they need to be delayed to v3.21 ?
My understanding is that that Geert has sent a pull request to Mike for those. And that they are targeted at v3.21 via Mike's tree.
I was (perhaps) confusingly carrying that branch that Geert sent a pull request for in order to allow me to queue up all of the shmobile side of r8a73a4 multiplatform. My expectation was that the clk: shmobile changes would be in Linus's tree before I sent a pull request for the shmobile side of r8a73a4 multiplatform.
Using the same logic I should probably re-queue up the "clk: shmobile" changes in my devel branch. But perhaps its best to leave them out to avoid further confusion.