* [PATCH v2 00/08] ARM: shmobile: Rework include path V2
@ 2014-06-17 7:46 Magnus Damm
2014-06-17 7:47 ` [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm
` (9 more replies)
0 siblings, 10 replies; 12+ messages in thread
From: Magnus Damm @ 2014-06-17 7:46 UTC (permalink / raw)
To: linux-arm-kernel
ARM: shmobile: Rework include path V2
[PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage
[PATCH v2 02/08] ARM: shmobile: Move dma-register.h
[PATCH v2 03/08] ARM: shmobile: Move clock.h
[PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl
[PATCH v2 05/08] ARM: shmobile: Move common.h
[PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
[PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
[PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
Olof, here my latest take on the header move that you requested earlier.
This particular series hopefully follows your proposed way and moves the
most common shared header files for mach-shmobile from <mach/foobar.h>
to "foobar.h" without any workaround. Left are still per-SoC header files
that will be moved once I know you are comformatble with this format.
Please note that these are only lightly compile tested with a handful
of defconfigs, but any potential issue should be trivial to fix.
Also, there are certain bits of arch/arm/mach-shmobile/include/mach/
get included from places like arch/arm/boot/compressed/ (booting
legacy kernel directly from reset vector) and also from SoC specific
legacy code under drivers/pinctrl. My proposal is to keep those users
as-is until we phase out legacy board support (2-3 kernels?), let me
know if you would like to get rid of "include/mach" sooner!
Simon, can you please this pick up and include in your rebase to v3.16-rc1?
Changes since V1:
- rebased to v3.16-rc1
Thanks to Geert and Arnd for review support!
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 2
arch/arm/mach-shmobile/board-ape6evm.c | 4
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2
arch/arm/mach-shmobile/board-armadillo800eva.c | 6
arch/arm/mach-shmobile/board-bockw-reference.c | 2
arch/arm/mach-shmobile/board-bockw.c | 4
arch/arm/mach-shmobile/board-genmai-reference.c | 4
arch/arm/mach-shmobile/board-genmai.c | 4
arch/arm/mach-shmobile/board-koelsch-reference.c | 8
arch/arm/mach-shmobile/board-koelsch.c | 6
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2
arch/arm/mach-shmobile/board-kzm9g.c | 4
arch/arm/mach-shmobile/board-lager-reference.c | 8
arch/arm/mach-shmobile/board-lager.c | 5
arch/arm/mach-shmobile/board-mackerel.c | 10
arch/arm/mach-shmobile/board-marzen-reference.c | 4
arch/arm/mach-shmobile/board-marzen.c | 4
arch/arm/mach-shmobile/clock-r7s72100.c | 2
arch/arm/mach-shmobile/clock-r8a73a4.c | 4
arch/arm/mach-shmobile/clock-r8a7740.c | 4
arch/arm/mach-shmobile/clock-r8a7778.c | 4
arch/arm/mach-shmobile/clock-r8a7779.c | 4
arch/arm/mach-shmobile/clock-r8a7790.c | 5
arch/arm/mach-shmobile/clock-r8a7791.c | 6
arch/arm/mach-shmobile/clock-sh7372.c | 4
arch/arm/mach-shmobile/clock-sh73a0.c | 4
arch/arm/mach-shmobile/clock.c | 6
arch/arm/mach-shmobile/clock.h | 56 ++
arch/arm/mach-shmobile/common.h | 56 ++
arch/arm/mach-shmobile/console.c | 2
arch/arm/mach-shmobile/dma-register.h | 84 ++++
arch/arm/mach-shmobile/include/mach/clock.h | 56 --
arch/arm/mach-shmobile/include/mach/common.h | 56 --
arch/arm/mach-shmobile/include/mach/dma-register.h | 84 ----
arch/arm/mach-shmobile/include/mach/intc.h | 290 --------------
arch/arm/mach-shmobile/include/mach/irqs.h | 17
arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15
arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 63 ---
arch/arm/mach-shmobile/include/mach/r8a7740.h | 2
arch/arm/mach-shmobile/include/mach/r8a7779.h | 12
arch/arm/mach-shmobile/include/mach/r8a7790.h | 2
arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8
arch/arm/mach-shmobile/include/mach/sh7372.h | 4
arch/arm/mach-shmobile/intc-sh7372.c | 5
arch/arm/mach-shmobile/intc-sh73a0.c | 5
arch/arm/mach-shmobile/intc.h | 290 ++++++++++++++
arch/arm/mach-shmobile/irqs.h | 21 +
arch/arm/mach-shmobile/platsmp-apmu.c | 2
arch/arm/mach-shmobile/platsmp-scu.c | 2
arch/arm/mach-shmobile/platsmp.c | 2
arch/arm/mach-shmobile/pm-r8a7740.c | 4
arch/arm/mach-shmobile/pm-r8a7779.c | 15
arch/arm/mach-shmobile/pm-r8a7790.c | 2
arch/arm/mach-shmobile/pm-rcar.c | 2
arch/arm/mach-shmobile/pm-rcar.h | 15
arch/arm/mach-shmobile/pm-rmobile.c | 2
arch/arm/mach-shmobile/pm-rmobile.h | 63 +++
arch/arm/mach-shmobile/pm-sh7372.c | 4
arch/arm/mach-shmobile/pm-sh73a0.c | 2
arch/arm/mach-shmobile/rcar-gen2.h | 8
arch/arm/mach-shmobile/setup-emev2.c | 2
arch/arm/mach-shmobile/setup-r7s72100.c | 4
arch/arm/mach-shmobile/setup-r8a73a4.c | 6
arch/arm/mach-shmobile/setup-r8a7740.c | 8
arch/arm/mach-shmobile/setup-r8a7778.c | 4
arch/arm/mach-shmobile/setup-r8a7779.c | 4
arch/arm/mach-shmobile/setup-r8a7790.c | 7
arch/arm/mach-shmobile/setup-r8a7791.c | 6
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4
arch/arm/mach-shmobile/setup-sh7372.c | 8
arch/arm/mach-shmobile/setup-sh73a0.c | 7
arch/arm/mach-shmobile/smp-emev2.c | 2
arch/arm/mach-shmobile/smp-r8a7779.c | 4
arch/arm/mach-shmobile/smp-r8a7790.c | 4
arch/arm/mach-shmobile/smp-r8a7791.c | 4
arch/arm/mach-shmobile/smp-sh73a0.c | 2
76 files changed, 723 insertions(+), 726 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:47 ` [PATCH v2 02/08] ARM: shmobile: Move dma-register.h Magnus Damm ` (8 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of intc.h so it can be used as #include "intc.h" instead of the old style #include <mach/intc.h>. Also clean up some code to get rid of redundant #include <linux/sh_intc.h>. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-mackerel.c | 1 arch/arm/mach-shmobile/include/mach/intc.h | 290 ---------------------------- arch/arm/mach-shmobile/intc-sh7372.c | 3 arch/arm/mach-shmobile/intc-sh73a0.c | 3 arch/arm/mach-shmobile/intc.h | 290 ++++++++++++++++++++++++++++ arch/arm/mach-shmobile/setup-sh7372.c | 1 arch/arm/mach-shmobile/setup-sh73a0.c | 1 7 files changed, 292 insertions(+), 297 deletions(-) --- 0001/arch/arm/mach-shmobile/board-mackerel.c +++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 15:59:15.000000000 +0900 @@ -47,7 +47,6 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h> -#include <linux/sh_intc.h> #include <linux/tca6416_keypad.h> #include <linux/usb/renesas_usbhs.h> #include <linux/dma-mapping.h> --- 0001/arch/arm/mach-shmobile/include/mach/intc.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,290 +0,0 @@ -#ifndef __ASM_MACH_INTC_H -#define __ASM_MACH_INTC_H -#include <linux/sh_intc.h> - -#define INTC_IRQ_PINS_ENUM_16L(p) \ - p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ - p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7, \ - p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ - p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 - -#define INTC_IRQ_PINS_ENUM_16H(p) \ - p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ - p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23, \ - p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ - p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 - -#define INTC_IRQ_PINS_VECT_16L(p, vect) \ - vect(p ## _IRQ0, 0x0200), vect(p ## _IRQ1, 0x0220), \ - vect(p ## _IRQ2, 0x0240), vect(p ## _IRQ3, 0x0260), \ - vect(p ## _IRQ4, 0x0280), vect(p ## _IRQ5, 0x02a0), \ - vect(p ## _IRQ6, 0x02c0), vect(p ## _IRQ7, 0x02e0), \ - vect(p ## _IRQ8, 0x0300), vect(p ## _IRQ9, 0x0320), \ - vect(p ## _IRQ10, 0x0340), vect(p ## _IRQ11, 0x0360), \ - vect(p ## _IRQ12, 0x0380), vect(p ## _IRQ13, 0x03a0), \ - vect(p ## _IRQ14, 0x03c0), vect(p ## _IRQ15, 0x03e0) - -#define INTC_IRQ_PINS_VECT_16H(p, vect) \ - vect(p ## _IRQ16, 0x3200), vect(p ## _IRQ17, 0x3220), \ - vect(p ## _IRQ18, 0x3240), vect(p ## _IRQ19, 0x3260), \ - vect(p ## _IRQ20, 0x3280), vect(p ## _IRQ21, 0x32a0), \ - vect(p ## _IRQ22, 0x32c0), vect(p ## _IRQ23, 0x32e0), \ - vect(p ## _IRQ24, 0x3300), vect(p ## _IRQ25, 0x3320), \ - vect(p ## _IRQ26, 0x3340), vect(p ## _IRQ27, 0x3360), \ - vect(p ## _IRQ28, 0x3380), vect(p ## _IRQ29, 0x33a0), \ - vect(p ## _IRQ30, 0x33c0), vect(p ## _IRQ31, 0x33e0) - -#define INTC_IRQ_PINS_MASK_16L(p, base) \ - { base + 0x40, base + 0x60, 8, /* INTMSK00A / INTMSKCLR00A */ \ - { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ - p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ - { base + 0x44, base + 0x64, 8, /* INTMSK10A / INTMSKCLR10A */ \ - { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ - p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } - -#define INTC_IRQ_PINS_MASK_16H(p, base) \ - { base + 0x48, base + 0x68, 8, /* INTMSK20A / INTMSKCLR20A */ \ - { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ - p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ - { base + 0x4c, base + 0x6c, 8, /* INTMSK30A / INTMSKCLR30A */ \ - { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ - p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } - -#define INTC_IRQ_PINS_PRIO_16L(p, base) \ - { base + 0x10, 0, 32, 4, /* INTPRI00A */ \ - { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ - p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ - { base + 0x14, 0, 32, 4, /* INTPRI10A */ \ - { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ - p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } - -#define INTC_IRQ_PINS_PRIO_16H(p, base) \ - { base + 0x18, 0, 32, 4, /* INTPRI20A */ \ - { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ - p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ - { base + 0x1c, 0, 32, 4, /* INTPRI30A */ \ - { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ - p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } - -#define INTC_IRQ_PINS_SENSE_16L(p, base) \ - { base + 0x00, 32, 4, /* ICR1A */ \ - { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ - p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ - { base + 0x04, 32, 4, /* ICR2A */ \ - { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ - p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } - -#define INTC_IRQ_PINS_SENSE_16H(p, base) \ - { base + 0x08, 32, 4, /* ICR3A */ \ - { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ - p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ - { base + 0x0c, 32, 4, /* ICR4A */ \ - { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ - p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } - -#define INTC_IRQ_PINS_ACK_16L(p, base) \ - { base + 0x20, 0, 8, /* INTREQ00A */ \ - { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ - p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ - { base + 0x24, 0, 8, /* INTREQ10A */ \ - { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ - p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } - -#define INTC_IRQ_PINS_ACK_16H(p, base) \ - { base + 0x28, 0, 8, /* INTREQ20A */ \ - { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ - p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ - { base + 0x2c, 0, 8, /* INTREQ30A */ \ - { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ - p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } - -#define INTC_IRQ_PINS_16(p, base, vect, str) \ - \ -static struct resource p ## _resources[] __initdata = { \ - [0] = { \ - .start = base, \ - .end = base + 0x64, \ - .flags = IORESOURCE_MEM, \ - }, \ -}; \ - \ -enum { \ - p ## _UNUSED = 0, \ - INTC_IRQ_PINS_ENUM_16L(p), \ -}; \ - \ -static struct intc_vect p ## _vectors[] __initdata = { \ - INTC_IRQ_PINS_VECT_16L(p, vect), \ -}; \ - \ -static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ - INTC_IRQ_PINS_MASK_16L(p, base), \ -}; \ - \ -static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ - INTC_IRQ_PINS_PRIO_16L(p, base), \ -}; \ - \ -static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ - INTC_IRQ_PINS_SENSE_16L(p, base), \ -}; \ - \ -static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ - INTC_IRQ_PINS_ACK_16L(p, base), \ -}; \ - \ -static struct intc_desc p ## _desc __initdata = { \ - .name = str, \ - .resource = p ## _resources, \ - .num_resources = ARRAY_SIZE(p ## _resources), \ - .hw = INTC_HW_DESC(p ## _vectors, NULL, \ - p ## _mask_registers, p ## _prio_registers, \ - p ## _sense_registers, p ## _ack_registers) \ -} - -#define INTC_IRQ_PINS_16H(p, base, vect, str) \ - \ -static struct resource p ## _resources[] __initdata = { \ - [0] = { \ - .start = base, \ - .end = base + 0x64, \ - .flags = IORESOURCE_MEM, \ - }, \ -}; \ - \ -enum { \ - p ## _UNUSED = 0, \ - INTC_IRQ_PINS_ENUM_16H(p), \ -}; \ - \ -static struct intc_vect p ## _vectors[] __initdata = { \ - INTC_IRQ_PINS_VECT_16H(p, vect), \ -}; \ - \ -static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ - INTC_IRQ_PINS_MASK_16H(p, base), \ -}; \ - \ -static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ - INTC_IRQ_PINS_PRIO_16H(p, base), \ -}; \ - \ -static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ - INTC_IRQ_PINS_SENSE_16H(p, base), \ -}; \ - \ -static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ - INTC_IRQ_PINS_ACK_16H(p, base), \ -}; \ - \ -static struct intc_desc p ## _desc __initdata = { \ - .name = str, \ - .resource = p ## _resources, \ - .num_resources = ARRAY_SIZE(p ## _resources), \ - .hw = INTC_HW_DESC(p ## _vectors, NULL, \ - p ## _mask_registers, p ## _prio_registers, \ - p ## _sense_registers, p ## _ack_registers) \ -} - -#define INTC_IRQ_PINS_32(p, base, vect, str) \ - \ -static struct resource p ## _resources[] __initdata = { \ - [0] = { \ - .start = base, \ - .end = base + 0x6c, \ - .flags = IORESOURCE_MEM, \ - }, \ -}; \ - \ -enum { \ - p ## _UNUSED = 0, \ - INTC_IRQ_PINS_ENUM_16L(p), \ - INTC_IRQ_PINS_ENUM_16H(p), \ -}; \ - \ -static struct intc_vect p ## _vectors[] __initdata = { \ - INTC_IRQ_PINS_VECT_16L(p, vect), \ - INTC_IRQ_PINS_VECT_16H(p, vect), \ -}; \ - \ -static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ - INTC_IRQ_PINS_MASK_16L(p, base), \ - INTC_IRQ_PINS_MASK_16H(p, base), \ -}; \ - \ -static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ - INTC_IRQ_PINS_PRIO_16L(p, base), \ - INTC_IRQ_PINS_PRIO_16H(p, base), \ -}; \ - \ -static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ - INTC_IRQ_PINS_SENSE_16L(p, base), \ - INTC_IRQ_PINS_SENSE_16H(p, base), \ -}; \ - \ -static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ - INTC_IRQ_PINS_ACK_16L(p, base), \ - INTC_IRQ_PINS_ACK_16H(p, base), \ -}; \ - \ -static struct intc_desc p ## _desc __initdata = { \ - .name = str, \ - .resource = p ## _resources, \ - .num_resources = ARRAY_SIZE(p ## _resources), \ - .hw = INTC_HW_DESC(p ## _vectors, NULL, \ - p ## _mask_registers, p ## _prio_registers, \ - p ## _sense_registers, p ## _ack_registers) \ -} - -#define INTC_PINT_E_EMPTY -#define INTC_PINT_E_NONE 0, 0, 0, 0, 0, 0, 0, 0, -#define INTC_PINT_E(p) \ - PINT ## p ## 0, PINT ## p ## 1, PINT ## p ## 2, PINT ## p ## 3, \ - PINT ## p ## 4, PINT ## p ## 5, PINT ## p ## 6, PINT ## p ## 7, - -#define INTC_PINT_V_NONE -#define INTC_PINT_V(p, vect) \ - vect(PINT ## p ## 0, 0), vect(PINT ## p ## 1, 1), \ - vect(PINT ## p ## 2, 2), vect(PINT ## p ## 3, 3), \ - vect(PINT ## p ## 4, 4), vect(PINT ## p ## 5, 5), \ - vect(PINT ## p ## 6, 6), vect(PINT ## p ## 7, 7), - -#define INTC_PINT(p, mask_reg, sense_base, str, \ - enums_1, enums_2, enums_3, enums_4, \ - vect_1, vect_2, vect_3, vect_4, \ - mask_a, mask_b, mask_c, mask_d, \ - sense_a, sense_b, sense_c, sense_d) \ - \ -enum { \ - PINT ## p ## _UNUSED = 0, \ - enums_1 enums_2 enums_3 enums_4 \ -}; \ - \ -static struct intc_vect p ## _vectors[] __initdata = { \ - vect_1 vect_2 vect_3 vect_4 \ -}; \ - \ -static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ - { mask_reg, 0, 32, /* PINTER */ \ - { mask_a mask_b mask_c mask_d } } \ -}; \ - \ -static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ - { sense_base + 0x00, 16, 2, /* PINTCR */ \ - { sense_a } }, \ - { sense_base + 0x04, 16, 2, /* PINTCR */ \ - { sense_b } }, \ - { sense_base + 0x08, 16, 2, /* PINTCR */ \ - { sense_c } }, \ - { sense_base + 0x0c, 16, 2, /* PINTCR */ \ - { sense_d } }, \ -}; \ - \ -static struct intc_desc p ## _desc __initdata = { \ - .name = str, \ - .hw = INTC_HW_DESC(p ## _vectors, NULL, \ - p ## _mask_registers, NULL, \ - p ## _sense_registers, NULL), \ -} - -#endif /* __ASM_MACH_INTC_H */ --- 0001/arch/arm/mach-shmobile/intc-sh7372.c +++ work/arch/arm/mach-shmobile/intc-sh7372.c 2014-06-17 15:59:15.000000000 +0900 @@ -22,11 +22,10 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/io.h> -#include <linux/sh_intc.h> -#include <mach/intc.h> #include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "intc.h" enum { UNUSED_INTCA = 0, --- 0001/arch/arm/mach-shmobile/intc-sh73a0.c +++ work/arch/arm/mach-shmobile/intc-sh73a0.c 2014-06-17 15:59:15.000000000 +0900 @@ -22,14 +22,13 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/io.h> -#include <linux/sh_intc.h> #include <linux/irqchip.h> #include <linux/irqchip/arm-gic.h> -#include <mach/intc.h> #include <mach/irqs.h> #include <mach/sh73a0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "intc.h" enum { UNUSED = 0, --- /dev/null +++ work/arch/arm/mach-shmobile/intc.h 2014-06-17 15:59:16.000000000 +0900 @@ -0,0 +1,290 @@ +#ifndef __ASM_MACH_INTC_H +#define __ASM_MACH_INTC_H +#include <linux/sh_intc.h> + +#define INTC_IRQ_PINS_ENUM_16L(p) \ + p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ + p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7, \ + p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ + p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 + +#define INTC_IRQ_PINS_ENUM_16H(p) \ + p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ + p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23, \ + p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ + p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 + +#define INTC_IRQ_PINS_VECT_16L(p, vect) \ + vect(p ## _IRQ0, 0x0200), vect(p ## _IRQ1, 0x0220), \ + vect(p ## _IRQ2, 0x0240), vect(p ## _IRQ3, 0x0260), \ + vect(p ## _IRQ4, 0x0280), vect(p ## _IRQ5, 0x02a0), \ + vect(p ## _IRQ6, 0x02c0), vect(p ## _IRQ7, 0x02e0), \ + vect(p ## _IRQ8, 0x0300), vect(p ## _IRQ9, 0x0320), \ + vect(p ## _IRQ10, 0x0340), vect(p ## _IRQ11, 0x0360), \ + vect(p ## _IRQ12, 0x0380), vect(p ## _IRQ13, 0x03a0), \ + vect(p ## _IRQ14, 0x03c0), vect(p ## _IRQ15, 0x03e0) + +#define INTC_IRQ_PINS_VECT_16H(p, vect) \ + vect(p ## _IRQ16, 0x3200), vect(p ## _IRQ17, 0x3220), \ + vect(p ## _IRQ18, 0x3240), vect(p ## _IRQ19, 0x3260), \ + vect(p ## _IRQ20, 0x3280), vect(p ## _IRQ21, 0x32a0), \ + vect(p ## _IRQ22, 0x32c0), vect(p ## _IRQ23, 0x32e0), \ + vect(p ## _IRQ24, 0x3300), vect(p ## _IRQ25, 0x3320), \ + vect(p ## _IRQ26, 0x3340), vect(p ## _IRQ27, 0x3360), \ + vect(p ## _IRQ28, 0x3380), vect(p ## _IRQ29, 0x33a0), \ + vect(p ## _IRQ30, 0x33c0), vect(p ## _IRQ31, 0x33e0) + +#define INTC_IRQ_PINS_MASK_16L(p, base) \ + { base + 0x40, base + 0x60, 8, /* INTMSK00A / INTMSKCLR00A */ \ + { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ + p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ + { base + 0x44, base + 0x64, 8, /* INTMSK10A / INTMSKCLR10A */ \ + { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ + p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } + +#define INTC_IRQ_PINS_MASK_16H(p, base) \ + { base + 0x48, base + 0x68, 8, /* INTMSK20A / INTMSKCLR20A */ \ + { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ + p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ + { base + 0x4c, base + 0x6c, 8, /* INTMSK30A / INTMSKCLR30A */ \ + { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ + p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } + +#define INTC_IRQ_PINS_PRIO_16L(p, base) \ + { base + 0x10, 0, 32, 4, /* INTPRI00A */ \ + { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ + p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ + { base + 0x14, 0, 32, 4, /* INTPRI10A */ \ + { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ + p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } + +#define INTC_IRQ_PINS_PRIO_16H(p, base) \ + { base + 0x18, 0, 32, 4, /* INTPRI20A */ \ + { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ + p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ + { base + 0x1c, 0, 32, 4, /* INTPRI30A */ \ + { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ + p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } + +#define INTC_IRQ_PINS_SENSE_16L(p, base) \ + { base + 0x00, 32, 4, /* ICR1A */ \ + { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ + p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ + { base + 0x04, 32, 4, /* ICR2A */ \ + { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ + p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } + +#define INTC_IRQ_PINS_SENSE_16H(p, base) \ + { base + 0x08, 32, 4, /* ICR3A */ \ + { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ + p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ + { base + 0x0c, 32, 4, /* ICR4A */ \ + { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ + p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } + +#define INTC_IRQ_PINS_ACK_16L(p, base) \ + { base + 0x20, 0, 8, /* INTREQ00A */ \ + { p ## _IRQ0, p ## _IRQ1, p ## _IRQ2, p ## _IRQ3, \ + p ## _IRQ4, p ## _IRQ5, p ## _IRQ6, p ## _IRQ7 } }, \ + { base + 0x24, 0, 8, /* INTREQ10A */ \ + { p ## _IRQ8, p ## _IRQ9, p ## _IRQ10, p ## _IRQ11, \ + p ## _IRQ12, p ## _IRQ13, p ## _IRQ14, p ## _IRQ15 } } + +#define INTC_IRQ_PINS_ACK_16H(p, base) \ + { base + 0x28, 0, 8, /* INTREQ20A */ \ + { p ## _IRQ16, p ## _IRQ17, p ## _IRQ18, p ## _IRQ19, \ + p ## _IRQ20, p ## _IRQ21, p ## _IRQ22, p ## _IRQ23 } }, \ + { base + 0x2c, 0, 8, /* INTREQ30A */ \ + { p ## _IRQ24, p ## _IRQ25, p ## _IRQ26, p ## _IRQ27, \ + p ## _IRQ28, p ## _IRQ29, p ## _IRQ30, p ## _IRQ31 } } + +#define INTC_IRQ_PINS_16(p, base, vect, str) \ + \ +static struct resource p ## _resources[] __initdata = { \ + [0] = { \ + .start = base, \ + .end = base + 0x64, \ + .flags = IORESOURCE_MEM, \ + }, \ +}; \ + \ +enum { \ + p ## _UNUSED = 0, \ + INTC_IRQ_PINS_ENUM_16L(p), \ +}; \ + \ +static struct intc_vect p ## _vectors[] __initdata = { \ + INTC_IRQ_PINS_VECT_16L(p, vect), \ +}; \ + \ +static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ + INTC_IRQ_PINS_MASK_16L(p, base), \ +}; \ + \ +static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ + INTC_IRQ_PINS_PRIO_16L(p, base), \ +}; \ + \ +static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ + INTC_IRQ_PINS_SENSE_16L(p, base), \ +}; \ + \ +static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ + INTC_IRQ_PINS_ACK_16L(p, base), \ +}; \ + \ +static struct intc_desc p ## _desc __initdata = { \ + .name = str, \ + .resource = p ## _resources, \ + .num_resources = ARRAY_SIZE(p ## _resources), \ + .hw = INTC_HW_DESC(p ## _vectors, NULL, \ + p ## _mask_registers, p ## _prio_registers, \ + p ## _sense_registers, p ## _ack_registers) \ +} + +#define INTC_IRQ_PINS_16H(p, base, vect, str) \ + \ +static struct resource p ## _resources[] __initdata = { \ + [0] = { \ + .start = base, \ + .end = base + 0x64, \ + .flags = IORESOURCE_MEM, \ + }, \ +}; \ + \ +enum { \ + p ## _UNUSED = 0, \ + INTC_IRQ_PINS_ENUM_16H(p), \ +}; \ + \ +static struct intc_vect p ## _vectors[] __initdata = { \ + INTC_IRQ_PINS_VECT_16H(p, vect), \ +}; \ + \ +static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ + INTC_IRQ_PINS_MASK_16H(p, base), \ +}; \ + \ +static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ + INTC_IRQ_PINS_PRIO_16H(p, base), \ +}; \ + \ +static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ + INTC_IRQ_PINS_SENSE_16H(p, base), \ +}; \ + \ +static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ + INTC_IRQ_PINS_ACK_16H(p, base), \ +}; \ + \ +static struct intc_desc p ## _desc __initdata = { \ + .name = str, \ + .resource = p ## _resources, \ + .num_resources = ARRAY_SIZE(p ## _resources), \ + .hw = INTC_HW_DESC(p ## _vectors, NULL, \ + p ## _mask_registers, p ## _prio_registers, \ + p ## _sense_registers, p ## _ack_registers) \ +} + +#define INTC_IRQ_PINS_32(p, base, vect, str) \ + \ +static struct resource p ## _resources[] __initdata = { \ + [0] = { \ + .start = base, \ + .end = base + 0x6c, \ + .flags = IORESOURCE_MEM, \ + }, \ +}; \ + \ +enum { \ + p ## _UNUSED = 0, \ + INTC_IRQ_PINS_ENUM_16L(p), \ + INTC_IRQ_PINS_ENUM_16H(p), \ +}; \ + \ +static struct intc_vect p ## _vectors[] __initdata = { \ + INTC_IRQ_PINS_VECT_16L(p, vect), \ + INTC_IRQ_PINS_VECT_16H(p, vect), \ +}; \ + \ +static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ + INTC_IRQ_PINS_MASK_16L(p, base), \ + INTC_IRQ_PINS_MASK_16H(p, base), \ +}; \ + \ +static struct intc_prio_reg p ## _prio_registers[] __initdata = { \ + INTC_IRQ_PINS_PRIO_16L(p, base), \ + INTC_IRQ_PINS_PRIO_16H(p, base), \ +}; \ + \ +static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ + INTC_IRQ_PINS_SENSE_16L(p, base), \ + INTC_IRQ_PINS_SENSE_16H(p, base), \ +}; \ + \ +static struct intc_mask_reg p ## _ack_registers[] __initdata = { \ + INTC_IRQ_PINS_ACK_16L(p, base), \ + INTC_IRQ_PINS_ACK_16H(p, base), \ +}; \ + \ +static struct intc_desc p ## _desc __initdata = { \ + .name = str, \ + .resource = p ## _resources, \ + .num_resources = ARRAY_SIZE(p ## _resources), \ + .hw = INTC_HW_DESC(p ## _vectors, NULL, \ + p ## _mask_registers, p ## _prio_registers, \ + p ## _sense_registers, p ## _ack_registers) \ +} + +#define INTC_PINT_E_EMPTY +#define INTC_PINT_E_NONE 0, 0, 0, 0, 0, 0, 0, 0, +#define INTC_PINT_E(p) \ + PINT ## p ## 0, PINT ## p ## 1, PINT ## p ## 2, PINT ## p ## 3, \ + PINT ## p ## 4, PINT ## p ## 5, PINT ## p ## 6, PINT ## p ## 7, + +#define INTC_PINT_V_NONE +#define INTC_PINT_V(p, vect) \ + vect(PINT ## p ## 0, 0), vect(PINT ## p ## 1, 1), \ + vect(PINT ## p ## 2, 2), vect(PINT ## p ## 3, 3), \ + vect(PINT ## p ## 4, 4), vect(PINT ## p ## 5, 5), \ + vect(PINT ## p ## 6, 6), vect(PINT ## p ## 7, 7), + +#define INTC_PINT(p, mask_reg, sense_base, str, \ + enums_1, enums_2, enums_3, enums_4, \ + vect_1, vect_2, vect_3, vect_4, \ + mask_a, mask_b, mask_c, mask_d, \ + sense_a, sense_b, sense_c, sense_d) \ + \ +enum { \ + PINT ## p ## _UNUSED = 0, \ + enums_1 enums_2 enums_3 enums_4 \ +}; \ + \ +static struct intc_vect p ## _vectors[] __initdata = { \ + vect_1 vect_2 vect_3 vect_4 \ +}; \ + \ +static struct intc_mask_reg p ## _mask_registers[] __initdata = { \ + { mask_reg, 0, 32, /* PINTER */ \ + { mask_a mask_b mask_c mask_d } } \ +}; \ + \ +static struct intc_sense_reg p ## _sense_registers[] __initdata = { \ + { sense_base + 0x00, 16, 2, /* PINTCR */ \ + { sense_a } }, \ + { sense_base + 0x04, 16, 2, /* PINTCR */ \ + { sense_b } }, \ + { sense_base + 0x08, 16, 2, /* PINTCR */ \ + { sense_c } }, \ + { sense_base + 0x0c, 16, 2, /* PINTCR */ \ + { sense_d } }, \ +}; \ + \ +static struct intc_desc p ## _desc __initdata = { \ + .name = str, \ + .hw = INTC_HW_DESC(p ## _vectors, NULL, \ + p ## _mask_registers, NULL, \ + p ## _sense_registers, NULL), \ +} + +#endif /* __ASM_MACH_INTC_H */ --- 0001/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 15:59:15.000000000 +0900 @@ -29,7 +29,6 @@ #include <linux/io.h> #include <linux/serial_sci.h> #include <linux/sh_dma.h> -#include <linux/sh_intc.h> #include <linux/sh_timer.h> #include <linux/pm_domain.h> #include <linux/dma-mapping.h> --- 0001/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 15:59:15.000000000 +0900 @@ -29,7 +29,6 @@ #include <linux/io.h> #include <linux/serial_sci.h> #include <linux/sh_dma.h> -#include <linux/sh_intc.h> #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 02/08] ARM: shmobile: Move dma-register.h 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm 2014-06-17 7:47 ` [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:47 ` [PATCH v2 03/08] ARM: shmobile: Move clock.h Magnus Damm ` (7 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of dma-register.h so it can be used as #include "dma-register.h" instead of the old style #include <mach/dma-register.h>. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/dma-register.h | 84 ++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/dma-register.h | 84 -------------------- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 arch/arm/mach-shmobile/setup-r8a7740.c | 2 arch/arm/mach-shmobile/setup-r8a7790.c | 2 arch/arm/mach-shmobile/setup-sh7372.c | 2 arch/arm/mach-shmobile/setup-sh73a0.c | 2 7 files changed, 89 insertions(+), 89 deletions(-) --- /dev/null +++ work/arch/arm/mach-shmobile/dma-register.h 2014-06-17 16:00:26.000000000 +0900 @@ -0,0 +1,84 @@ +/* + * SH-ARM CPU-specific DMA definitions, used by both DMA drivers + * + * Copyright (C) 2012 Renesas Solutions Corp + * + * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> + * + * Based on arch/sh/include/cpu-sh4/cpu/dma-register.h + * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef DMA_REGISTER_H +#define DMA_REGISTER_H + +/* + * Direct Memory Access Controller + */ + +/* Transmit sizes and respective CHCR register values */ +enum { + XMIT_SZ_8BIT = 0, + XMIT_SZ_16BIT = 1, + XMIT_SZ_32BIT = 2, + XMIT_SZ_64BIT = 7, + XMIT_SZ_128BIT = 3, + XMIT_SZ_256BIT = 4, + XMIT_SZ_512BIT = 5, +}; + +/* log2(size / 8) - used to calculate number of transfers */ +static const unsigned int dma_ts_shift[] = { + [XMIT_SZ_8BIT] = 0, + [XMIT_SZ_16BIT] = 1, + [XMIT_SZ_32BIT] = 2, + [XMIT_SZ_64BIT] = 3, + [XMIT_SZ_128BIT] = 4, + [XMIT_SZ_256BIT] = 5, + [XMIT_SZ_512BIT] = 6, +}; + +#define TS_LOW_BIT 0x3 /* --xx */ +#define TS_HI_BIT 0xc /* xx-- */ + +#define TS_LOW_SHIFT (3) +#define TS_HI_SHIFT (20 - 2) /* 2 bits for shifted low TS */ + +#define TS_INDEX2VAL(i) \ + ((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\ + (((i) & TS_HI_BIT) << TS_HI_SHIFT)) + +#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz))) +#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz))) + + +/* + * USB High-Speed DMAC + */ +/* Transmit sizes and respective CHCR register values */ +enum { + USBTS_XMIT_SZ_8BYTE = 0, + USBTS_XMIT_SZ_16BYTE = 1, + USBTS_XMIT_SZ_32BYTE = 2, +}; + +/* log2(size / 8) - used to calculate number of transfers */ +static const unsigned int dma_usbts_shift[] = { + [USBTS_XMIT_SZ_8BYTE] = 3, + [USBTS_XMIT_SZ_16BYTE] = 4, + [USBTS_XMIT_SZ_32BYTE] = 5, +}; + +#define USBTS_LOW_BIT 0x3 /* --xx */ +#define USBTS_HI_BIT 0x0 /* ---- */ + +#define USBTS_LOW_SHIFT 6 +#define USBTS_HI_SHIFT 0 + +#define USBTS_INDEX2VAL(i) (((i) & 3) << 6) + +#endif /* DMA_REGISTER_H */ --- 0001/arch/arm/mach-shmobile/include/mach/dma-register.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,84 +0,0 @@ -/* - * SH-ARM CPU-specific DMA definitions, used by both DMA drivers - * - * Copyright (C) 2012 Renesas Solutions Corp - * - * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> - * - * Based on arch/sh/include/cpu-sh4/cpu/dma-register.h - * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef DMA_REGISTER_H -#define DMA_REGISTER_H - -/* - * Direct Memory Access Controller - */ - -/* Transmit sizes and respective CHCR register values */ -enum { - XMIT_SZ_8BIT = 0, - XMIT_SZ_16BIT = 1, - XMIT_SZ_32BIT = 2, - XMIT_SZ_64BIT = 7, - XMIT_SZ_128BIT = 3, - XMIT_SZ_256BIT = 4, - XMIT_SZ_512BIT = 5, -}; - -/* log2(size / 8) - used to calculate number of transfers */ -static const unsigned int dma_ts_shift[] = { - [XMIT_SZ_8BIT] = 0, - [XMIT_SZ_16BIT] = 1, - [XMIT_SZ_32BIT] = 2, - [XMIT_SZ_64BIT] = 3, - [XMIT_SZ_128BIT] = 4, - [XMIT_SZ_256BIT] = 5, - [XMIT_SZ_512BIT] = 6, -}; - -#define TS_LOW_BIT 0x3 /* --xx */ -#define TS_HI_BIT 0xc /* xx-- */ - -#define TS_LOW_SHIFT (3) -#define TS_HI_SHIFT (20 - 2) /* 2 bits for shifted low TS */ - -#define TS_INDEX2VAL(i) \ - ((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\ - (((i) & TS_HI_BIT) << TS_HI_SHIFT)) - -#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz))) -#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz))) - - -/* - * USB High-Speed DMAC - */ -/* Transmit sizes and respective CHCR register values */ -enum { - USBTS_XMIT_SZ_8BYTE = 0, - USBTS_XMIT_SZ_16BYTE = 1, - USBTS_XMIT_SZ_32BYTE = 2, -}; - -/* log2(size / 8) - used to calculate number of transfers */ -static const unsigned int dma_usbts_shift[] = { - [USBTS_XMIT_SZ_8BYTE] = 3, - [USBTS_XMIT_SZ_16BYTE] = 4, - [USBTS_XMIT_SZ_32BYTE] = 5, -}; - -#define USBTS_LOW_BIT 0x3 /* --xx */ -#define USBTS_HI_BIT 0x0 /* ---- */ - -#define USBTS_LOW_SHIFT 6 -#define USBTS_HI_SHIFT 0 - -#define USBTS_INDEX2VAL(i) (((i) & 3) << 6) - -#endif /* DMA_REGISTER_H */ --- 0001/arch/arm/mach-shmobile/setup-r8a73a4.c +++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-06-17 16:00:25.000000000 +0900 @@ -25,10 +25,10 @@ #include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/dma-register.h> #include <mach/irqs.h> #include <mach/r8a73a4.h> #include <asm/mach/arch.h> +#include "dma-register.h" static const struct resource pfc_resources[] = { DEFINE_RES_MEM(0xe6050000, 0x9000), --- 0001/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:00:25.000000000 +0900 @@ -31,7 +31,6 @@ #include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> -#include <mach/dma-register.h> #include <mach/r8a7740.h> #include <mach/pm-rmobile.h> #include <mach/common.h> @@ -40,6 +39,7 @@ #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "dma-register.h" static struct map_desc r8a7740_io_desc[] __initdata = { /* --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:00:25.000000000 +0900 @@ -27,10 +27,10 @@ #include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/dma-register.h> #include <mach/irqs.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> +#include "dma-register.h" /* Audio-DMAC */ #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ --- 0002/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:00:25.000000000 +0900 @@ -33,7 +33,6 @@ #include <linux/pm_domain.h> #include <linux/dma-mapping.h> #include <linux/platform_data/sh_ipmmu.h> -#include <mach/dma-register.h> #include <mach/irqs.h> #include <mach/sh7372.h> #include <mach/common.h> @@ -41,6 +40,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "dma-register.h" static struct map_desc sh7372_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx --- 0002/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 16:00:25.000000000 +0900 @@ -32,7 +32,6 @@ #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> -#include <mach/dma-register.h> #include <mach/irqs.h> #include <mach/sh73a0.h> #include <mach/common.h> @@ -40,6 +39,7 @@ #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "dma-register.h" static struct map_desc sh73a0_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 03/08] ARM: shmobile: Move clock.h 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm 2014-06-17 7:47 ` [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm 2014-06-17 7:47 ` [PATCH v2 02/08] ARM: shmobile: Move dma-register.h Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:47 ` [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm ` (6 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of clock.h so it can be used as #include "clock.h" instead of the old style #include <mach/clock.h>. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-genmai-reference.c | 2 arch/arm/mach-shmobile/board-koelsch-reference.c | 2 arch/arm/mach-shmobile/board-lager-reference.c | 2 arch/arm/mach-shmobile/clock-r8a73a4.c | 2 arch/arm/mach-shmobile/clock-r8a7740.c | 2 arch/arm/mach-shmobile/clock-r8a7778.c | 2 arch/arm/mach-shmobile/clock-r8a7779.c | 2 arch/arm/mach-shmobile/clock-r8a7790.c | 2 arch/arm/mach-shmobile/clock-r8a7791.c | 2 arch/arm/mach-shmobile/clock-sh7372.c | 2 arch/arm/mach-shmobile/clock-sh73a0.c | 2 arch/arm/mach-shmobile/clock.c | 4 - arch/arm/mach-shmobile/clock.h | 56 ++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/clock.h | 56 ---------------------- 14 files changed, 69 insertions(+), 69 deletions(-) --- 0001/arch/arm/mach-shmobile/board-genmai-reference.c +++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-06-17 16:01:17.000000000 +0900 @@ -20,11 +20,11 @@ #include <linux/kernel.h> #include <linux/of_platform.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/r7s72100.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "clock.h" /* * This is a really crude hack to provide clkdev support to platform --- 0001/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:01:17.000000000 +0900 @@ -23,12 +23,12 @@ #include <linux/kernel.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/irqs.h> #include <mach/rcar-gen2.h> #include <mach/r8a7791.h> #include <asm/mach/arch.h> +#include "clock.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:01:17.000000000 +0900 @@ -22,12 +22,12 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/irqs.h> #include <mach/rcar-gen2.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> +#include "clock.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/clock-r8a73a4.c +++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-06-17 16:01:17.000000000 +0900 @@ -22,8 +22,8 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" #define CPG_BASE 0xe6150000 #define CPG_LEN 0x270 --- 0001/arch/arm/mach-shmobile/clock-r8a7740.c +++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-06-17 16:01:17.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/r8a7740.h> +#include "clock.h" /* * | MDx | XTAL1/EXTAL1 | System | EXTALR | --- 0001/arch/arm/mach-shmobile/clock-r8a7778.c +++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-06-17 16:01:17.000000000 +0900 @@ -39,8 +39,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" #define MSTPCR0 IOMEM(0xffc80030) #define MSTPCR1 IOMEM(0xffc80034) --- 0001/arch/arm/mach-shmobile/clock-r8a7779.c +++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-06-17 16:02:28.000000000 +0900 @@ -23,8 +23,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" /* * MD1 = 1 MD1 = 0 --- 0001/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:01:17.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/r8a7790.h> +#include "clock.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:01:17.000000000 +0900 @@ -23,9 +23,9 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/rcar-gen2.h> +#include "clock.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/clock-sh7372.c +++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-06-17 16:01:17.000000000 +0900 @@ -21,8 +21,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" /* SH7372 registers */ #define FRQCRA IOMEM(0xe6150000) --- 0001/arch/arm/mach-shmobile/clock-sh73a0.c +++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-06-17 16:01:17.000000000 +0900 @@ -22,8 +22,8 @@ #include <linux/sh_clk.h> #include <linux/clkdev.h> #include <asm/processor.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" #define FRQCRA IOMEM(0xe6150000) #define FRQCRB IOMEM(0xe6150004) --- 0001/arch/arm/mach-shmobile/clock.c +++ work/arch/arm/mach-shmobile/clock.c 2014-06-17 16:01:17.000000000 +0900 @@ -25,7 +25,7 @@ #ifdef CONFIG_COMMON_CLK #include <linux/clk.h> #include <linux/clkdev.h> -#include <mach/clock.h> +#include "clock.h" void __init shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, bool enable) @@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons #else /* CONFIG_COMMON_CLK */ #include <linux/sh_clk.h> #include <linux/export.h> -#include <mach/clock.h> #include <mach/common.h> +#include "clock.h" unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk) { --- /dev/null +++ work/arch/arm/mach-shmobile/clock.h 2014-06-17 16:01:17.000000000 +0900 @@ -0,0 +1,56 @@ +#ifndef CLOCK_H +#define CLOCK_H + +#ifdef CONFIG_COMMON_CLK +/* temporary clock configuration helper for platform devices */ + +struct clk_name { + const char *clk; + const char *con_id; + const char *dev_id; +}; + +void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, + bool enable); + +#else /* CONFIG_COMMON_CLK */ +/* legacy clock implementation */ + +struct clk; +unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk); +extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops; + +/* clock ratio */ +struct clk_ratio { + int mul; + int div; +}; + +#define SH_CLK_RATIO(name, m, d) \ +static struct clk_ratio name ##_ratio = { \ + .mul = m, \ + .div = d, \ +} + +#define SH_FIXED_RATIO_CLKg(name, p, r) \ +struct clk name = { \ + .parent = &p, \ + .ops = &shmobile_fixed_ratio_clk_ops,\ + .priv = &r ## _ratio, \ +} + +#define SH_FIXED_RATIO_CLK(name, p, r) \ +static SH_FIXED_RATIO_CLKg(name, p, r) + +#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \ + SH_CLK_RATIO(name, m, d); \ + SH_FIXED_RATIO_CLK(name, p, name) + +#define SH_CLK_SET_RATIO(p, m, d) \ +do { \ + (p)->mul = m; \ + (p)->div = d; \ +} while (0) + +#endif /* CONFIG_COMMON_CLK */ +#endif --- 0001/arch/arm/mach-shmobile/include/mach/clock.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,56 +0,0 @@ -#ifndef CLOCK_H -#define CLOCK_H - -#ifdef CONFIG_COMMON_CLK -/* temporary clock configuration helper for platform devices */ - -struct clk_name { - const char *clk; - const char *con_id; - const char *dev_id; -}; - -void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, - bool enable); - -#else /* CONFIG_COMMON_CLK */ -/* legacy clock implementation */ - -struct clk; -unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk); -extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops; - -/* clock ratio */ -struct clk_ratio { - int mul; - int div; -}; - -#define SH_CLK_RATIO(name, m, d) \ -static struct clk_ratio name ##_ratio = { \ - .mul = m, \ - .div = d, \ -} - -#define SH_FIXED_RATIO_CLKg(name, p, r) \ -struct clk name = { \ - .parent = &p, \ - .ops = &shmobile_fixed_ratio_clk_ops,\ - .priv = &r ## _ratio, \ -} - -#define SH_FIXED_RATIO_CLK(name, p, r) \ -static SH_FIXED_RATIO_CLKg(name, p, r) - -#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \ - SH_CLK_RATIO(name, m, d); \ - SH_FIXED_RATIO_CLK(name, p, name) - -#define SH_CLK_SET_RATIO(p, m, d) \ -do { \ - (p)->mul = m; \ - (p)->div = d; \ -} while (0) - -#endif /* CONFIG_COMMON_CLK */ -#endif ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (2 preceding siblings ...) 2014-06-17 7:47 ` [PATCH v2 03/08] ARM: shmobile: Move clock.h Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-18 14:55 ` Simon Horman 2014-06-17 7:47 ` [PATCH v2 05/08] ARM: shmobile: Move common.h Magnus Damm ` (5 subsequent siblings) 9 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Move most of irqs.h so it can be used as #include "irqs.h" instead of the old style #include <mach/irqs.h>. Legacy code in drivers/pinctrl needs more work to get rid of the "mach" portion of the include path, so some part is left in the original location. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-ape6evm.c | 2 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +-- arch/arm/mach-shmobile/board-bockw.c | 2 +- arch/arm/mach-shmobile/board-genmai.c | 2 +- arch/arm/mach-shmobile/board-koelsch-reference.c | 2 +- arch/arm/mach-shmobile/board-koelsch.c | 2 +- arch/arm/mach-shmobile/board-kzm9g.c | 2 +- arch/arm/mach-shmobile/board-lager-reference.c | 2 +- arch/arm/mach-shmobile/board-lager.c | 2 +- arch/arm/mach-shmobile/board-mackerel.c | 5 +---- arch/arm/mach-shmobile/board-marzen-reference.c | 2 +- arch/arm/mach-shmobile/board-marzen.c | 2 +- arch/arm/mach-shmobile/include/mach/irqs.h | 17 ++--------------- arch/arm/mach-shmobile/intc-sh7372.c | 2 +- arch/arm/mach-shmobile/intc-sh73a0.c | 2 +- arch/arm/mach-shmobile/irqs.h | 21 +++++++++++++++++++++ arch/arm/mach-shmobile/setup-r7s72100.c | 2 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- arch/arm/mach-shmobile/setup-sh7372.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 25 files changed, 46 insertions(+), 42 deletions(-) --- 0001/arch/arm/mach-shmobile/board-ape6evm.c +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2014-06-17 16:03:57.000000000 +0900 @@ -34,10 +34,10 @@ #include <linux/sh_clk.h> #include <linux/smsc911x.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a73a4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "irqs.h" /* LEDS */ static struct gpio_led ape6evm_leds[] = { --- 0001/arch/arm/mach-shmobile/board-armadillo800eva.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:03:57.000000000 +0900 @@ -46,7 +46,6 @@ #include <linux/i2c-gpio.h> #include <linux/reboot.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7740.h> #include <media/mt9t112.h> #include <media/sh_mobile_ceu.h> @@ -61,7 +60,7 @@ #include <video/sh_mobile_hdmi.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> - +#include "irqs.h" #include "sh-gpio.h" /* --- 0001/arch/arm/mach-shmobile/board-bockw.c +++ work/arch/arm/mach-shmobile/board-bockw.c 2014-06-17 16:03:57.000000000 +0900 @@ -36,11 +36,11 @@ #include <linux/usb/renesas_usbhs.h> #include <media/soc_camera.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7778.h> #include <asm/mach/arch.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h> +#include "irqs.h" #define FPGA 0x18200000 #define IRQ0MR 0x30 --- 0001/arch/arm/mach-shmobile/board-genmai.c +++ work/arch/arm/mach-shmobile/board-genmai.c 2014-06-17 16:03:57.000000000 +0900 @@ -26,10 +26,10 @@ #include <linux/spi/rspi.h> #include <linux/spi/spi.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r7s72100.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "irqs.h" /* Ether */ static const struct sh_eth_plat_data ether_pdata __initconst = { --- 0004/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:03:57.000000000 +0900 @@ -24,11 +24,11 @@ #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/rcar-gen2.h> #include <mach/r8a7791.h> #include <asm/mach/arch.h> #include "clock.h" +#include "irqs.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/board-koelsch.c +++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:03:57.000000000 +0900 @@ -46,11 +46,11 @@ #include <linux/spi/rspi.h> #include <linux/spi/spi.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "irqs.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/board-kzm9g.c +++ work/arch/arm/mach-shmobile/board-kzm9g.c 2014-06-17 16:03:57.000000000 +0900 @@ -43,13 +43,13 @@ #include <linux/videodev2.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> -#include <mach/irqs.h> #include <mach/sh73a0.h> #include <mach/common.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <video/sh_mobile_lcdc.h> +#include "irqs.h" /* * external GPIO --- 0004/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:03:57.000000000 +0900 @@ -23,11 +23,11 @@ #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/rcar-gen2.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> #include "clock.h" +#include "irqs.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:03:57.000000000 +0900 @@ -46,7 +46,6 @@ #include <linux/usb/phy.h> #include <linux/usb/renesas_usbhs.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7790.h> #include <media/soc_camera.h> #include <asm/mach-types.h> @@ -58,6 +57,7 @@ #include <linux/spi/spi.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h> +#include "irqs.h" /* * SSI-AK4643 --- 0002/arch/arm/mach-shmobile/board-mackerel.c +++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:03:57.000000000 +0900 @@ -57,14 +57,11 @@ #include <media/soc_camera_platform.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> - #include <mach/common.h> -#include <mach/irqs.h> #include <mach/sh7372.h> - #include <asm/mach/arch.h> #include <asm/mach-types.h> - +#include "irqs.h" #include "sh-gpio.h" /* --- 0001/arch/arm/mach-shmobile/board-marzen-reference.c +++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-06-17 16:04:40.000000000 +0900 @@ -21,9 +21,9 @@ #include <mach/r8a7779.h> #include <mach/common.h> -#include <mach/irqs.h> #include <asm/irq.h> #include <asm/mach/arch.h> +#include "irqs.h" static void __init marzen_init(void) { --- 0001/arch/arm/mach-shmobile/board-marzen.c +++ work/arch/arm/mach-shmobile/board-marzen.c 2014-06-17 16:03:57.000000000 +0900 @@ -44,10 +44,10 @@ #include <media/soc_camera.h> #include <mach/r8a7779.h> #include <mach/common.h> -#include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/traps.h> +#include "irqs.h" /* Fixed 3.3V regulator to be used by SDHI0 */ static struct regulator_consumer_supply fixed3v3_power_consumers[] = { --- 0001/arch/arm/mach-shmobile/include/mach/irqs.h +++ work/arch/arm/mach-shmobile/include/mach/irqs.h 2014-06-17 16:03:57.000000000 +0900 @@ -1,24 +1,11 @@ #ifndef __ASM_MACH_IRQS_H #define __ASM_MACH_IRQS_H -#include <linux/sh_intc.h> - -/* GIC */ -#define gic_spi(nr) ((nr) + 32) -#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */ - -/* INTCS */ -#define INTCS_VECT_BASE 0x3400 -#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect)) -#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt)) +/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */ /* External IRQ pins */ #define IRQPIN_BASE 2000 #define irq_pin(nr) ((nr) + IRQPIN_BASE) -/* GPIO IRQ */ -#define _GPIO_IRQ_BASE 2500 -#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x)) -#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y) - #endif /* __ASM_MACH_IRQS_H */ + --- 0002/arch/arm/mach-shmobile/intc-sh7372.c +++ work/arch/arm/mach-shmobile/intc-sh7372.c 2014-06-17 16:03:57.000000000 +0900 @@ -22,10 +22,10 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/io.h> -#include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include "intc.h" +#include "irqs.h" enum { UNUSED_INTCA = 0, --- 0002/arch/arm/mach-shmobile/intc-sh73a0.c +++ work/arch/arm/mach-shmobile/intc-sh73a0.c 2014-06-17 16:03:57.000000000 +0900 @@ -24,11 +24,11 @@ #include <linux/io.h> #include <linux/irqchip.h> #include <linux/irqchip/arm-gic.h> -#include <mach/irqs.h> #include <mach/sh73a0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include "intc.h" +#include "irqs.h" enum { UNUSED = 0, --- /dev/null +++ work/arch/arm/mach-shmobile/irqs.h 2014-06-17 16:03:57.000000000 +0900 @@ -0,0 +1,21 @@ +#ifndef __SHMOBILE_IRQS_H +#define __SHMOBILE_IRQS_H + +#include <linux/sh_intc.h> +#include <mach/irqs.h> + +/* GIC */ +#define gic_spi(nr) ((nr) + 32) +#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */ + +/* INTCS */ +#define INTCS_VECT_BASE 0x3400 +#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect)) +#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt)) + +/* GPIO IRQ */ +#define _GPIO_IRQ_BASE 2500 +#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x)) +#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y) + +#endif /* __SHMOBILE_IRQS_H */ --- 0001/arch/arm/mach-shmobile/setup-r7s72100.c +++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-06-17 16:03:57.000000000 +0900 @@ -23,9 +23,9 @@ #include <linux/of_platform.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r7s72100.h> #include <asm/mach/arch.h> +#include "irqs.h" static struct resource mtu2_resources[] __initdata = { DEFINE_RES_MEM(0xfcff0000, 0x400), --- 0003/arch/arm/mach-shmobile/setup-r8a73a4.c +++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-06-17 16:03:57.000000000 +0900 @@ -25,10 +25,10 @@ #include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a73a4.h> #include <asm/mach/arch.h> #include "dma-register.h" +#include "irqs.h" static const struct resource pfc_resources[] = { DEFINE_RES_MEM(0xe6050000, 0x9000), --- 0003/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:03:57.000000000 +0900 @@ -34,12 +34,12 @@ #include <mach/r8a7740.h> #include <mach/pm-rmobile.h> #include <mach/common.h> -#include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include "dma-register.h" +#include "irqs.h" static struct map_desc r8a7740_io_desc[] __initdata = { /* --- 0001/arch/arm/mach-shmobile/setup-r8a7778.c +++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-06-17 16:03:57.000000000 +0900 @@ -37,11 +37,11 @@ #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> #include <linux/dma-mapping.h> -#include <mach/irqs.h> #include <mach/r8a7778.h> #include <mach/common.h> #include <asm/mach/arch.h> #include <asm/hardware/cache-l2x0.h> +#include "irqs.h" /* SCIF */ #define R8A7778_SCIF(index, baseaddr, irq) \ --- 0001/arch/arm/mach-shmobile/setup-r8a7779.c +++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-06-17 16:03:57.000000000 +0900 @@ -40,7 +40,6 @@ #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> #include <linux/pm_runtime.h> -#include <mach/irqs.h> #include <mach/r8a7779.h> #include <mach/common.h> #include <asm/mach-types.h> @@ -48,6 +47,7 @@ #include <asm/mach/time.h> #include <asm/mach/map.h> #include <asm/hardware/cache-l2x0.h> +#include "irqs.h" static struct map_desc r8a7779_io_desc[] __initdata = { /* 2M entity map for 0xf0000000 (MPCORE) */ --- 0003/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:03:57.000000000 +0900 @@ -27,10 +27,10 @@ #include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> #include "dma-register.h" +#include "irqs.h" /* Audio-DMAC */ #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ --- 0001/arch/arm/mach-shmobile/setup-r8a7791.c +++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:03:57.000000000 +0900 @@ -27,10 +27,10 @@ #include <linux/serial_sci.h> #include <linux/sh_timer.h> #include <mach/common.h> -#include <mach/irqs.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach/arch.h> +#include "irqs.h" static const struct resource pfc_resources[] __initconst = { DEFINE_RES_MEM(0xe6060000, 0x250), --- 0003/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:03:57.000000000 +0900 @@ -33,7 +33,6 @@ #include <linux/pm_domain.h> #include <linux/dma-mapping.h> #include <linux/platform_data/sh_ipmmu.h> -#include <mach/irqs.h> #include <mach/sh7372.h> #include <mach/common.h> #include <asm/mach/map.h> @@ -41,6 +40,7 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include "dma-register.h" +#include "irqs.h" static struct map_desc sh7372_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx --- 0003/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 16:03:57.000000000 +0900 @@ -32,7 +32,6 @@ #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> -#include <mach/irqs.h> #include <mach/sh73a0.h> #include <mach/common.h> #include <asm/mach-types.h> @@ -40,6 +39,7 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include "dma-register.h" +#include "irqs.h" static struct map_desc sh73a0_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl 2014-06-17 7:47 ` [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm @ 2014-06-18 14:55 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2014-06-18 14:55 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 17, 2014 at 04:47:29PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Move most of irqs.h so it can be used as #include "irqs.h" > instead of the old style #include <mach/irqs.h>. > > Legacy code in drivers/pinctrl needs more work to get rid > of the "mach" portion of the include path, so some part > is left in the original location. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > Acked-by: Arnd Bergmann <arnd@arndb.de> > --- > > Changes since V1: > - rebased to v3.16-rc1 [snip] > --- 0001/arch/arm/mach-shmobile/include/mach/irqs.h > +++ work/arch/arm/mach-shmobile/include/mach/irqs.h 2014-06-17 16:03:57.000000000 +0900 > @@ -1,24 +1,11 @@ > #ifndef __ASM_MACH_IRQS_H > #define __ASM_MACH_IRQS_H > > -#include <linux/sh_intc.h> > - > -/* GIC */ > -#define gic_spi(nr) ((nr) + 32) > -#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */ > - > -/* INTCS */ > -#define INTCS_VECT_BASE 0x3400 > -#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect)) > -#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt)) > +/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */ > > /* External IRQ pins */ > #define IRQPIN_BASE 2000 > #define irq_pin(nr) ((nr) + IRQPIN_BASE) > > -/* GPIO IRQ */ > -#define _GPIO_IRQ_BASE 2500 > -#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x)) > -#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y) > - > #endif /* __ASM_MACH_IRQS_H */ > + I removed the trailing blank line this patch adds here. [snip] ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 05/08] ARM: shmobile: Move common.h 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (3 preceding siblings ...) 2014-06-17 7:47 ` [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:47 ` [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm ` (4 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location for common.h so it can be used as #include "common.h" instead of the old style #include <mach/common.h>. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-ape6evm-reference.c | 2 arch/arm/mach-shmobile/board-ape6evm.c | 2 arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2 arch/arm/mach-shmobile/board-armadillo800eva.c | 2 arch/arm/mach-shmobile/board-bockw-reference.c | 2 arch/arm/mach-shmobile/board-bockw.c | 2 arch/arm/mach-shmobile/board-genmai-reference.c | 2 arch/arm/mach-shmobile/board-genmai.c | 2 arch/arm/mach-shmobile/board-koelsch-reference.c | 2 arch/arm/mach-shmobile/board-koelsch.c | 2 arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 arch/arm/mach-shmobile/board-kzm9g.c | 2 arch/arm/mach-shmobile/board-lager-reference.c | 2 arch/arm/mach-shmobile/board-lager.c | 2 arch/arm/mach-shmobile/board-mackerel.c | 2 arch/arm/mach-shmobile/board-marzen-reference.c | 2 arch/arm/mach-shmobile/board-marzen.c | 2 arch/arm/mach-shmobile/clock-r7s72100.c | 2 arch/arm/mach-shmobile/clock-r8a73a4.c | 2 arch/arm/mach-shmobile/clock-r8a7740.c | 2 arch/arm/mach-shmobile/clock-r8a7778.c | 2 arch/arm/mach-shmobile/clock-r8a7779.c | 2 arch/arm/mach-shmobile/clock-r8a7790.c | 2 arch/arm/mach-shmobile/clock-r8a7791.c | 2 arch/arm/mach-shmobile/clock-sh7372.c | 2 arch/arm/mach-shmobile/clock-sh73a0.c | 2 arch/arm/mach-shmobile/clock.c | 2 arch/arm/mach-shmobile/common.h | 56 ++++++++++++++ arch/arm/mach-shmobile/console.c | 2 arch/arm/mach-shmobile/include/mach/common.h | 56 -------------- arch/arm/mach-shmobile/platsmp-apmu.c | 2 arch/arm/mach-shmobile/platsmp-scu.c | 2 arch/arm/mach-shmobile/platsmp.c | 2 arch/arm/mach-shmobile/pm-r8a7740.c | 2 arch/arm/mach-shmobile/pm-r8a7779.c | 2 arch/arm/mach-shmobile/pm-sh7372.c | 2 arch/arm/mach-shmobile/pm-sh73a0.c | 2 arch/arm/mach-shmobile/setup-emev2.c | 2 arch/arm/mach-shmobile/setup-r7s72100.c | 2 arch/arm/mach-shmobile/setup-r8a73a4.c | 2 arch/arm/mach-shmobile/setup-r8a7740.c | 2 arch/arm/mach-shmobile/setup-r8a7778.c | 2 arch/arm/mach-shmobile/setup-r8a7779.c | 2 arch/arm/mach-shmobile/setup-r8a7790.c | 2 arch/arm/mach-shmobile/setup-r8a7791.c | 2 arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 arch/arm/mach-shmobile/setup-sh7372.c | 2 arch/arm/mach-shmobile/setup-sh73a0.c | 2 arch/arm/mach-shmobile/smp-emev2.c | 2 arch/arm/mach-shmobile/smp-r8a7779.c | 2 arch/arm/mach-shmobile/smp-r8a7790.c | 2 arch/arm/mach-shmobile/smp-r8a7791.c | 2 arch/arm/mach-shmobile/smp-sh73a0.c | 2 53 files changed, 107 insertions(+), 107 deletions(-) --- 0001/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ work/arch/arm/mach-shmobile/board-ape6evm-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -24,10 +24,10 @@ #include <linux/pinctrl/machine.h> #include <linux/platform_device.h> #include <linux/sh_clk.h> -#include <mach/common.h> #include <mach/r8a73a4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "common.h" static void __init ape6evm_add_standard_devices(void) { --- 0005/arch/arm/mach-shmobile/board-ape6evm.c +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2014-06-17 16:05:44.000000000 +0900 @@ -33,10 +33,10 @@ #include <linux/regulator/machine.h> #include <linux/sh_clk.h> #include <linux/smsc911x.h> -#include <mach/common.h> #include <mach/r8a73a4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" /* LEDS */ --- 0001/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -24,10 +24,10 @@ #include <linux/kernel.h> #include <linux/gpio.h> #include <linux/io.h> -#include <mach/common.h> #include <mach/r8a7740.h> #include <asm/mach/arch.h> #include <asm/hardware/cache-l2x0.h> +#include "common.h" /* * CON1 Camera Module --- 0005/arch/arm/mach-shmobile/board-armadillo800eva.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:05:44.000000000 +0900 @@ -45,7 +45,6 @@ #include <linux/mmc/sh_mobile_sdhi.h> #include <linux/i2c-gpio.h> #include <linux/reboot.h> -#include <mach/common.h> #include <mach/r8a7740.h> #include <media/mt9t112.h> #include <media/sh_mobile_ceu.h> @@ -60,6 +59,7 @@ #include <video/sh_mobile_hdmi.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> +#include "common.h" #include "irqs.h" #include "sh-gpio.h" --- 0001/arch/arm/mach-shmobile/board-bockw-reference.c +++ work/arch/arm/mach-shmobile/board-bockw-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -19,9 +19,9 @@ */ #include <linux/of_platform.h> -#include <mach/common.h> #include <mach/r8a7778.h> #include <asm/mach/arch.h> +#include "common.h" /* * see board-bock.c for checking detail of dip-switch --- 0005/arch/arm/mach-shmobile/board-bockw.c +++ work/arch/arm/mach-shmobile/board-bockw.c 2014-06-17 16:05:44.000000000 +0900 @@ -35,11 +35,11 @@ #include <linux/spi/flash.h> #include <linux/usb/renesas_usbhs.h> #include <media/soc_camera.h> -#include <mach/common.h> #include <mach/r8a7778.h> #include <asm/mach/arch.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h> +#include "common.h" #include "irqs.h" #define FPGA 0x18200000 --- 0004/arch/arm/mach-shmobile/board-genmai-reference.c +++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -20,11 +20,11 @@ #include <linux/kernel.h> #include <linux/of_platform.h> -#include <mach/common.h> #include <mach/r7s72100.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include "clock.h" +#include "common.h" /* * This is a really crude hack to provide clkdev support to platform --- 0005/arch/arm/mach-shmobile/board-genmai.c +++ work/arch/arm/mach-shmobile/board-genmai.c 2014-06-17 16:05:44.000000000 +0900 @@ -25,10 +25,10 @@ #include <linux/sh_eth.h> #include <linux/spi/rspi.h> #include <linux/spi/spi.h> -#include <mach/common.h> #include <mach/r7s72100.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" /* Ether */ --- 0005/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -23,11 +23,11 @@ #include <linux/kernel.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/common.h> #include <mach/rcar-gen2.h> #include <mach/r8a7791.h> #include <asm/mach/arch.h> #include "clock.h" +#include "common.h" #include "irqs.h" /* DU */ --- 0005/arch/arm/mach-shmobile/board-koelsch.c +++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:05:44.000000000 +0900 @@ -45,11 +45,11 @@ #include <linux/spi/flash.h> #include <linux/spi/rspi.h> #include <linux/spi/spi.h> -#include <mach/common.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" /* DU */ --- 0001/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ work/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -26,10 +26,10 @@ #include <linux/input.h> #include <linux/of_platform.h> #include <mach/sh73a0.h> -#include <mach/common.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "common.h" static void __init kzm_init(void) { --- 0005/arch/arm/mach-shmobile/board-kzm9g.c +++ work/arch/arm/mach-shmobile/board-kzm9g.c 2014-06-17 16:05:44.000000000 +0900 @@ -44,11 +44,11 @@ #include <sound/sh_fsi.h> #include <sound/simple_card.h> #include <mach/sh73a0.h> -#include <mach/common.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <video/sh_mobile_lcdc.h> +#include "common.h" #include "irqs.h" /* --- 0005/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,11 +22,11 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/common.h> #include <mach/rcar-gen2.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> #include "clock.h" +#include "common.h" #include "irqs.h" /* DU */ --- 0005/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:05:44.000000000 +0900 @@ -45,7 +45,6 @@ #include <linux/sh_eth.h> #include <linux/usb/phy.h> #include <linux/usb/renesas_usbhs.h> -#include <mach/common.h> #include <mach/r8a7790.h> #include <media/soc_camera.h> #include <asm/mach-types.h> @@ -57,6 +56,7 @@ #include <linux/spi/spi.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h> +#include "common.h" #include "irqs.h" /* --- 0005/arch/arm/mach-shmobile/board-mackerel.c +++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:05:44.000000000 +0900 @@ -57,10 +57,10 @@ #include <media/soc_camera_platform.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> -#include <mach/common.h> #include <mach/sh7372.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> +#include "common.h" #include "irqs.h" #include "sh-gpio.h" --- 0005/arch/arm/mach-shmobile/board-marzen-reference.c +++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-06-17 16:06:25.000000000 +0900 @@ -20,9 +20,9 @@ */ #include <mach/r8a7779.h> -#include <mach/common.h> #include <asm/irq.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" static void __init marzen_init(void) --- 0005/arch/arm/mach-shmobile/board-marzen.c +++ work/arch/arm/mach-shmobile/board-marzen.c 2014-06-17 16:05:44.000000000 +0900 @@ -43,10 +43,10 @@ #include <linux/mfd/tmio.h> #include <media/soc_camera.h> #include <mach/r8a7779.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/traps.h> +#include "common.h" #include "irqs.h" /* Fixed 3.3V regulator to be used by SDHI0 */ --- 0001/arch/arm/mach-shmobile/clock-r7s72100.c +++ work/arch/arm/mach-shmobile/clock-r7s72100.c 2014-06-17 16:05:44.000000000 +0900 @@ -19,8 +19,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include <mach/r7s72100.h> +#include "common.h" /* Frequency Control Registers */ #define FRQCR 0xfcfe0010 --- 0004/arch/arm/mach-shmobile/clock-r8a73a4.c +++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,7 +22,7 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> +#include "common.h" #include "clock.h" #define CPG_BASE 0xe6150000 --- 0004/arch/arm/mach-shmobile/clock-r8a7740.c +++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include <mach/r8a7740.h> #include "clock.h" +#include "common.h" /* * | MDx | XTAL1/EXTAL1 | System | EXTALR | --- 0004/arch/arm/mach-shmobile/clock-r8a7778.c +++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-06-17 16:05:44.000000000 +0900 @@ -39,8 +39,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include "clock.h" +#include "common.h" #define MSTPCR0 IOMEM(0xffc80030) #define MSTPCR1 IOMEM(0xffc80034) --- 0004/arch/arm/mach-shmobile/clock-r8a7779.c +++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-06-17 16:06:57.000000000 +0900 @@ -23,8 +23,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include "clock.h" +#include "common.h" /* * MD1 = 1 MD1 = 0 --- 0004/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include <mach/r8a7790.h> #include "clock.h" +#include "common.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0004/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:05:44.000000000 +0900 @@ -23,9 +23,9 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include <mach/rcar-gen2.h> #include "clock.h" +#include "common.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0004/arch/arm/mach-shmobile/clock-sh7372.c +++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-06-17 16:05:44.000000000 +0900 @@ -21,8 +21,8 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/common.h> #include "clock.h" +#include "common.h" /* SH7372 registers */ #define FRQCRA IOMEM(0xe6150000) --- 0004/arch/arm/mach-shmobile/clock-sh73a0.c +++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,8 +22,8 @@ #include <linux/sh_clk.h> #include <linux/clkdev.h> #include <asm/processor.h> -#include <mach/common.h> #include "clock.h" +#include "common.h" #define FRQCRA IOMEM(0xe6150000) #define FRQCRB IOMEM(0xe6150004) --- 0004/arch/arm/mach-shmobile/clock.c +++ work/arch/arm/mach-shmobile/clock.c 2014-06-17 16:05:44.000000000 +0900 @@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons #else /* CONFIG_COMMON_CLK */ #include <linux/sh_clk.h> #include <linux/export.h> -#include <mach/common.h> #include "clock.h" +#include "common.h" unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk) { --- /dev/null +++ work/arch/arm/mach-shmobile/common.h 2014-06-17 16:05:44.000000000 +0900 @@ -0,0 +1,56 @@ +#ifndef __ARCH_MACH_COMMON_H +#define __ARCH_MACH_COMMON_H + +extern void shmobile_earlytimer_init(void); +extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz, + unsigned int mult, unsigned int div); +extern void shmobile_init_delay(void); +struct twd_local_timer; +extern void shmobile_setup_console(void); +extern void shmobile_boot_vector(void); +extern unsigned long shmobile_boot_fn; +extern unsigned long shmobile_boot_arg; +extern unsigned long shmobile_boot_size; +extern void shmobile_smp_boot(void); +extern void shmobile_smp_sleep(void); +extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, + unsigned long arg); +extern int shmobile_smp_cpu_disable(unsigned int cpu); +extern void shmobile_invalidate_start(void); +extern void shmobile_boot_scu(void); +extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); +extern void shmobile_smp_scu_cpu_die(unsigned int cpu); +extern int shmobile_smp_scu_cpu_kill(unsigned int cpu); +extern void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus); +extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu, + struct task_struct *idle); +extern void shmobile_smp_apmu_cpu_die(unsigned int cpu); +extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu); +struct clk; +extern int shmobile_clk_init(void); +extern void shmobile_handle_irq_intc(struct pt_regs *); +extern struct platform_suspend_ops shmobile_suspend_ops; +struct cpuidle_driver; +extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv); + +#ifdef CONFIG_SUSPEND +int shmobile_suspend_init(void); +#else +static inline int shmobile_suspend_init(void) { return 0; } +#endif + +#ifdef CONFIG_CPU_IDLE +int shmobile_cpuidle_init(void); +#else +static inline int shmobile_cpuidle_init(void) { return 0; } +#endif + +extern void __iomem *shmobile_scu_base; + +static inline void __init shmobile_init_late(void) +{ + shmobile_suspend_init(); + shmobile_cpuidle_init(); +} + +#endif /* __ARCH_MACH_COMMON_H */ --- 0001/arch/arm/mach-shmobile/console.c +++ work/arch/arm/mach-shmobile/console.c 2014-06-17 16:05:44.000000000 +0900 @@ -19,8 +19,8 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <mach/common.h> #include <asm/mach/map.h> +#include "common.h" void __init shmobile_setup_console(void) { --- 0001/arch/arm/mach-shmobile/include/mach/common.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,56 +0,0 @@ -#ifndef __ARCH_MACH_COMMON_H -#define __ARCH_MACH_COMMON_H - -extern void shmobile_earlytimer_init(void); -extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz, - unsigned int mult, unsigned int div); -extern void shmobile_init_delay(void); -struct twd_local_timer; -extern void shmobile_setup_console(void); -extern void shmobile_boot_vector(void); -extern unsigned long shmobile_boot_fn; -extern unsigned long shmobile_boot_arg; -extern unsigned long shmobile_boot_size; -extern void shmobile_smp_boot(void); -extern void shmobile_smp_sleep(void); -extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, - unsigned long arg); -extern int shmobile_smp_cpu_disable(unsigned int cpu); -extern void shmobile_invalidate_start(void); -extern void shmobile_boot_scu(void); -extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); -extern void shmobile_smp_scu_cpu_die(unsigned int cpu); -extern int shmobile_smp_scu_cpu_kill(unsigned int cpu); -extern void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus); -extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu, - struct task_struct *idle); -extern void shmobile_smp_apmu_cpu_die(unsigned int cpu); -extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu); -struct clk; -extern int shmobile_clk_init(void); -extern void shmobile_handle_irq_intc(struct pt_regs *); -extern struct platform_suspend_ops shmobile_suspend_ops; -struct cpuidle_driver; -extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv); - -#ifdef CONFIG_SUSPEND -int shmobile_suspend_init(void); -#else -static inline int shmobile_suspend_init(void) { return 0; } -#endif - -#ifdef CONFIG_CPU_IDLE -int shmobile_cpuidle_init(void); -#else -static inline int shmobile_cpuidle_init(void) { return 0; } -#endif - -extern void __iomem *shmobile_scu_base; - -static inline void __init shmobile_init_late(void) -{ - shmobile_suspend_init(); - shmobile_cpuidle_init(); -} - -#endif /* __ARCH_MACH_COMMON_H */ --- 0001/arch/arm/mach-shmobile/platsmp-apmu.c +++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2014-06-17 16:05:44.000000000 +0900 @@ -16,7 +16,7 @@ #include <asm/cacheflush.h> #include <asm/cp15.h> #include <asm/smp_plat.h> -#include <mach/common.h> +#include "common.h" static struct { void __iomem *iomem; --- 0001/arch/arm/mach-shmobile/platsmp-scu.c +++ work/arch/arm/mach-shmobile/platsmp-scu.c 2014-06-17 16:05:44.000000000 +0900 @@ -15,7 +15,7 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> -#include <mach/common.h> +#include "common.h" static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb, unsigned long action, void *hcpu) --- 0001/arch/arm/mach-shmobile/platsmp.c +++ work/arch/arm/mach-shmobile/platsmp.c 2014-06-17 16:05:44.000000000 +0900 @@ -13,7 +13,7 @@ #include <linux/init.h> #include <asm/cacheflush.h> #include <asm/smp_plat.h> -#include <mach/common.h> +#include "common.h" extern unsigned long shmobile_smp_fn[]; extern unsigned long shmobile_smp_arg[]; --- 0001/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-06-17 16:05:44.000000000 +0900 @@ -11,7 +11,7 @@ #include <linux/console.h> #include <linux/suspend.h> #include <mach/pm-rmobile.h> -#include <mach/common.h> +#include "common.h" #ifdef CONFIG_PM static int r8a7740_pd_a4s_suspend(void) --- 0001/arch/arm/mach-shmobile/pm-r8a7779.c +++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-06-17 16:05:44.000000000 +0900 @@ -19,9 +19,9 @@ #include <linux/interrupt.h> #include <linux/console.h> #include <asm/io.h> -#include <mach/common.h> #include <mach/pm-rcar.h> #include <mach/r8a7779.h> +#include "common.h" /* SYSC */ #define SYSCIER 0x0c --- 0001/arch/arm/mach-shmobile/pm-sh7372.c +++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-06-17 16:05:44.000000000 +0900 @@ -25,9 +25,9 @@ #include <asm/io.h> #include <asm/tlbflush.h> #include <asm/suspend.h> -#include <mach/common.h> #include <mach/sh7372.h> #include <mach/pm-rmobile.h> +#include "common.h" /* DBG */ #define DBGREG1 IOMEM(0xe6100020) --- 0001/arch/arm/mach-shmobile/pm-sh73a0.c +++ work/arch/arm/mach-shmobile/pm-sh73a0.c 2014-06-17 16:05:44.000000000 +0900 @@ -9,7 +9,7 @@ */ #include <linux/suspend.h> -#include <mach/common.h> +#include "common.h" #ifdef CONFIG_SUSPEND static int sh73a0_enter_suspend(suspend_state_t suspend_state) --- 0001/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-06-17 16:05:44.000000000 +0900 @@ -20,10 +20,10 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/of_platform.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include "common.h" static struct map_desc emev2_io_desc[] __initdata = { #ifdef CONFIG_SMP --- 0005/arch/arm/mach-shmobile/setup-r7s72100.c +++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/kernel.h> #include <linux/of_platform.h> #include <linux/sh_timer.h> -#include <mach/common.h> #include <mach/r7s72100.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" static struct resource mtu2_resources[] __initdata = { --- 0005/arch/arm/mach-shmobile/setup-r8a73a4.c +++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900 @@ -24,9 +24,9 @@ #include <linux/serial_sci.h> #include <linux/sh_dma.h> #include <linux/sh_timer.h> -#include <mach/common.h> #include <mach/r8a73a4.h> #include <asm/mach/arch.h> +#include "common.h" #include "dma-register.h" #include "irqs.h" --- 0005/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:05:44.000000000 +0900 @@ -33,11 +33,11 @@ #include <linux/platform_data/sh_ipmmu.h> #include <mach/r8a7740.h> #include <mach/pm-rmobile.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "dma-register.h" #include "irqs.h" --- 0005/arch/arm/mach-shmobile/setup-r8a7778.c +++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-06-17 16:05:44.000000000 +0900 @@ -38,9 +38,9 @@ #include <linux/usb/ohci_pdriver.h> #include <linux/dma-mapping.h> #include <mach/r8a7778.h> -#include <mach/common.h> #include <asm/mach/arch.h> #include <asm/hardware/cache-l2x0.h> +#include "common.h" #include "irqs.h" /* SCIF */ --- 0005/arch/arm/mach-shmobile/setup-r8a7779.c +++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-06-17 16:05:44.000000000 +0900 @@ -41,12 +41,12 @@ #include <linux/usb/ohci_pdriver.h> #include <linux/pm_runtime.h> #include <mach/r8a7779.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> #include <asm/hardware/cache-l2x0.h> +#include "common.h" #include "irqs.h" static struct map_desc r8a7779_io_desc[] __initdata = { --- 0005/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:05:44.000000000 +0900 @@ -26,9 +26,9 @@ #include <linux/serial_sci.h> #include <linux/sh_dma.h> #include <linux/sh_timer.h> -#include <mach/common.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> +#include "common.h" #include "dma-register.h" #include "irqs.h" --- 0005/arch/arm/mach-shmobile/setup-r8a7791.c +++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:05:44.000000000 +0900 @@ -26,10 +26,10 @@ #include <linux/platform_data/irq-renesas-irqc.h> #include <linux/serial_sci.h> #include <linux/sh_timer.h> -#include <mach/common.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach/arch.h> +#include "common.h" #include "irqs.h" static const struct resource pfc_resources[] __initconst = { --- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/clocksource.h> #include <linux/io.h> #include <linux/kernel.h> -#include <mach/common.h> #include <mach/rcar-gen2.h> #include <asm/mach/arch.h> +#include "common.h" #define MODEMR 0xe6160060 --- 0005/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:05:44.000000000 +0900 @@ -34,11 +34,11 @@ #include <linux/dma-mapping.h> #include <linux/platform_data/sh_ipmmu.h> #include <mach/sh7372.h> -#include <mach/common.h> #include <asm/mach/map.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "dma-register.h" #include "irqs.h" --- 0005/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 16:05:44.000000000 +0900 @@ -33,11 +33,11 @@ #include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> #include <mach/sh73a0.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "dma-register.h" #include "irqs.h" --- 0001/arch/arm/mach-shmobile/smp-emev2.c +++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-06-17 16:05:44.000000000 +0900 @@ -23,9 +23,9 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/delay.h> -#include <mach/common.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> +#include "common.h" #define EMEV2_SCU_BASE 0x1e000000 #define EMEV2_SMU_BASE 0xe0110000 --- 0001/arch/arm/mach-shmobile/smp-r8a7779.c +++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-06-17 16:05:44.000000000 +0900 @@ -23,13 +23,13 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/delay.h> -#include <mach/common.h> #include <mach/pm-rcar.h> #include <mach/r8a7779.h> #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> #include <asm/smp_twd.h> +#include "common.h" #define AVECR IOMEM(0xfe700040) #define R8A7779_SCU_BASE 0xf0000000 --- 0001/arch/arm/mach-shmobile/smp-r8a7790.c +++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-06-17 16:05:44.000000000 +0900 @@ -18,9 +18,9 @@ #include <linux/smp.h> #include <linux/io.h> #include <asm/smp_plat.h> -#include <mach/common.h> #include <mach/pm-rcar.h> #include <mach/r8a7790.h> +#include "common.h" #define RST 0xe6160000 #define CA15BAR 0x0020 --- 0001/arch/arm/mach-shmobile/smp-r8a7791.c +++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-17 16:05:44.000000000 +0900 @@ -18,9 +18,9 @@ #include <linux/smp.h> #include <linux/io.h> #include <asm/smp_plat.h> -#include <mach/common.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> +#include "common.h" #define RST 0xe6160000 #define CA15BAR 0x0020 --- 0001/arch/arm/mach-shmobile/smp-sh73a0.c +++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-06-17 16:05:44.000000000 +0900 @@ -22,10 +22,10 @@ #include <linux/smp.h> #include <linux/io.h> #include <linux/delay.h> -#include <mach/common.h> #include <mach/sh73a0.h> #include <asm/smp_plat.h> #include <asm/smp_twd.h> +#include "common.h" #define WUPCR IOMEM(0xe6151010) #define SRESCR IOMEM(0xe6151018) ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (4 preceding siblings ...) 2014-06-17 7:47 ` [PATCH v2 05/08] ARM: shmobile: Move common.h Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:47 ` [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm ` (3 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of pm-rmobile.h so it can be used as #include "pm-rmobile.h" instead of the old style #include <mach/pm-rmobile.h>. Also clean up the sh7372 and sh73a0 header files to get rid of unused include files. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-armadillo800eva.c | 1 arch/arm/mach-shmobile/board-mackerel.c | 2 arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 63 ---------------------- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 - arch/arm/mach-shmobile/pm-r8a7740.c | 2 arch/arm/mach-shmobile/pm-rmobile.c | 2 arch/arm/mach-shmobile/pm-rmobile.h | 63 ++++++++++++++++++++++ arch/arm/mach-shmobile/pm-sh7372.c | 2 arch/arm/mach-shmobile/setup-r8a7740.c | 2 arch/arm/mach-shmobile/setup-sh7372.c | 1 11 files changed, 71 insertions(+), 73 deletions(-) --- 0006/arch/arm/mach-shmobile/board-armadillo800eva.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:09:25.000000000 +0900 @@ -61,6 +61,7 @@ #include <sound/simple_card.h> #include "common.h" #include "irqs.h" +#include "pm-rmobile.h" #include "sh-gpio.h" /* --- 0006/arch/arm/mach-shmobile/board-mackerel.c +++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:09:25.000000000 +0900 @@ -47,6 +47,7 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h> +#include <linux/sh_clk.h> #include <linux/tca6416_keypad.h> #include <linux/usb/renesas_usbhs.h> #include <linux/dma-mapping.h> @@ -62,6 +63,7 @@ #include <asm/mach-types.h> #include "common.h" #include "irqs.h" +#include "pm-rmobile.h" #include "sh-gpio.h" /* --- 0001/arch/arm/mach-shmobile/include/mach/pm-rmobile.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2012 Renesas Solutions Corp. - * - * Kuninori Morimoto <morimoto.kuninori@renesas.com> - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#ifndef PM_RMOBILE_H -#define PM_RMOBILE_H - -#include <linux/pm_domain.h> - -#define DEFAULT_DEV_LATENCY_NS 250000 - -struct platform_device; - -struct rmobile_pm_domain { - struct generic_pm_domain genpd; - struct dev_power_governor *gov; - int (*suspend)(void); - void (*resume)(void); - unsigned int bit_shift; - bool no_debug; -}; - -static inline -struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) -{ - return container_of(d, struct rmobile_pm_domain, genpd); -} - -struct pm_domain_device { - const char *domain_name; - struct platform_device *pdev; -}; - -#ifdef CONFIG_PM -extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num); -extern void rmobile_add_device_to_domain_td(const char *domain_name, - struct platform_device *pdev, - struct gpd_timing_data *td); - -static inline void rmobile_add_device_to_domain(const char *domain_name, - struct platform_device *pdev) -{ - rmobile_add_device_to_domain_td(domain_name, pdev, NULL); -} - -extern void rmobile_add_devices_to_domains(struct pm_domain_device data[], - int size); -#else - -#define rmobile_init_domains(domains, num) do { } while (0) -#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0) -#define rmobile_add_device_to_domain(name, pdev) do { } while (0) - -static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], - int size) {} -#endif /* CONFIG_PM */ - -#endif /* PM_RMOBILE_H */ --- 0001/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7740.h 2014-06-17 16:09:25.000000000 +0900 @@ -19,8 +19,6 @@ #ifndef __ASM_R8A7740_H__ #define __ASM_R8A7740_H__ -#include <mach/pm-rmobile.h> - /* * MD_CKx pin */ --- 0001/arch/arm/mach-shmobile/include/mach/sh7372.h +++ work/arch/arm/mach-shmobile/include/mach/sh7372.h 2014-06-17 16:09:25.000000000 +0900 @@ -11,10 +11,6 @@ #ifndef __ASM_SH7372_H__ #define __ASM_SH7372_H__ -#include <linux/sh_clk.h> -#include <linux/pm_domain.h> -#include <mach/pm-rmobile.h> - /* DMA slave IDs */ enum { SHDMA_SLAVE_INVALID, --- 0006/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-06-17 16:09:25.000000000 +0900 @@ -10,8 +10,8 @@ */ #include <linux/console.h> #include <linux/suspend.h> -#include <mach/pm-rmobile.h> #include "common.h" +#include "pm-rmobile.h" #ifdef CONFIG_PM static int r8a7740_pd_a4s_suspend(void) --- 0001/arch/arm/mach-shmobile/pm-rmobile.c +++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-06-17 16:09:25.000000000 +0900 @@ -17,7 +17,7 @@ #include <linux/pm.h> #include <linux/pm_clock.h> #include <asm/io.h> -#include <mach/pm-rmobile.h> +#include "pm-rmobile.h" /* SYSC */ #define SPDCR IOMEM(0xe6180008) --- /dev/null +++ work/arch/arm/mach-shmobile/pm-rmobile.h 2014-06-17 16:09:26.000000000 +0900 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2012 Renesas Solutions Corp. + * + * Kuninori Morimoto <morimoto.kuninori@renesas.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef PM_RMOBILE_H +#define PM_RMOBILE_H + +#include <linux/pm_domain.h> + +#define DEFAULT_DEV_LATENCY_NS 250000 + +struct platform_device; + +struct rmobile_pm_domain { + struct generic_pm_domain genpd; + struct dev_power_governor *gov; + int (*suspend)(void); + void (*resume)(void); + unsigned int bit_shift; + bool no_debug; +}; + +static inline +struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) +{ + return container_of(d, struct rmobile_pm_domain, genpd); +} + +struct pm_domain_device { + const char *domain_name; + struct platform_device *pdev; +}; + +#ifdef CONFIG_PM +extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num); +extern void rmobile_add_device_to_domain_td(const char *domain_name, + struct platform_device *pdev, + struct gpd_timing_data *td); + +static inline void rmobile_add_device_to_domain(const char *domain_name, + struct platform_device *pdev) +{ + rmobile_add_device_to_domain_td(domain_name, pdev, NULL); +} + +extern void rmobile_add_devices_to_domains(struct pm_domain_device data[], + int size); +#else + +#define rmobile_init_domains(domains, num) do { } while (0) +#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0) +#define rmobile_add_device_to_domain(name, pdev) do { } while (0) + +static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], + int size) {} +#endif /* CONFIG_PM */ + +#endif /* PM_RMOBILE_H */ --- 0006/arch/arm/mach-shmobile/pm-sh7372.c +++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-06-17 16:09:25.000000000 +0900 @@ -26,8 +26,8 @@ #include <asm/tlbflush.h> #include <asm/suspend.h> #include <mach/sh7372.h> -#include <mach/pm-rmobile.h> #include "common.h" +#include "pm-rmobile.h" /* DBG */ #define DBGREG1 IOMEM(0xe6100020) --- 0006/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:09:25.000000000 +0900 @@ -32,7 +32,6 @@ #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> #include <mach/r8a7740.h> -#include <mach/pm-rmobile.h> #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> @@ -40,6 +39,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "pm-rmobile.h" static struct map_desc r8a7740_io_desc[] __initdata = { /* --- 0006/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:09:25.000000000 +0900 @@ -41,6 +41,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "pm-rmobile.h" static struct map_desc sh7372_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (5 preceding siblings ...) 2014-06-17 7:47 ` [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm @ 2014-06-17 7:47 ` Magnus Damm 2014-06-17 7:48 ` [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm ` (2 subsequent siblings) 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:47 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of pm-rcar.h so it can be used as #include "pm-rcar.h" instead of the old style #include <mach/pm-rcar.h>. Also clean up the r8a7779 case to move some unused header file cruft into a C file. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15 --------------- arch/arm/mach-shmobile/include/mach/r8a7779.h | 12 ------------ arch/arm/mach-shmobile/pm-r8a7779.c | 13 ++++++++++++- arch/arm/mach-shmobile/pm-r8a7790.c | 2 +- arch/arm/mach-shmobile/pm-rcar.c | 2 +- arch/arm/mach-shmobile/pm-rcar.h | 15 +++++++++++++++ arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- 8 files changed, 31 insertions(+), 32 deletions(-) --- 0001/arch/arm/mach-shmobile/include/mach/pm-rcar.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,15 +0,0 @@ -#ifndef PM_RCAR_H -#define PM_RCAR_H - -struct rcar_sysc_ch { - unsigned long chan_offs; - unsigned int chan_bit; - unsigned int isr_bit; -}; - -int rcar_sysc_power_down(struct rcar_sysc_ch *sysc_ch); -int rcar_sysc_power_up(struct rcar_sysc_ch *sysc_ch); -bool rcar_sysc_power_is_off(struct rcar_sysc_ch *sysc_ch); -void __iomem *rcar_sysc_init(phys_addr_t base); - -#endif /* PM_RCAR_H */ --- 0001/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7779.h 2014-06-17 16:13:54.000000000 +0900 @@ -2,8 +2,6 @@ #define __ASM_R8A7779_H__ #include <linux/sh_clk.h> -#include <linux/pm_domain.h> -#include <mach/pm-rcar.h> /* HPB-DMA slave IDs */ enum { @@ -12,16 +10,6 @@ enum { HPBDMA_SLAVE_SDHI0_RX, }; -struct r8a7779_pm_domain { - struct generic_pm_domain genpd; - struct rcar_sysc_ch ch; -}; - -static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) -{ - return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; -} - extern void r8a7779_init_delay(void); extern void r8a7779_init_irq_extpin(int irlm); extern void r8a7779_init_irq_extpin_dt(int irlm); --- 0006/arch/arm/mach-shmobile/pm-r8a7779.c +++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-06-17 16:10:26.000000000 +0900 @@ -13,20 +13,31 @@ #include <linux/suspend.h> #include <linux/err.h> #include <linux/pm_clock.h> +#include <linux/pm_domain.h> #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/console.h> #include <asm/io.h> -#include <mach/pm-rcar.h> #include <mach/r8a7779.h> #include "common.h" +#include "pm-rcar.h" /* SYSC */ #define SYSCIER 0x0c #define SYSCIMR 0x10 +struct r8a7779_pm_domain { + struct generic_pm_domain genpd; + struct rcar_sysc_ch ch; +}; + +static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) +{ + return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; +} + #if defined(CONFIG_PM) || defined(CONFIG_SMP) static void __init r8a7779_sysc_init(void) --- 0001/arch/arm/mach-shmobile/pm-r8a7790.c +++ work/arch/arm/mach-shmobile/pm-r8a7790.c 2014-06-17 16:10:26.000000000 +0900 @@ -12,8 +12,8 @@ #include <linux/kernel.h> #include <asm/io.h> -#include <mach/pm-rcar.h> #include <mach/r8a7790.h> +#include "pm-rcar.h" /* SYSC */ #define SYSCIER 0x0c --- 0001/arch/arm/mach-shmobile/pm-rcar.c +++ work/arch/arm/mach-shmobile/pm-rcar.c 2014-06-17 16:10:26.000000000 +0900 @@ -13,7 +13,7 @@ #include <linux/mm.h> #include <linux/spinlock.h> #include <asm/io.h> -#include <mach/pm-rcar.h> +#include "pm-rcar.h" /* SYSC */ #define SYSCSR 0x00 --- /dev/null +++ work/arch/arm/mach-shmobile/pm-rcar.h 2014-06-17 16:10:26.000000000 +0900 @@ -0,0 +1,15 @@ +#ifndef PM_RCAR_H +#define PM_RCAR_H + +struct rcar_sysc_ch { + unsigned long chan_offs; + unsigned int chan_bit; + unsigned int isr_bit; +}; + +int rcar_sysc_power_down(struct rcar_sysc_ch *sysc_ch); +int rcar_sysc_power_up(struct rcar_sysc_ch *sysc_ch); +bool rcar_sysc_power_is_off(struct rcar_sysc_ch *sysc_ch); +void __iomem *rcar_sysc_init(phys_addr_t base); + +#endif /* PM_RCAR_H */ --- 0006/arch/arm/mach-shmobile/smp-r8a7779.c +++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-06-17 16:10:26.000000000 +0900 @@ -23,13 +23,13 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/delay.h> -#include <mach/pm-rcar.h> #include <mach/r8a7779.h> #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> #include <asm/smp_twd.h> #include "common.h" +#include "pm-rcar.h" #define AVECR IOMEM(0xfe700040) #define R8A7779_SCU_BASE 0xf0000000 --- 0006/arch/arm/mach-shmobile/smp-r8a7790.c +++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-06-17 16:10:26.000000000 +0900 @@ -18,9 +18,9 @@ #include <linux/smp.h> #include <linux/io.h> #include <asm/smp_plat.h> -#include <mach/pm-rcar.h> #include <mach/r8a7790.h> #include "common.h" +#include "pm-rcar.h" #define RST 0xe6160000 #define CA15BAR 0x0020 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (6 preceding siblings ...) 2014-06-17 7:47 ` [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm @ 2014-06-17 7:48 ` Magnus Damm 2014-06-17 11:05 ` [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Arnd Bergmann 2014-06-17 12:21 ` Simon Horman 9 siblings, 0 replies; 12+ messages in thread From: Magnus Damm @ 2014-06-17 7:48 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm+renesas@opensource.se> Change location of rcar-gen2.h so it can be used as #include "rcar-gen2.h" instead of the old style #include <mach/rcar-gen2.h>. Also clean up the r8a7790 case to follow the same style as r8a7791. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-koelsch-reference.c | 2 +- arch/arm/mach-shmobile/board-koelsch.c | 2 +- arch/arm/mach-shmobile/board-lager-reference.c | 2 +- arch/arm/mach-shmobile/board-lager.c | 1 + arch/arm/mach-shmobile/clock-r8a7790.c | 1 + arch/arm/mach-shmobile/clock-r8a7791.c | 2 +- arch/arm/mach-shmobile/include/mach/r8a7790.h | 2 -- arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8 -------- arch/arm/mach-shmobile/rcar-gen2.h | 8 ++++++++ arch/arm/mach-shmobile/setup-r8a7790.c | 1 + arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) --- 0006/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:15:58.000000000 +0900 @@ -23,12 +23,12 @@ #include <linux/kernel.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/rcar-gen2.h> #include <mach/r8a7791.h> #include <asm/mach/arch.h> #include "clock.h" #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-koelsch.c +++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:15:58.000000000 +0900 @@ -46,11 +46,11 @@ #include <linux/spi/rspi.h> #include <linux/spi/spi.h> #include <mach/r8a7791.h> -#include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:15:58.000000000 +0900 @@ -22,12 +22,12 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/rcar-gen2.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> #include "clock.h" #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:15:58.000000000 +0900 @@ -58,6 +58,7 @@ #include <sound/simple_card.h> #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* * SSI-AK4643 --- 0006/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:15:58.000000000 +0900 @@ -25,6 +25,7 @@ #include <mach/r8a7790.h> #include "clock.h" #include "common.h" +#include "rcar-gen2.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0006/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -23,9 +23,9 @@ #include <linux/kernel.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> -#include <mach/rcar-gen2.h> #include "clock.h" #include "common.h" +#include "rcar-gen2.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7790.h 2014-06-17 16:15:58.000000000 +0900 @@ -1,8 +1,6 @@ #ifndef __ASM_R8A7790_H__ #define __ASM_R8A7790_H__ -#include <mach/rcar-gen2.h> - /* DMA slave IDs */ enum { RCAR_DMA_SLAVE_INVALID, --- 0001/arch/arm/mach-shmobile/include/mach/rcar-gen2.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,8 +0,0 @@ -#ifndef __ASM_RCAR_GEN2_H__ -#define __ASM_RCAR_GEN2_H__ - -void rcar_gen2_timer_init(void); -#define MD(nr) BIT(nr) -u32 rcar_gen2_read_mode_pins(void); - -#endif /* __ASM_RCAR_GEN2_H__ */ --- /dev/null +++ work/arch/arm/mach-shmobile/rcar-gen2.h 2014-06-17 16:15:59.000000000 +0900 @@ -0,0 +1,8 @@ +#ifndef __ASM_RCAR_GEN2_H__ +#define __ASM_RCAR_GEN2_H__ + +void rcar_gen2_timer_init(void); +#define MD(nr) BIT(nr) +u32 rcar_gen2_read_mode_pins(void); + +#endif /* __ASM_RCAR_GEN2_H__ */ --- 0006/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:15:58.000000000 +0900 @@ -31,6 +31,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "rcar-gen2.h" /* Audio-DMAC */ #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ --- 0006/arch/arm/mach-shmobile/setup-r8a7791.c +++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -27,10 +27,10 @@ #include <linux/serial_sci.h> #include <linux/sh_timer.h> #include <mach/r8a7791.h> -#include <mach/rcar-gen2.h> #include <asm/mach/arch.h> #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" static const struct resource pfc_resources[] __initconst = { DEFINE_RES_MEM(0xe6060000, 0x250), --- 0006/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-06-17 16:15:58.000000000 +0900 @@ -22,9 +22,9 @@ #include <linux/clocksource.h> #include <linux/io.h> #include <linux/kernel.h> -#include <mach/rcar-gen2.h> #include <asm/mach/arch.h> #include "common.h" +#include "rcar-gen2.h" #define MODEMR 0xe6160060 --- 0006/arch/arm/mach-shmobile/smp-r8a7791.c +++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -19,8 +19,8 @@ #include <linux/io.h> #include <asm/smp_plat.h> #include <mach/r8a7791.h> -#include <mach/rcar-gen2.h> #include "common.h" +#include "rcar-gen2.h" #define RST 0xe6160000 #define CA15BAR 0x0020 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 00/08] ARM: shmobile: Rework include path V2 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (7 preceding siblings ...) 2014-06-17 7:48 ` [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm @ 2014-06-17 11:05 ` Arnd Bergmann 2014-06-17 12:21 ` Simon Horman 9 siblings, 0 replies; 12+ messages in thread From: Arnd Bergmann @ 2014-06-17 11:05 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 17 June 2014, Magnus Damm wrote: > Please note that these are only lightly compile tested with a handful > of defconfigs, but any potential issue should be trivial to fix. > > Also, there are certain bits of arch/arm/mach-shmobile/include/mach/ > get included from places like arch/arm/boot/compressed/ (booting > legacy kernel directly from reset vector) and also from SoC specific > legacy code under drivers/pinctrl. My proposal is to keep those users > as-is until we phase out legacy board support (2-3 kernels?), let me > know if you would like to get rid of "include/mach" sooner! If it's only about arch/arm/boot/compressed, you can just move the header files to the same directory, as nothing else includes them. I've played with a full multiplatform conversion of a few platforms including shmobile in the past, and all I needed for the legacy pinctrl drivers was to duplicate the irq_pin() definition, which is probably a reasonable hack for code that we know is going away anyway, just add a comment for both definitions explaining that they have to be kept in sync. This one is less obvious than the boot header. One general comment: please use 'git format-patch -M' or set the 'diff.renames' git option for sending patches for reviews that rename files. No need to send this patch set again. Arnd ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 00/08] ARM: shmobile: Rework include path V2 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm ` (8 preceding siblings ...) 2014-06-17 11:05 ` [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Arnd Bergmann @ 2014-06-17 12:21 ` Simon Horman 9 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2014-06-17 12:21 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 17, 2014 at 04:46:58PM +0900, Magnus Damm wrote: > ARM: shmobile: Rework include path V2 > > [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage > [PATCH v2 02/08] ARM: shmobile: Move dma-register.h > [PATCH v2 03/08] ARM: shmobile: Move clock.h > [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl > [PATCH v2 05/08] ARM: shmobile: Move common.h > [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h > [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case > [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case > > Olof, here my latest take on the header move that you requested earlier. > > This particular series hopefully follows your proposed way and moves the > most common shared header files for mach-shmobile from <mach/foobar.h> > to "foobar.h" without any workaround. Left are still per-SoC header files > that will be moved once I know you are comformatble with this format. > > Please note that these are only lightly compile tested with a handful > of defconfigs, but any potential issue should be trivial to fix. > > Also, there are certain bits of arch/arm/mach-shmobile/include/mach/ > get included from places like arch/arm/boot/compressed/ (booting > legacy kernel directly from reset vector) and also from SoC specific > legacy code under drivers/pinctrl. My proposal is to keep those users > as-is until we phase out legacy board support (2-3 kernels?), let me > know if you would like to get rid of "include/mach" sooner! > > Simon, can you please this pick up and include in your rebase to v3.16-rc1? > > Changes since V1: > - rebased to v3.16-rc1 > > Thanks to Geert and Arnd for review support! Thanks Magnus, I have queued this up. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-06-18 14:55 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm 2014-06-17 7:47 ` [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm 2014-06-17 7:47 ` [PATCH v2 02/08] ARM: shmobile: Move dma-register.h Magnus Damm 2014-06-17 7:47 ` [PATCH v2 03/08] ARM: shmobile: Move clock.h Magnus Damm 2014-06-17 7:47 ` [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm 2014-06-18 14:55 ` Simon Horman 2014-06-17 7:47 ` [PATCH v2 05/08] ARM: shmobile: Move common.h Magnus Damm 2014-06-17 7:47 ` [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm 2014-06-17 7:47 ` [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm 2014-06-17 7:48 ` [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm 2014-06-17 11:05 ` [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Arnd Bergmann 2014-06-17 12:21 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).