ARM: shmobile: r8a7779: Add clock index macros for DT sources
Subsystems (3)
PATCH 1/1 ARM: shmobile: r8a7779: Add clock index macros for DT sources
Add macros usable by device tree sources to reference r8a7779 clocks by index.
Based on work for the r8a7791 SoC by Laurent Pinchart.
--- include/dt-bindings/clock/r8a7779-clock.h | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7779-clock.h
Hi Mike,
as discussed elsewhere please consider this for v3.16. It resolves the build-breakage caused by 7b42a99 ("clk: shmobile: r8a7779: Add clocks support").
I have tested that this does resolve the build problem reported by Arnd by applying it on top of clk-next whose current head is 42dd880 ("Merge branch 'clk-fixes' into clk-next").
As I am a little unsure of how to enable ARCH_R8A7779 and ARCH_SHMOBILE_MULTI in clk-next I compiled it my modifying drivers/clk/shmobile/Makefile to compile the driver if ARCH_R8A7790 is set and then compiled using the shmobile_defconfig.
include/dt-bindings/clock/r8a7779-clock.h new file +64 -0
@@ -0,0 +1,64 @@ +/* +* Copyright (C) 2013 Horms Solutions Ltd. +* +* Contact: Simon Horman <[email protected]> +* +* 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_R8A7779_H__ +#define __DT_BINDINGS_CLOCK_R8A7779_H__ + +/* CPG */ +#define R8A7779_CLK_PLLA 0 +#define R8A7779_CLK_Z 1 +#define R8A7779_CLK_ZS 2 +#define R8A7779_CLK_S 3 +#define R8A7779_CLK_S1 4 +#define R8A7779_CLK_P 5 +#define R8A7779_CLK_B 6 +#define R8A7779_CLK_OUT 7 + +/* MSTP 0 */ +#define R8A7779_CLK_HSPI 7 +#define R8A7779_CLK_TMU2 14 +#define R8A7779_CLK_TMU1 15 +#define R8A7779_CLK_TMU0 16 +#define R8A7779_CLK_HSCIF1 18 +#define R8A7779_CLK_HSCIF0 19 +#define R8A7779_CLK_SCIF5 21 +#define R8A7779_CLK_SCIF4 22 +#define R8A7779_CLK_SCIF3 23 +#define R8A7779_CLK_SCIF2 24 +#define R8A7779_CLK_SCIF1 25 +#define R8A7779_CLK_SCIF0 26 +#define R8A7779_CLK_I2C3 27 +#define R8A7779_CLK_I2C2 28 +#define R8A7779_CLK_I2C1 29 +#define R8A7779_CLK_I2C0 30 + +/* MSTP 1 */ +#define R8A7779_CLK_USB01 0 +#define R8A7779_CLK_USB2 1 +#define R8A7779_CLK_DU 3 +#define R8A7779_CLK_VIN2 8 +#define R8A7779_CLK_VIN1 9 +#define R8A7779_CLK_VIN0 10 +#define R8A7779_CLK_ETHER 14 +#define R8A7779_CLK_SATA 15 +#define R8A7779_CLK_PCIE 16 +#define R8A7779_CLK_VIN3 20 + +/* MSTP 3 */ +#define R8A7779_CLK_SDHI3 20 +#define R8A7779_CLK_SDHI2 21 +#define R8A7779_CLK_SDHI1 22 +#define R8A7779_CLK_SDHI0 23 +#define R8A7779_CLK_MMC1 30 +#define R8A7779_CLK_MMC0 31 + + +#endif /* __DT_BINDINGS_CLOCK_R8A7779_H__ */
Signature · 1 line
1.8.5.2
PATCH 1/1 ARM: shmobile: r8a7779: Add clock index macros for DT sources
Quoting Simon Horman (2014-05-27 18:52:34)
Quoted 7 lines
Add macros usable by device tree sources to reference r8a7779 clocks by index.
Based on work for the r8a7791 SoC by Laurent Pinchart.
Acked-by Laurent Pinchart <[email protected]>Signed-off-by Simon Horman <[email protected]>
Thanks for the quick patch. Applied to clk-next.
Regards,
Mike
Quoted 94 lines
--- include/dt-bindings/clock/r8a7779-clock.h | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7779-clock.hHi Mike,
as discussed elsewhere please consider this for v3.16. It resolves the build-breakage caused by 7b42a99 ("clk: shmobile: r8a7779: Add clocks support").
I have tested that this does resolve the build problem reported by Arnd by applying it on top of clk-next whose current head is 42dd880 ("Merge branch 'clk-fixes' into clk-next").
As I am a little unsure of how to enable
ARCH_R8A7779andARCH_SHMOBILE_MULTIin clk-next I compiled it my modifyingdrivers/clk/shmobile/Makefileto compile the driver ifARCH_R8A7790is set and then compiled using theshmobile_defconfig.include/dt-bindings/clock/r8a7779-clock.h new file +64
-0@@ -0,0 +1,64 @@ +/* +* Copyright (C) 2013 Horms Solutions Ltd. +* +* Contact: Simon Horman <[email protected]> +* +* 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_R8A7779_H__ +#define __DT_BINDINGS_CLOCK_R8A7779_H__ + +/* CPG */ +#define R8A7779_CLK_PLLA 0 +#define R8A7779_CLK_Z 1 +#define R8A7779_CLK_ZS 2 +#define R8A7779_CLK_S 3 +#define R8A7779_CLK_S1 4 +#define R8A7779_CLK_P 5 +#define R8A7779_CLK_B 6 +#define R8A7779_CLK_OUT 7 + +/* MSTP 0 */ +#define R8A7779_CLK_HSPI 7 +#define R8A7779_CLK_TMU2 14 +#define R8A7779_CLK_TMU1 15 +#define R8A7779_CLK_TMU0 16 +#define R8A7779_CLK_HSCIF1 18 +#define R8A7779_CLK_HSCIF0 19 +#define R8A7779_CLK_SCIF5 21 +#define R8A7779_CLK_SCIF4 22 +#define R8A7779_CLK_SCIF3 23 +#define R8A7779_CLK_SCIF2 24 +#define R8A7779_CLK_SCIF1 25 +#define R8A7779_CLK_SCIF0 26 +#define R8A7779_CLK_I2C3 27 +#define R8A7779_CLK_I2C2 28 +#define R8A7779_CLK_I2C1 29 +#define R8A7779_CLK_I2C0 30 + +/* MSTP 1 */ +#define R8A7779_CLK_USB01 0 +#define R8A7779_CLK_USB2 1 +#define R8A7779_CLK_DU 3 +#define R8A7779_CLK_VIN2 8 +#define R8A7779_CLK_VIN1 9 +#define R8A7779_CLK_VIN0 10 +#define R8A7779_CLK_ETHER 14 +#define R8A7779_CLK_SATA 15 +#define R8A7779_CLK_PCIE 16 +#define R8A7779_CLK_VIN3 20 + +/* MSTP 3 */ +#define R8A7779_CLK_SDHI3 20 +#define R8A7779_CLK_SDHI2 21 +#define R8A7779_CLK_SDHI1 22 +#define R8A7779_CLK_SDHI0 23 +#define R8A7779_CLK_MMC1 30 +#define R8A7779_CLK_MMC0 31 + + +#endif /* __DT_BINDINGS_CLOCK_R8A7779_H__ */ Signature · 1 line
1.8.5.2