ARM: ux500: first multiplatform series
Subsystems (11)
cover ARM: ux500: first multiplatform series
From: Linus Walleij <[email protected]>
This is the first set in my ux500 multiplatform series. As you can see it starts out by getting rid of three files in <mach/*>. It's enough stuff to discuss already, and relates to my recent question of whether the mailbox subsystem can be merged into the ARM SoC tree.
Linus Walleij (6):
ARM: ux500: move debugmacro to debug includes
clk: ux500: pass clock base adresses in init call
mfd: prcmu: pass a base and size with the early initcall
mfd: db8500-prcmu: get base address from resource
ARM: ux500: move PRCMU functions into the CPUidle driver
ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
arch/arm/Kconfig.debug | 8 + arch/arm/include/debug/ux500.S | 48 ++++++ arch/arm/mach-ux500/board-mop500-audio.c | 1 - arch/arm/mach-ux500/board-mop500-pins.c | 2 - arch/arm/mach-ux500/board-mop500-sdi.c | 2 +- arch/arm/mach-ux500/board-mop500-uib.c | 1 - arch/arm/mach-ux500/board-mop500.c | 2 +- arch/arm/mach-ux500/cache-l2x0.c | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 6 +- arch/arm/mach-ux500/cpu.c | 25 +-- arch/arm/mach-ux500/cpuidle.c | 148 +++++++++++++++++- arch/arm/mach-ux500/db8500-regs.h | 201 ++++++++++++++++++++++++ arch/arm/mach-ux500/devices-common.c | 1 - arch/arm/mach-ux500/devices-db8500.c | 8 +- arch/arm/mach-ux500/devices-db8500.h | 1 + arch/arm/mach-ux500/devices.c | 3 +- arch/arm/mach-ux500/id.c | 2 +- arch/arm/mach-ux500/include/mach/db8500-regs.h | 173 --------------------- arch/arm/mach-ux500/include/mach/debug-macro.S | 39 ----- arch/arm/mach-ux500/include/mach/hardware.h | 47 ------ arch/arm/mach-ux500/include/mach/irqs.h | 2 - arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-ux500/timer.c | 2 +- arch/arm/mach-ux500/usb.c | 2 +- drivers/clk/ux500/clk-prcc.c | 1 - drivers/clk/ux500/u8500_clk.c | 142 ++++++++--------- drivers/clocksource/clksrc-dbx500-prcmu.c | 1 - drivers/mfd/db8500-prcmu.c | 176 +++++---------------- drivers/mfd/dbx500-prcmu-regs.h | 204 +++++++++++-------------- include/linux/mfd/db8500-prcmu.h | 10 +- include/linux/mfd/dbx500-prcmu.h | 36 +---- include/linux/platform_data/clk-ux500.h | 3 +- 33 files changed, 647 insertions(+), 657 deletions(-) create mode 100644 arch/arm/include/debug/ux500.S create mode 100644 arch/arm/mach-ux500/db8500-regs.h delete mode 100644 arch/arm/mach-ux500/include/mach/db8500-regs.h delete mode 100644 arch/arm/mach-ux500/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h
Signature · 1 line
1.7.11.3
PATCH 1/6 ARM: ux500: move debugmacro to debug includes
From: Linus Walleij <[email protected]>
This moves the Ux500 debug macro to the debug headers to make way for multiplatform support.
--- arch/arm/Kconfig.debug | 8 ++++++ arch/arm/include/debug/ux500.S | 39 ++++++++++++++++++++++++++ arch/arm/mach-ux500/include/mach/debug-macro.S | 39 -------------------------- 3 files changed, 47 insertions(+), 39 deletions(-) create mode 100644 arch/arm/include/debug/ux500.S delete mode 100644 arch/arm/mach-ux500/include/mach/debug-macro.S
arch/arm/Kconfig.debug +8 -0
@@ -414,6 +414,13 @@ choice Say Y here if you want the debug print routines to direct their output to the uart1 port on SiRFmarco devices. + config DEBUG_UX500_UART + depends on ARCH_U8500 + bool "Use Ux500 UART for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on Ux500 based platforms. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -598,6 +605,7 @@ config DEBUG_LL_INCLUDE DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 default "debug/vt8500.S" if DEBUG_VT8500_UART0 default "debug/tegra.S" if DEBUG_TEGRA_UART + default "debug/ux500.S" if DEBUG_UX500_UART default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S"
arch/arm/include/debug/ux500.S new file +39 -0
@@ -0,0 +1,39 @@ +/* + * Debugging macro include header + * + * Copyright (C) 2009 ST-Ericsson + * + * 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. + * + */ +#include <mach/hardware.h> + +#if CONFIG_UX500_DEBUG_UART > 2 +#error Invalid Ux500 debug UART +#endif + +/* + * DEBUG_LL only works if only one SOC is built in. We don't use #else below + * in order to get "__UX500_UART redefined" warnings if more than one SOC is + * built, so that there's some hint during the build that something is wrong. + */ + +#ifdef CONFIG_UX500_SOC_DB8500 +#define __UX500_UART(n) U8500_UART##n##_BASE +#endif + +#ifndef __UX500_UART +#error Unknown SOC +#endif + +#define UX500_UART(n) __UX500_UART(n) +#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) + + .macro addruart, rp, rv, tmp + ldr \rp, =UART_BASE @ no, physical address + ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address + .endm + +#include <asm/hardware/debug-pl01x.S>
arch/arm/mach-ux500/include/mach/debug-macro.S deleted +0 -39
@@ -1,39 +0,0 @@ -/* - * Debugging macro include header - * - * Copyright (C) 2009 ST-Ericsson - * - * 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. - * - */ -#include <mach/hardware.h> - -#if CONFIG_UX500_DEBUG_UART > 2 -#error Invalid Ux500 debug UART -#endif - -/* - * DEBUG_LL only works if only one SOC is built in. We don't use #else below - * in order to get "__UX500_UART redefined" warnings if more than one SOC is - * built, so that there's some hint during the build that something is wrong. - */ - -#ifdef CONFIG_UX500_SOC_DB8500 -#define __UX500_UART(n) U8500_UART##n##_BASE -#endif - -#ifndef __UX500_UART -#error Unknown SOC -#endif - -#define UX500_UART(n) __UX500_UART(n) -#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) - - .macro addruart, rp, rv, tmp - ldr \rp, =UART_BASE @ no, physical address - ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address - .endm - -#include <asm/hardware/debug-pl01x.S>
Signature · 1 line
1.7.11.3
PATCH 1/6 ARM: ux500: move debugmacro to debug includes
Quoted 6 lines · On Thursday 21 March 2013 12:49:08 Linus Walleij wrote:
From: Linus Walleij <[email protected]>
This moves the Ux500 debug macro to the debug headers to make way for multiplatform support.
Signed-off-by Linus Walleij <[email protected]>
PATCH 2/6 clk: ux500: pass clock base adresses in init call
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
The ux500 clock driver was including <mach/db8500-regs.h> which will not work when building for multiplatform support since <mach/*> is going away.
Pass the base adresses in the init call instead.
---
Requesting an ACK from Mike on this to merge it through the ARM SoC tree eventually.
--- arch/arm/mach-ux500/cpu.c | 4 +- drivers/clk/ux500/u8500_clk.c | 142 ++++++++++++++++---------------- include/linux/platform_data/clk-ux500.h | 3 +- 3 files changed, 76 insertions(+), 73 deletions(-)
arch/arm/mach-ux500/cpu.c +3 -1
@@ -72,7 +72,9 @@ void __init ux500_init_irq(void)db8500_prcmu_early_init ();if (cpu_is_u8500_family () ||cpu_is_u9540 ()) -u8500_clk_init (); +u8500_clk_init (U8500_CLKRST1_BASE ,U8500_CLKRST2_BASE , +U8500_CLKRST3_BASE ,U8500_CLKRST5_BASE , +U8500_CLKRST6_BASE );else if (cpu_is_u8540 ())u8540_clk_init (); }
drivers/clk/ux500/u8500_clk.c +71 -71
383 lines not on this page · raw message
include/linux/platform_data/clk-ux500.h +2 -1
@@ -10,7 +10,8 @@#ifndef __CLK_UX500_H#define __CLK_UX500_H -void u8500_clk_init (void ); +void u8500_clk_init (u32 clkrst1_base,u32 clkrst2_base,u32 clkrst3_base, +u32 clkrst5_base,u32 clkrst6_base);void u9540_clk_init (void );void u8540_clk_init (void );
Signature · 1 line
1.7.11.3
PATCH 2/6 clk: ux500: pass clock base adresses in init call
Quoted 11 lines · On Thursday 21 March 2013 12:49:09 Linus Walleij wrote:
From: Linus Walleij <[email protected]>
The ux500 clock driver was including <
mach/db8500-regs.h> which will not work when building for multiplatform support since <mach/*> is going away.Pass the base adresses in the init call instead.
Cc Ulf Hansson <[email protected]>Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>
It would be nicer to read the base addresses from DT properties and convert the driver to use CLK_OF_DECLARE(), but this works too, and it leaves the non-DT path alone for now.
PATCH 2/6 clk: ux500: pass clock base adresses in init call
In reply to Linus WalleijQuoted 441 lines · Linus Walleij
From: Linus Walleij <[email protected]>
The ux500 clock driver was including <
mach/db8500-regs.h> which will not work when building for multiplatform support since <mach/*> is going away.Pass the base adresses in the init call instead.
Cc Ulf Hansson <[email protected]>Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Requesting an ACK from Mike on this to merge it through the ARM SoC tree eventually.--- arch/arm/mach-ux500/cpu.c | 4 +- drivers/clk/ux500/u8500_clk.c | 142 ++++++++++++++++---------------- include/linux/platform_data/clk-ux500.h | 3 +- 3 files changed, 76 insertions(+), 73 deletions(-)arch/arm/mach-ux500/cpu.c +3
-1@@ -72,7 +72,9 @@ void __init ux500_init_irq(void)db8500_prcmu_early_init ();if (cpu_is_u8500_family () ||cpu_is_u9540 ()) -u8500_clk_init (); +u8500_clk_init (U8500_CLKRST1_BASE ,U8500_CLKRST2_BASE , +U8500_CLKRST3_BASE ,U8500_CLKRST5_BASE , +U8500_CLKRST6_BASE );else if (cpu_is_u8540 ())u8540_clk_init (); }drivers/clk/ux500/u8500_clk.c +71
-71@@ -12,10 +12,10 @@#include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h> -#include <mach/db8500-regs.h> #include "clk.h" -void u8500_clk_init (void ) +void u8500_clk_init (u32 clkrst1_base,u32 clkrst2_base,u32 clkrst3_base, +u32 clkrst5_base,u32 clkrst6_base) {struct prcmu_fw_version *fw_version;const char *sgaclk_parent =NULL ;@@ -215,147 +215,147 @@ void u8500_clk_init(void)*/ /* PRCC P-clocks */ - clk =clk_reg_prcc_pclk ("p1_pclk0" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk0" ,"per1clk" , clkrst1_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart0" ); - clk =clk_reg_prcc_pclk ("p1_pclk1" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk1" ,"per1clk" , clkrst1_base,BIT (1 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart1" ); - clk =clk_reg_prcc_pclk ("p1_pclk2" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk2" ,"per1clk" , clkrst1_base,BIT (2 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.1" ); - clk =clk_reg_prcc_pclk ("p1_pclk3" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk3" ,"per1clk" , clkrst1_base,BIT (3 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp0" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.0" ); - clk =clk_reg_prcc_pclk ("p1_pclk4" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk4" ,"per1clk" , clkrst1_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp1" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.1" ); - clk =clk_reg_prcc_pclk ("p1_pclk5" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk5" ,"per1clk" , clkrst1_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi0" ); - clk =clk_reg_prcc_pclk ("p1_pclk6" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk6" ,"per1clk" , clkrst1_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.2" ); - clk =clk_reg_prcc_pclk ("p1_pclk7" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk7" ,"per1clk" , clkrst1_base,BIT (7 ),0 );clk_register_clkdev (clk,NULL ,"spi3" ); - clk =clk_reg_prcc_pclk ("p1_pclk8" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk8" ,"per1clk" , clkrst1_base,BIT (8 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"slimbus0" ); - clk =clk_reg_prcc_pclk ("p1_pclk9" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk9" ,"per1clk" , clkrst1_base,BIT (9 ),0 );clk_register_clkdev (clk,NULL ,"gpio.0" );clk_register_clkdev (clk,NULL ,"gpio.1" );clk_register_clkdev (clk,NULL ,"gpioblock0" ); - clk =clk_reg_prcc_pclk ("p1_pclk10" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk10" ,"per1clk" , clkrst1_base,BIT (10 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.4" ); - clk =clk_reg_prcc_pclk ("p1_pclk11" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk11" ,"per1clk" , clkrst1_base,BIT (11 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp3" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.3" ); - clk =clk_reg_prcc_pclk ("p2_pclk0" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk0" ,"per2clk" , clkrst2_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.3" ); - clk =clk_reg_prcc_pclk ("p2_pclk1" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk1" ,"per2clk" , clkrst2_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"spi2" ); - clk =clk_reg_prcc_pclk ("p2_pclk2" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk2" ,"per2clk" , clkrst2_base,BIT (2 ),0 );clk_register_clkdev (clk,NULL ,"spi1" ); - clk =clk_reg_prcc_pclk ("p2_pclk3" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk3" ,"per2clk" , clkrst2_base,BIT (3 ),0 );clk_register_clkdev (clk,NULL ,"pwl" ); - clk =clk_reg_prcc_pclk ("p2_pclk4" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk4" ,"per2clk" , clkrst2_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi4" ); - clk =clk_reg_prcc_pclk ("p2_pclk5" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk5" ,"per2clk" , clkrst2_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp2" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.2" ); - clk =clk_reg_prcc_pclk ("p2_pclk6" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk6" ,"per2clk" , clkrst2_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi1" ); - clk =clk_reg_prcc_pclk ("p2_pclk7" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk7" ,"per2clk" , clkrst2_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi3" ); - clk =clk_reg_prcc_pclk ("p2_pclk8" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk8" ,"per2clk" , clkrst2_base,BIT (8 ),0 );clk_register_clkdev (clk,NULL ,"spi0" ); - clk =clk_reg_prcc_pclk ("p2_pclk9" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk9" ,"per2clk" , clkrst2_base,BIT (9 ),0 );clk_register_clkdev (clk,"hsir_hclk" ,"ste_hsi.0" ); - clk =clk_reg_prcc_pclk ("p2_pclk10" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk10" ,"per2clk" , clkrst2_base,BIT (10 ),0 );clk_register_clkdev (clk,"hsit_hclk" ,"ste_hsi.0" ); - clk =clk_reg_prcc_pclk ("p2_pclk11" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk11" ,"per2clk" , clkrst2_base,BIT (11 ),0 );clk_register_clkdev (clk,NULL ,"gpio.6" );clk_register_clkdev (clk,NULL ,"gpio.7" );clk_register_clkdev (clk,NULL ,"gpioblock1" ); - clk =clk_reg_prcc_pclk ("p2_pclk12" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk12" ,"per2clk" , clkrst2_base,BIT (12 ),0 ); - clk =clk_reg_prcc_pclk ("p3_pclk0" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk0" ,"per3clk" , clkrst3_base,BIT (0 ),0 );clk_register_clkdev (clk,NULL ,"fsmc" ); - clk =clk_reg_prcc_pclk ("p3_pclk1" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk1" ,"per3clk" , clkrst3_base,BIT (1 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ssp0" ); - clk =clk_reg_prcc_pclk ("p3_pclk2" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk2" ,"per3clk" , clkrst3_base,BIT (2 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ssp1" ); - clk =clk_reg_prcc_pclk ("p3_pclk3" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk3" ,"per3clk" , clkrst3_base,BIT (3 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.0" ); - clk =clk_reg_prcc_pclk ("p3_pclk4" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk4" ,"per3clk" , clkrst3_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi2" ); - clk =clk_reg_prcc_pclk ("p3_pclk5" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk5" ,"per3clk" , clkrst3_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ske" );clk_register_clkdev (clk,"apb_pclk" ,"nmk-ske-keypad" ); - clk =clk_reg_prcc_pclk ("p3_pclk6" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk6" ,"per3clk" , clkrst3_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart2" ); - clk =clk_reg_prcc_pclk ("p3_pclk7" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk7" ,"per3clk" , clkrst3_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi5" ); - clk =clk_reg_prcc_pclk ("p3_pclk8" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk8" ,"per3clk" , clkrst3_base,BIT (8 ),0 );clk_register_clkdev (clk,NULL ,"gpio.2" );clk_register_clkdev (clk,NULL ,"gpio.3" );@@ -363,45 +363,45 @@ void u8500_clk_init(void)clk_register_clkdev (clk,NULL ,"gpio.5" );clk_register_clkdev (clk,NULL ,"gpioblock2" ); - clk =clk_reg_prcc_pclk ("p5_pclk0" ,"per5clk" ,U8500_CLKRST5_BASE , + clk =clk_reg_prcc_pclk ("p5_pclk0" ,"per5clk" , clkrst5_base,BIT (0 ),0 );clk_register_clkdev (clk,"usb" ,"musb-ux500.0" ); - clk =clk_reg_prcc_pclk ("p5_pclk1" ,"per5clk" ,U8500_CLKRST5_BASE , + clk =clk_reg_prcc_pclk ("p5_pclk1" ,"per5clk" , clkrst5_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"gpio.8" );clk_register_clkdev (clk,NULL ,"gpioblock3" ); - clk =clk_reg_prcc_pclk ("p6_pclk0" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk0" ,"per6clk" , clkrst6_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"rng" ); - clk =clk_reg_prcc_pclk ("p6_pclk1" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk1" ,"per6clk" , clkrst6_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"cryp0" );clk_register_clkdev (clk,NULL ,"cryp1" ); - clk =clk_reg_prcc_pclk ("p6_pclk2" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk2" ,"per6clk" , clkrst6_base,BIT (2 ),0 );clk_register_clkdev (clk,NULL ,"hash0" ); - clk =clk_reg_prcc_pclk ("p6_pclk3" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk3" ,"per6clk" , clkrst6_base,BIT (3 ),0 );clk_register_clkdev (clk,NULL ,"pka" ); - clk =clk_reg_prcc_pclk ("p6_pclk4" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk4" ,"per6clk" , clkrst6_base,BIT (4 ),0 );clk_register_clkdev (clk,NULL ,"hash1" ); - clk =clk_reg_prcc_pclk ("p6_pclk5" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk5" ,"per6clk" , clkrst6_base,BIT (5 ),0 );clk_register_clkdev (clk,NULL ,"cfgreg" ); - clk =clk_reg_prcc_pclk ("p6_pclk6" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk6" ,"per6clk" , clkrst6_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"mtu0" ); - clk =clk_reg_prcc_pclk ("p6_pclk7" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk7" ,"per6clk" , clkrst6_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"mtu1" );@@ -415,110 +415,110 @@ void u8500_clk_init(void)/* Periph1 */ clk =clk_reg_prcc_kclk ("p1_uart0_kclk" ,"uartclk" , -U8500_CLKRST1_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart0" ); clk =clk_reg_prcc_kclk ("p1_uart1_kclk" ,"uartclk" , -U8500_CLKRST1_BASE ,BIT (1 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (1 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart1" ); clk =clk_reg_prcc_kclk ("p1_i2c1_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.1" ); clk =clk_reg_prcc_kclk ("p1_msp0_kclk" ,"msp02clk" , -U8500_CLKRST1_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp0" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.0" ); clk =clk_reg_prcc_kclk ("p1_msp1_kclk" ,"msp1clk" , -U8500_CLKRST1_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp1" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.1" ); clk =clk_reg_prcc_kclk ("p1_sdi0_kclk" ,"sdmmcclk" , -U8500_CLKRST1_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi0" ); clk =clk_reg_prcc_kclk ("p1_i2c2_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (6 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (6 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.2" ); clk =clk_reg_prcc_kclk ("p1_slimbus0_kclk" ,"slimclk" , -U8500_CLKRST1_BASE ,BIT (8 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (8 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"slimbus0" ); clk =clk_reg_prcc_kclk ("p1_i2c4_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (9 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (9 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.4" ); clk =clk_reg_prcc_kclk ("p1_msp3_kclk" ,"msp1clk" , -U8500_CLKRST1_BASE ,BIT (10 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (10 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp3" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.3" );/* Periph2 */ clk =clk_reg_prcc_kclk ("p2_i2c3_kclk" ,"i2cclk" , -U8500_CLKRST2_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.3" ); clk =clk_reg_prcc_kclk ("p2_sdi4_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi4" ); clk =clk_reg_prcc_kclk ("p2_msp2_kclk" ,"msp02clk" , -U8500_CLKRST2_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp2" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.2" ); clk =clk_reg_prcc_kclk ("p2_sdi1_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi1" ); clk =clk_reg_prcc_kclk ("p2_sdi3_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi3" );/* Note that rate is received from parent. */ clk =clk_reg_prcc_kclk ("p2_ssirx_kclk" ,"hsirxclk" , -U8500_CLKRST2_BASE ,BIT (6 ), + clkrst2_base,BIT (6 ),CLK_SET_RATE_GATE |CLK_SET_RATE_PARENT ); clk =clk_reg_prcc_kclk ("p2_ssitx_kclk" ,"hsitxclk" , -U8500_CLKRST2_BASE ,BIT (7 ), + clkrst2_base,BIT (7 ),CLK_SET_RATE_GATE |CLK_SET_RATE_PARENT );/* Periph3 */ clk =clk_reg_prcc_kclk ("p3_ssp0_kclk" ,"sspclk" , -U8500_CLKRST3_BASE ,BIT (1 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (1 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ssp0" ); clk =clk_reg_prcc_kclk ("p3_ssp1_kclk" ,"sspclk" , -U8500_CLKRST3_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ssp1" ); clk =clk_reg_prcc_kclk ("p3_i2c0_kclk" ,"i2cclk" , -U8500_CLKRST3_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.0" ); clk =clk_reg_prcc_kclk ("p3_sdi2_kclk" ,"sdmmcclk" , -U8500_CLKRST3_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi2" ); clk =clk_reg_prcc_kclk ("p3_ske_kclk" ,"rtc32k" , -U8500_CLKRST3_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ske" );clk_register_clkdev (clk,NULL ,"nmk-ske-keypad" ); clk =clk_reg_prcc_kclk ("p3_uart2_kclk" ,"uartclk" , -U8500_CLKRST3_BASE ,BIT (6 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (6 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart2" ); clk =clk_reg_prcc_kclk ("p3_sdi5_kclk" ,"sdmmcclk" , -U8500_CLKRST3_BASE ,BIT (7 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (7 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi5" );/* Periph6 */ clk =clk_reg_prcc_kclk ("p3_rng_kclk" ,"rngclk" , -U8500_CLKRST6_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst6_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"rng" ); }include/linux/platform_data/clk-ux500.h +2
-2@@ -10,7 +10,8 @@#ifndef __CLK_UX500_H#define __CLK_UX500_H -void u8500_clk_init (void ); +void u8500_clk_init (u32 clkrst1_base,u32 clkrst2_base,u32 clkrst3_base, +u32 clkrst5_base,u32 clkrst6_base);void u9540_clk_init (void );void u8540_clk_init (void ); --
Quoted 2 lines
1.7.11.3
PATCH 2/6 clk: ux500: pass clock base adresses in init call
In reply to Linus WalleijQuoting Linus Walleij (2013-03-21 04:49:09)
Quoted 8 lines
From: Linus Walleij <[email protected]>
The ux500 clock driver was including <
mach/db8500-regs.h> which will not work when building for multiplatform support since <mach/*> is going away.Pass the base adresses in the init call instead.
Quoted 7 lines
Cc Ulf Hansson <[email protected]>Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Requesting an ACK from Mike on this to merge it through the ARM SoC tree eventually.
---
Quoted 427 lines
arch/arm/mach-ux500/cpu.c | 4 +- drivers/clk/ux500/u8500_clk.c | 142 ++++++++++++++++---------------- include/linux/platform_data/clk-ux500.h | 3 +- 3 files changed, 76 insertions(+), 73 deletions(-)arch/arm/mach-ux500/cpu.c +3
-1@@ -72,7 +72,9 @@ void __init ux500_init_irq(void)db8500_prcmu_early_init ();if (cpu_is_u8500_family () ||cpu_is_u9540 ()) -u8500_clk_init (); +u8500_clk_init (U8500_CLKRST1_BASE ,U8500_CLKRST2_BASE , +U8500_CLKRST3_BASE ,U8500_CLKRST5_BASE , +U8500_CLKRST6_BASE );else if (cpu_is_u8540 ())u8540_clk_init (); }drivers/clk/ux500/u8500_clk.c +71
-71@@ -12,10 +12,10 @@#include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h> -#include <mach/db8500-regs.h> #include "clk.h" -void u8500_clk_init (void ) +void u8500_clk_init (u32 clkrst1_base,u32 clkrst2_base,u32 clkrst3_base, +u32 clkrst5_base,u32 clkrst6_base) {struct prcmu_fw_version *fw_version;const char *sgaclk_parent =NULL ;@@ -215,147 +215,147 @@ void u8500_clk_init(void)*/ /* PRCC P-clocks */ - clk =clk_reg_prcc_pclk ("p1_pclk0" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk0" ,"per1clk" , clkrst1_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart0" ); - clk =clk_reg_prcc_pclk ("p1_pclk1" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk1" ,"per1clk" , clkrst1_base,BIT (1 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart1" ); - clk =clk_reg_prcc_pclk ("p1_pclk2" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk2" ,"per1clk" , clkrst1_base,BIT (2 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.1" ); - clk =clk_reg_prcc_pclk ("p1_pclk3" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk3" ,"per1clk" , clkrst1_base,BIT (3 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp0" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.0" ); - clk =clk_reg_prcc_pclk ("p1_pclk4" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk4" ,"per1clk" , clkrst1_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp1" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.1" ); - clk =clk_reg_prcc_pclk ("p1_pclk5" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk5" ,"per1clk" , clkrst1_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi0" ); - clk =clk_reg_prcc_pclk ("p1_pclk6" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk6" ,"per1clk" , clkrst1_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.2" ); - clk =clk_reg_prcc_pclk ("p1_pclk7" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk7" ,"per1clk" , clkrst1_base,BIT (7 ),0 );clk_register_clkdev (clk,NULL ,"spi3" ); - clk =clk_reg_prcc_pclk ("p1_pclk8" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk8" ,"per1clk" , clkrst1_base,BIT (8 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"slimbus0" ); - clk =clk_reg_prcc_pclk ("p1_pclk9" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk9" ,"per1clk" , clkrst1_base,BIT (9 ),0 );clk_register_clkdev (clk,NULL ,"gpio.0" );clk_register_clkdev (clk,NULL ,"gpio.1" );clk_register_clkdev (clk,NULL ,"gpioblock0" ); - clk =clk_reg_prcc_pclk ("p1_pclk10" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk10" ,"per1clk" , clkrst1_base,BIT (10 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.4" ); - clk =clk_reg_prcc_pclk ("p1_pclk11" ,"per1clk" ,U8500_CLKRST1_BASE , + clk =clk_reg_prcc_pclk ("p1_pclk11" ,"per1clk" , clkrst1_base,BIT (11 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp3" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.3" ); - clk =clk_reg_prcc_pclk ("p2_pclk0" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk0" ,"per2clk" , clkrst2_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.3" ); - clk =clk_reg_prcc_pclk ("p2_pclk1" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk1" ,"per2clk" , clkrst2_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"spi2" ); - clk =clk_reg_prcc_pclk ("p2_pclk2" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk2" ,"per2clk" , clkrst2_base,BIT (2 ),0 );clk_register_clkdev (clk,NULL ,"spi1" ); - clk =clk_reg_prcc_pclk ("p2_pclk3" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk3" ,"per2clk" , clkrst2_base,BIT (3 ),0 );clk_register_clkdev (clk,NULL ,"pwl" ); - clk =clk_reg_prcc_pclk ("p2_pclk4" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk4" ,"per2clk" , clkrst2_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi4" ); - clk =clk_reg_prcc_pclk ("p2_pclk5" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk5" ,"per2clk" , clkrst2_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"msp2" );clk_register_clkdev (clk,"apb_pclk" ,"ux500-msp-i2s.2" ); - clk =clk_reg_prcc_pclk ("p2_pclk6" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk6" ,"per2clk" , clkrst2_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi1" ); - clk =clk_reg_prcc_pclk ("p2_pclk7" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk7" ,"per2clk" , clkrst2_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi3" ); - clk =clk_reg_prcc_pclk ("p2_pclk8" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk8" ,"per2clk" , clkrst2_base,BIT (8 ),0 );clk_register_clkdev (clk,NULL ,"spi0" ); - clk =clk_reg_prcc_pclk ("p2_pclk9" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk9" ,"per2clk" , clkrst2_base,BIT (9 ),0 );clk_register_clkdev (clk,"hsir_hclk" ,"ste_hsi.0" ); - clk =clk_reg_prcc_pclk ("p2_pclk10" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk10" ,"per2clk" , clkrst2_base,BIT (10 ),0 );clk_register_clkdev (clk,"hsit_hclk" ,"ste_hsi.0" ); - clk =clk_reg_prcc_pclk ("p2_pclk11" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk11" ,"per2clk" , clkrst2_base,BIT (11 ),0 );clk_register_clkdev (clk,NULL ,"gpio.6" );clk_register_clkdev (clk,NULL ,"gpio.7" );clk_register_clkdev (clk,NULL ,"gpioblock1" ); - clk =clk_reg_prcc_pclk ("p2_pclk12" ,"per2clk" ,U8500_CLKRST2_BASE , + clk =clk_reg_prcc_pclk ("p2_pclk12" ,"per2clk" , clkrst2_base,BIT (12 ),0 ); - clk =clk_reg_prcc_pclk ("p3_pclk0" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk0" ,"per3clk" , clkrst3_base,BIT (0 ),0 );clk_register_clkdev (clk,NULL ,"fsmc" ); - clk =clk_reg_prcc_pclk ("p3_pclk1" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk1" ,"per3clk" , clkrst3_base,BIT (1 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ssp0" ); - clk =clk_reg_prcc_pclk ("p3_pclk2" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk2" ,"per3clk" , clkrst3_base,BIT (2 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ssp1" ); - clk =clk_reg_prcc_pclk ("p3_pclk3" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk3" ,"per3clk" , clkrst3_base,BIT (3 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"nmk-i2c.0" ); - clk =clk_reg_prcc_pclk ("p3_pclk4" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk4" ,"per3clk" , clkrst3_base,BIT (4 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi2" ); - clk =clk_reg_prcc_pclk ("p3_pclk5" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk5" ,"per3clk" , clkrst3_base,BIT (5 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"ske" );clk_register_clkdev (clk,"apb_pclk" ,"nmk-ske-keypad" ); - clk =clk_reg_prcc_pclk ("p3_pclk6" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk6" ,"per3clk" , clkrst3_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"uart2" ); - clk =clk_reg_prcc_pclk ("p3_pclk7" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk7" ,"per3clk" , clkrst3_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"sdi5" ); - clk =clk_reg_prcc_pclk ("p3_pclk8" ,"per3clk" ,U8500_CLKRST3_BASE , + clk =clk_reg_prcc_pclk ("p3_pclk8" ,"per3clk" , clkrst3_base,BIT (8 ),0 );clk_register_clkdev (clk,NULL ,"gpio.2" );clk_register_clkdev (clk,NULL ,"gpio.3" );@@ -363,45 +363,45 @@ void u8500_clk_init(void)clk_register_clkdev (clk,NULL ,"gpio.5" );clk_register_clkdev (clk,NULL ,"gpioblock2" ); - clk =clk_reg_prcc_pclk ("p5_pclk0" ,"per5clk" ,U8500_CLKRST5_BASE , + clk =clk_reg_prcc_pclk ("p5_pclk0" ,"per5clk" , clkrst5_base,BIT (0 ),0 );clk_register_clkdev (clk,"usb" ,"musb-ux500.0" ); - clk =clk_reg_prcc_pclk ("p5_pclk1" ,"per5clk" ,U8500_CLKRST5_BASE , + clk =clk_reg_prcc_pclk ("p5_pclk1" ,"per5clk" , clkrst5_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"gpio.8" );clk_register_clkdev (clk,NULL ,"gpioblock3" ); - clk =clk_reg_prcc_pclk ("p6_pclk0" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk0" ,"per6clk" , clkrst6_base,BIT (0 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"rng" ); - clk =clk_reg_prcc_pclk ("p6_pclk1" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk1" ,"per6clk" , clkrst6_base,BIT (1 ),0 );clk_register_clkdev (clk,NULL ,"cryp0" );clk_register_clkdev (clk,NULL ,"cryp1" ); - clk =clk_reg_prcc_pclk ("p6_pclk2" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk2" ,"per6clk" , clkrst6_base,BIT (2 ),0 );clk_register_clkdev (clk,NULL ,"hash0" ); - clk =clk_reg_prcc_pclk ("p6_pclk3" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk3" ,"per6clk" , clkrst6_base,BIT (3 ),0 );clk_register_clkdev (clk,NULL ,"pka" ); - clk =clk_reg_prcc_pclk ("p6_pclk4" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk4" ,"per6clk" , clkrst6_base,BIT (4 ),0 );clk_register_clkdev (clk,NULL ,"hash1" ); - clk =clk_reg_prcc_pclk ("p6_pclk5" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk5" ,"per6clk" , clkrst6_base,BIT (5 ),0 );clk_register_clkdev (clk,NULL ,"cfgreg" ); - clk =clk_reg_prcc_pclk ("p6_pclk6" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk6" ,"per6clk" , clkrst6_base,BIT (6 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"mtu0" ); - clk =clk_reg_prcc_pclk ("p6_pclk7" ,"per6clk" ,U8500_CLKRST6_BASE , + clk =clk_reg_prcc_pclk ("p6_pclk7" ,"per6clk" , clkrst6_base,BIT (7 ),0 );clk_register_clkdev (clk,"apb_pclk" ,"mtu1" );@@ -415,110 +415,110 @@ void u8500_clk_init(void)/* Periph1 */ clk =clk_reg_prcc_kclk ("p1_uart0_kclk" ,"uartclk" , -U8500_CLKRST1_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart0" ); clk =clk_reg_prcc_kclk ("p1_uart1_kclk" ,"uartclk" , -U8500_CLKRST1_BASE ,BIT (1 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (1 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart1" ); clk =clk_reg_prcc_kclk ("p1_i2c1_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.1" ); clk =clk_reg_prcc_kclk ("p1_msp0_kclk" ,"msp02clk" , -U8500_CLKRST1_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp0" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.0" ); clk =clk_reg_prcc_kclk ("p1_msp1_kclk" ,"msp1clk" , -U8500_CLKRST1_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp1" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.1" ); clk =clk_reg_prcc_kclk ("p1_sdi0_kclk" ,"sdmmcclk" , -U8500_CLKRST1_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi0" ); clk =clk_reg_prcc_kclk ("p1_i2c2_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (6 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (6 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.2" ); clk =clk_reg_prcc_kclk ("p1_slimbus0_kclk" ,"slimclk" , -U8500_CLKRST1_BASE ,BIT (8 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (8 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"slimbus0" ); clk =clk_reg_prcc_kclk ("p1_i2c4_kclk" ,"i2cclk" , -U8500_CLKRST1_BASE ,BIT (9 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (9 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.4" ); clk =clk_reg_prcc_kclk ("p1_msp3_kclk" ,"msp1clk" , -U8500_CLKRST1_BASE ,BIT (10 ),CLK_SET_RATE_GATE ); + clkrst1_base,BIT (10 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp3" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.3" );/* Periph2 */ clk =clk_reg_prcc_kclk ("p2_i2c3_kclk" ,"i2cclk" , -U8500_CLKRST2_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.3" ); clk =clk_reg_prcc_kclk ("p2_sdi4_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi4" ); clk =clk_reg_prcc_kclk ("p2_msp2_kclk" ,"msp02clk" , -U8500_CLKRST2_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"msp2" );clk_register_clkdev (clk,NULL ,"ux500-msp-i2s.2" ); clk =clk_reg_prcc_kclk ("p2_sdi1_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi1" ); clk =clk_reg_prcc_kclk ("p2_sdi3_kclk" ,"sdmmcclk" , -U8500_CLKRST2_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst2_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi3" );/* Note that rate is received from parent. */ clk =clk_reg_prcc_kclk ("p2_ssirx_kclk" ,"hsirxclk" , -U8500_CLKRST2_BASE ,BIT (6 ), + clkrst2_base,BIT (6 ),CLK_SET_RATE_GATE |CLK_SET_RATE_PARENT ); clk =clk_reg_prcc_kclk ("p2_ssitx_kclk" ,"hsitxclk" , -U8500_CLKRST2_BASE ,BIT (7 ), + clkrst2_base,BIT (7 ),CLK_SET_RATE_GATE |CLK_SET_RATE_PARENT );/* Periph3 */ clk =clk_reg_prcc_kclk ("p3_ssp0_kclk" ,"sspclk" , -U8500_CLKRST3_BASE ,BIT (1 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (1 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ssp0" ); clk =clk_reg_prcc_kclk ("p3_ssp1_kclk" ,"sspclk" , -U8500_CLKRST3_BASE ,BIT (2 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (2 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ssp1" ); clk =clk_reg_prcc_kclk ("p3_i2c0_kclk" ,"i2cclk" , -U8500_CLKRST3_BASE ,BIT (3 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (3 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"nmk-i2c.0" ); clk =clk_reg_prcc_kclk ("p3_sdi2_kclk" ,"sdmmcclk" , -U8500_CLKRST3_BASE ,BIT (4 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (4 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi2" ); clk =clk_reg_prcc_kclk ("p3_ske_kclk" ,"rtc32k" , -U8500_CLKRST3_BASE ,BIT (5 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (5 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"ske" );clk_register_clkdev (clk,NULL ,"nmk-ske-keypad" ); clk =clk_reg_prcc_kclk ("p3_uart2_kclk" ,"uartclk" , -U8500_CLKRST3_BASE ,BIT (6 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (6 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"uart2" ); clk =clk_reg_prcc_kclk ("p3_sdi5_kclk" ,"sdmmcclk" , -U8500_CLKRST3_BASE ,BIT (7 ),CLK_SET_RATE_GATE ); + clkrst3_base,BIT (7 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"sdi5" );/* Periph6 */ clk =clk_reg_prcc_kclk ("p3_rng_kclk" ,"rngclk" , -U8500_CLKRST6_BASE ,BIT (0 ),CLK_SET_RATE_GATE ); + clkrst6_base,BIT (0 ),CLK_SET_RATE_GATE );clk_register_clkdev (clk,NULL ,"rng" ); }include/linux/platform_data/clk-ux500.h +2
-1@@ -10,7 +10,8 @@#ifndef __CLK_UX500_H#define __CLK_UX500_H -void u8500_clk_init (void ); +void u8500_clk_init (u32 clkrst1_base,u32 clkrst2_base,u32 clkrst3_base, +u32 clkrst5_base,u32 clkrst6_base);void u9540_clk_init (void );void u8540_clk_init (void );Signature · 1 line
1.7.11.3
PATCH 3/6 mfd: prcmu: pass a base and size with the early initcall
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
This patch will make an early remapping of the PRCMU, to be used when setting up the clocks, that will call down into parts of the PRCMU driver before it is probed.
Going forward this will be removed like this:
- The mailbox subsystem need to be merged.
http://marc.info/?l=linux-kernel&m=136314559201983&w=2
- At this point the PRCMU clock code can be moved over to the ux500 clock driver in drivers/clk/ux500/* and maintained there in a decentralized manner.
- This early initcall and PRCMU base parameters become part of the ux500_clk_init() call instead.
--- arch/arm/mach-ux500/cpu.c | 17 +++++++++++------ drivers/mfd/db8500-prcmu.c | 13 ++++++++++++- include/linux/mfd/db8500-prcmu.h | 4 ++-- include/linux/mfd/dbx500-prcmu.h | 6 +++--- 4 files changed, 28 insertions(+), 12 deletions(-)
arch/arm/mach-ux500/cpu.c +11 -6
@@ -8,7 +8,7 @@#include <linux/platform_device.h> #include <linux/io.h> -#include <linux/mfd/db8500-prcmu.h> +#include <linux/mfd/dbx500-prcmu.h> #include <linux/clksrc-dbx500-prcmu.h> #include <linux/sys_soc.h> #include <linux/err.h>
@@ -68,15 +68,20 @@ void __init ux500_init_irq(void)* Init clocks here so that they are available for system timer * initialization. */ -if (cpu_is_u8500_family () ||cpu_is_u9540 ()) -db8500_prcmu_early_init (); - -if (cpu_is_u8500_family () ||cpu_is_u9540 ()) +if (cpu_is_u8500_family ()) { +prcmu_early_init (U8500_PRCMU_BASE ,SZ_8K -1 );u8500_clk_init (U8500_CLKRST1_BASE ,U8500_CLKRST2_BASE ,U8500_CLKRST3_BASE ,U8500_CLKRST5_BASE ,U8500_CLKRST6_BASE ); -else if (cpu_is_u8540 ()) + }else if (cpu_is_u9540 ()) { +prcmu_early_init (U8500_PRCMU_BASE ,SZ_8K -1 ); +u8500_clk_init (U8500_CLKRST1_BASE ,U8500_CLKRST2_BASE , +U8500_CLKRST3_BASE ,U8500_CLKRST5_BASE , +U8500_CLKRST6_BASE ); + }else if (cpu_is_u8540 ()) { +prcmu_early_init (U8500_PRCMU_BASE ,SZ_8K +SZ_4K -1 );u8540_clk_init (); + } }void __init ux500_init_late (void )
drivers/mfd/db8500-prcmu.c +12 -1
@@ -2825,8 +2825,19 @@ static void dbx500_fw_version_init(struct platform_device *pdev, } } -void __init db8500_prcmu_early_init (void ) +void __init db8500_prcmu_early_init (u32 phy_base,u32 size) { +/* +* This is a temporary remap to bring up the clocks. It is +* subsequently replaces with a real remap. After the merge of +* the mailbox subsystem all of this early code goes away, and the +* clock driver can probe independently. An early initcall will +* still be needed, but it can be diverted into drivers/clk/ux500/*. +*/ + prcmu_base =ioremap (phy_base, size); +if (!prcmu_base) +pr_err ("%s: ioremap() of prcmu registers failed!\n" , __func__); +spin_lock_init (&mb0_transfer.lock);spin_lock_init (&mb0_transfer.dbb_irqs_lock);mutex_init (&mb0_transfer.ac_wake_lock);
include/linux/mfd/db8500-prcmu.h +2 -2
@@ -489,7 +489,7 @@ struct prcmu_auto_pm_config {#ifdef CONFIG_MFD_DB8500_PRCMU -void db8500_prcmu_early_init (void ); +void db8500_prcmu_early_init (u32 phy_base,u32 size);int prcmu_set_rc_a2p (enum romcode_write );enum romcode_read prcmu_get_rc_p2a (void );enum ap_pwrst prcmu_get_xp70_current_state (void );
@@ -553,7 +553,7 @@ void db8500_prcmu_write_masked(unsigned int reg, u32 mask, u32 value);#else /* !CONFIG_MFD_DB8500_PRCMU */ -static inline void db8500_prcmu_early_init (void ) {} +static inline void db8500_prcmu_early_init (u32 phy_base,u32 size) {}static inline int prcmu_set_rc_a2p (enum romcode_write code) {
include/linux/mfd/dbx500-prcmu.h +3 -3
@@ -276,9 +276,9 @@ struct prcmu_fw_version {#if defined(CONFIG_UX500_SOC_DB8500 ) -static inline void __init prcmu_early_init (void ) +static inline void prcmu_early_init (u32 phy_base,u32 size) { -return db8500_prcmu_early_init (); +return db8500_prcmu_early_init (phy_base, size); } static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
@@ -500,7 +500,7 @@ static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off) }#else -static inline void __init prcmu_early_init (void ) {} +static inline void prcmu_early_init (u32 phy_base,u32 size) {}static inline int prcmu_set_power_state (u8 state,bool keep_ulp_clk,bool keep_ap_pll)
Signature · 1 line
1.7.11.3
PATCH 3/6 mfd: prcmu: pass a base and size with the early initcall
Quoted 16 lines · On Thursday 21 March 2013 12:49:10 Linus Walleij wrote:
From: Linus Walleij <[email protected]>
This patch will make an early remapping of the PRCMU, to be used when setting up the clocks, that will call down into parts of the PRCMU driver before it is probed.
Going forward this will be removed like this:
- The mailbox subsystem need to be merged.
http://marc.info/?l=linux-kernel&m=136314559201983&w=2- At this point the PRCMU clock code can be moved over to the ux500 clock driver in
drivers/clk/ux500/*and maintained there in a decentralized manner.
Quoted 7 lines
- This early initcall and PRCMU base parameters become part of the
ux500_clk_init()call instead.Cc Suman Anna <[email protected]>Cc Loic Pallardy <[email protected]>Cc Samuel Ortiz <[email protected]>Signed-off-by Linus Walleij <[email protected]>
PATCH 3/6 mfd: prcmu: pass a base and size with the early initcall
Quoted 25 lines · Arnd Bergmann
Quoted 16 lines · On Thursday 21 March 2013 12:49:10 Linus Walleij wrote:
From: Linus Walleij <[email protected]>
This patch will make an early remapping of the PRCMU, to be used when setting up the clocks, that will call down into parts of the PRCMU driver before it is probed.
Going forward this will be removed like this:
- The mailbox subsystem need to be merged.
http://marc.info/?l=linux-kernel&m=136314559201983&w=2- At this point the PRCMU clock code can be moved over to the ux500 clock driver in
drivers/clk/ux500/*and maintained there in a decentralized manner.Quoted 7 lines
- This early initcall and PRCMU base parameters become part of the
ux500_clk_init()call instead.Cc Suman Anna <[email protected]>Cc Loic Pallardy <[email protected]>Cc Samuel Ortiz <[email protected]>Signed-off-by Linus Walleij <[email protected]>
Quoted 6 lines
Acked-by Arnd Bergmann <[email protected]>_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Until the clk-prmcu type gets split into register clocks and mailbox clocks this patch work very fine!
Acked-by; Ulf Hansson <[email protected]>
PATCH 4/6 mfd: db8500-prcmu: get base address from resource
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
We cannot use a global variable stored in <mach/hardware.h> to find the base address of the PRCMU. The real resource is already there from the board, so use this to look up the base address instead.
---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
--- arch/arm/mach-ux500/cpu-db8500.c | 2 - arch/arm/mach-ux500/cpu.c | 2 - arch/arm/mach-ux500/include/mach/hardware.h | 2 - drivers/mfd/db8500-prcmu.c | 47 ++++--- drivers/mfd/dbx500-prcmu-regs.h | 208 ++++++++++++++-------------- 5 files changed, 131 insertions(+), 130 deletions(-)
arch/arm/mach-ux500/cpu-db8500.c +0 -2
@@ -94,8 +94,6 @@ void __init u8500_map_io(void)iotable_init (u9540_io_desc,ARRAY_SIZE (u9540_io_desc)); elseiotable_init (u8500_io_desc ,ARRAY_SIZE (u8500_io_desc )); - - _PRCMU_BASE =__io_address (U8500_PRCMU_BASE ); }static struct resource db8500_pmu_resources[] = {
arch/arm/mach-ux500/cpu.c +0 -2
@@ -30,8 +30,6 @@#include "board-mop500.h" #include "id.h" -void __iomem *_PRCMU_BASE; -/* * FIXME: Should we set up the GPIO domain here? *
arch/arm/mach-ux500/include/mach/hardware.h +0 -2
@@ -39,8 +39,6 @@#ifndef __ASSEMBLY__ -extern void __iomem *_PRCMU_BASE; -#define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x)#endif /* __ASSEMBLY__ */
drivers/mfd/db8500-prcmu.c +29 -18
141 lines not on this page · raw message
drivers/mfd/dbx500-prcmu-regs.h +102 -106
297 lines not on this page · raw message
Signature · 1 line
1.7.11.3
PATCH 4/6 mfd: db8500-prcmu: get base address from resource
drivers/mfd/dbx500-prcmu-regs.h line 57
Quoted 3 lines · On Thursday 21 March 2013 12:49:11 Linus Walleij wrote:
drivers/mfd/dbx500-prcmu-regs.h +1
-1-#define PRCM_PLLARM_LOCKP (_PRCMU_BASE + 0x0a8) +#define PRCM_PLLARM_LOCKP (prcmu_base + 0x0a8)#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3 0x2
While this is certainly the least invasive way to get rid of _PRCMU_BASE, it sucks to refer to local variables in macros. How hard would it be to find all users of these macros and put the prcmu_base addition there?
The rest of this patch looks fine to me.
Arnd
PATCH 4/6 mfd: db8500-prcmu: get base address from resource
Quoted 11 lines · Arnd Bergmann
drivers/mfd/dbx500-prcmu-regs.h line 57
Quoted 3 lines · On Thursday 21 March 2013 12:49:11 Linus Walleij wrote:
drivers/mfd/dbx500-prcmu-regs.h +1
-1-#define PRCM_PLLARM_LOCKP (_PRCMU_BASE + 0x0a8) +#define PRCM_PLLARM_LOCKP (prcmu_base + 0x0a8)#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3 0x2While this is certainly the least invasive way to get rid of
_PRCMU_BASE, it sucks to refer to local variables in macros. How hard would it be to find all users of these macros and put theprcmu_baseaddition there?The rest of this patch looks fine to me.
Basically I didn't want to disturb Lo?cs work on PRCMU refactoring, but if it is require I can surely do this.
Lo?c, are you OK with this?
Yours,
Linus Walleij
PATCH 4/6 mfd: db8500-prcmu: get base address from resource
Quoted 12 lines · Linus Walleij
Quoted 10 lines · Arnd Bergmann
drivers/mfd/dbx500-prcmu-regs.h line 57
Quoted 3 lines · On Thursday 21 March 2013 12:49:11 Linus Walleij wrote:
drivers/mfd/dbx500-prcmu-regs.h +1
-1-#define PRCM_PLLARM_LOCKP (_PRCMU_BASE + 0x0a8) +#define PRCM_PLLARM_LOCKP (prcmu_base + 0x0a8)#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3 0x2While this is certainly the least invasive way to get rid of
_PRCMU_BASE, it sucks to refer to local variables in macros. How hard would it be to find all users of these macros and put theprcmu_baseaddition there?
Quoted 4 lines
Quoted 1 line
The rest of this patch looks fine to me.
Basically I didn't want to disturb Lo?cs work on PRCMU refactoring, but if it is require I can surely do this.
That's probably a good enough reason to leave it alone for now, but we should remember to fix it up later.
How about adding a comment in the header so we don't forget about it?
Arnd
PATCH 4/6 mfd: db8500-prcmu: get base address from resource
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · Linus Walleij
Quoted 11 lines · Arnd Bergmann
drivers/mfd/dbx500-prcmu-regs.h line 57
Quoted 3 lines · On Thursday 21 March 2013 12:49:11 Linus Walleij wrote:
drivers/mfd/dbx500-prcmu-regs.h +1
-1-#define PRCM_PLLARM_LOCKP (_PRCMU_BASE + 0x0a8) +#define PRCM_PLLARM_LOCKP (prcmu_base + 0x0a8)#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3 0x2While this is certainly the least invasive way to get rid of
_PRCMU_BASE, it sucks to refer to local variables in macros. How hard would it be to find all users of these macros and put theprcmu_baseaddition there?The rest of this patch looks fine to me.
Quoted 8 lines
Quoted 2 lines
Basically I didn't want to disturb Lo?cs work on PRCMU refactoring, but if it is require I can surely do this.
That's probably a good enough reason to leave it alone for now, but we should remember to fix it up later.
How about adding a comment in the header so we don't forget about it?
I'll prefer to have same way to access all PRCM registers. prcmu_base should be used only in db8500-prcmu.c file and db8500-prcmu-regs.h should contain register offset. Register should be accessed in db8500-prcmu.c file like:
val = readl(prcmu_base + PRCM_XXX);
Linus, I'll propose you a patch derived from prcmu refactoring stuff.
/Loic
Quoted 1 line
Arnd
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
--- arch/arm/mach-ux500/cpuidle.c | 148 ++++++++++++++++++++++++++++++++++++++- drivers/mfd/db8500-prcmu.c | 114 ------------------------------ include/linux/mfd/db8500-prcmu.h | 6 -- include/linux/mfd/dbx500-prcmu.h | 30 -------- 4 files changed, 147 insertions(+), 151 deletions(-)
arch/arm/mach-ux500/cpuidle.c +147 -1
@@ -16,13 +16,154 @@#include <linux/atomic.h> #include <linux/smp.h> #include <linux/mfd/dbx500-prcmu.h> +#include <linux/irqchip/arm-gic.h> +#include <linux/delay.h> +#include <linux/io.h> #include <asm/cpuidle.h> #include <asm/proc-fns.h> +#include <mach/hardware.h> + +/* ARM WFI Standby signal register */ +#define PRCM_ARM_WFI_STANDBY (prcmu_base + 0x130) +#define PRCM_ARM_WFI_STANDBY_WFI0 0x08 +#define PRCM_ARM_WFI_STANDBY_WFI1 0x10 +#define PRCM_IOCR (prcmu_base + 0x310) +#define PRCM_IOCR_IOFORCE 0x1 + +/* Dual A9 core interrupt management unit registers */ +#define PRCM_A9_MASK_REQ (prcmu_base + 0x328) +#define PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ 0x1 + +#define PRCM_A9_MASK_ACK (prcmu_base + 0x32c) +#define PRCM_ARMITMSK31TO0 (prcmu_base + 0x11c) +#define PRCM_ARMITMSK63TO32 (prcmu_base + 0x120) +#define PRCM_ARMITMSK95TO64 (prcmu_base + 0x124) +#define PRCM_ARMITMSK127TO96 (prcmu_base + 0x128) +#define PRCM_POWER_STATE_VAL (prcmu_base + 0x25C) +#define PRCM_ARMITVAL31TO0 (prcmu_base + 0x260) +#define PRCM_ARMITVAL63TO32 (prcmu_base + 0x264) +#define PRCM_ARMITVAL95TO64 (prcmu_base + 0x268) +#define PRCM_ARMITVAL127TO96 (prcmu_base + 0x26C) +static atomic_t master =ATOMIC_INIT (0 );static DEFINE_SPINLOCK (master_lock); static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device); +static void __iomem *prcmu_base; + +/* This function decouple the gic from the prcmu */ +static int prcmu_gic_decouple (void ) +{ +u32 val =readl (PRCM_A9_MASK_REQ ); + +/* Set bit 0 register value to 1 */ +writel (val |PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ , +PRCM_A9_MASK_REQ ); + +/* Make sure the register is updated */ +readl (PRCM_A9_MASK_REQ ); + +/* Wait a few cycles for the gic mask completion */ +udelay (1 ); + +return 0 ; +} + +/* This function recouple the gic with the prcmu */ +static int prcmu_gic_recouple (void ) +{ +u32 val =readl (PRCM_A9_MASK_REQ ); + +/* Set bit 0 register value to 0 */ +writel (val & ~PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ ,PRCM_A9_MASK_REQ ); + +return 0 ; +} + +#define PRCMU_GIC_NUMBER_REGS 5 + +/* +* This function checks if there are pending irq on the gic. It only +* makes sense if the gic has been decoupled before with the +* db8500_prcmu_gic_decouple function. Disabling an interrupt only +* disables the forwarding of the interrupt to any CPU interface. It +* does not prevent the interrupt from changing state, for example +* becoming pending, or active and pending if it is already +* active. Hence, we have to check the interrupt is pending *and* is +* active. +*/ +static bool prcmu_gic_pending_irq (void ) +{ +u32 pr;/* Pending register */ +u32 er;/* Enable register */ +void __iomem *dist_base =__io_address (U8500_GIC_DIST_BASE ); +int i; + +/* 5 registers. STI & PPI not skipped */ +for (i =0 ; i <PRCMU_GIC_NUMBER_REGS ; i++) { + + pr =readl_relaxed (dist_base +GIC_DIST_PENDING_SET + i *4 ); + er =readl_relaxed (dist_base +GIC_DIST_ENABLE_SET + i *4 ); + +if (pr & er) +return true;/* There is a pending interrupt */ + } + +return false; +} + +/* +* This function checks if there are pending interrupt on the +* prcmu which has been delegated to monitor the irqs with the +* db8500_prcmu_copy_gic_settings function. +*/ +static bool prcmu_pending_irq (void ) +{ +u32 it, im; +int i; + +for (i =0 ; i <PRCMU_GIC_NUMBER_REGS -1 ; i++) { + it =readl (PRCM_ARMITVAL31TO0 + i *4 ); + im =readl (PRCM_ARMITMSK31TO0 + i *4 ); +if (it & im) +return true;/* There is a pending interrupt */ + } + +return false; +} + +/* +* This function checks if the specified cpu is in in WFI. It's usage +* makes sense only if the gic is decoupled with the db8500_prcmu_gic_decouple +* function. Of course passing smp_processor_id() to this function will +* always return false... +*/ +static bool prcmu_is_cpu_in_wfi (int cpu) +{ +return readl (PRCM_ARM_WFI_STANDBY ) & cpu ?PRCM_ARM_WFI_STANDBY_WFI1 : +PRCM_ARM_WFI_STANDBY_WFI0 ; +} + +/* +* This function copies the gic SPI settings to the prcmu in order to +* monitor them and abort/finish the retention/off sequence or state. +*/ +static int prcmu_copy_gic_settings (void ) +{ +u32 er;/* Enable register */ +void __iomem *dist_base =__io_address (U8500_GIC_DIST_BASE ); +int i; + +/* We skip the STI and PPI */ +for (i =0 ; i <PRCMU_GIC_NUMBER_REGS -1 ; i++) { + er =readl_relaxed (dist_base + +GIC_DIST_ENABLE_SET + (i +1 ) *4 ); +writel (er,PRCM_ARMITMSK31TO0 + i *4 ); + } + +return 0 ; +}static inline int ux500_enter_idle (struct cpuidle_device *dev,struct cpuidle_driver *drv,int index)
@@ -130,7 +271,11 @@ int __init ux500_idle_init(void)int ret, cpu;struct cpuidle_device *device; -/* Configure wake up reasons */ + prcmu_base =ioremap (U8500_PRCMU_BASE ,SZ_4K ); +if (!prcmu_base) +return 0 ; + +/* Configure wake up reasons */ prcmu_enable_wakeups (PRCMU_WAKEUP (ARM ) |PRCMU_WAKEUP (RTC ) |PRCMU_WAKEUP (ABB ));
@@ -167,6 +312,7 @@ out_unregister: }cpuidle_unregister_driver (&ux500_idle_driver); +iounmap (prcmu_base); goto out; }
drivers/mfd/db8500-prcmu.c +0 -114
126 lines not on this page · raw message
include/linux/mfd/db8500-prcmu.h +0 -6
@@ -522,12 +522,6 @@ int db8500_prcmu_load_a9wdog(u8 id, u32 val);void db8500_prcmu_system_reset (u16 reset_code);int db8500_prcmu_set_power_state (u8 state,bool keep_ulp_clk,bool keep_ap_pll);u8 db8500_prcmu_get_power_state_result (void ); -int db8500_prcmu_gic_decouple (void ); -int db8500_prcmu_gic_recouple (void ); -int db8500_prcmu_copy_gic_settings (void ); -bool db8500_prcmu_gic_pending_irq (void ); -bool db8500_prcmu_pending_irq (void ); -bool db8500_prcmu_is_cpu_in_wfi (int cpu);void db8500_prcmu_enable_wakeups (u32 wakeups);int db8500_prcmu_set_epod (u16 epod_id,u8 epod_state);int db8500_prcmu_request_clock (u8 clock,bool enable);
include/linux/mfd/dbx500-prcmu.h +0 -30
@@ -293,36 +293,6 @@ static inline u8 prcmu_get_power_state_result(void)return db8500_prcmu_get_power_state_result (); } -static inline int prcmu_gic_decouple (void ) -{ -return db8500_prcmu_gic_decouple (); -} - -static inline int prcmu_gic_recouple (void ) -{ -return db8500_prcmu_gic_recouple (); -} - -static inline bool prcmu_gic_pending_irq (void ) -{ -return db8500_prcmu_gic_pending_irq (); -} - -static inline bool prcmu_is_cpu_in_wfi (int cpu) -{ -return db8500_prcmu_is_cpu_in_wfi (cpu); -} - -static inline int prcmu_copy_gic_settings (void ) -{ -return db8500_prcmu_copy_gic_settings (); -} - -static inline bool prcmu_pending_irq (void ) -{ -return db8500_prcmu_pending_irq (); -} -static inline int prcmu_set_epod (u16 epod_id,u8 epod_state) {return db8500_prcmu_set_epod (epod_id, epod_state);
Signature · 1 line
1.7.11.3
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 10 lines · Linus WALLEIJ
From: Linus Walleij<[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
Quoted 8 lines
Cc Daniel Lezcano<[email protected]>Cc Rickard Andersson<[email protected]>Cc Samuel Ortiz<[email protected]>Signed-off-by Linus Walleij<[email protected]>---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
---
This functionality will be used by the platform suspend operation also which I am currently working on. So I would prefer if you can move it to a separate file instead so it can be used by suspend as well. I recommend to have it the same way we have it in our internal track i.e. a file called pm.c in the machine.
BR
Rickard
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 19 lines · Rickard Andersson
Quoted 10 lines · Linus WALLEIJ
From: Linus Walleij<[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
Quoted 8 lines
Cc Daniel Lezcano<[email protected]>Cc Rickard Andersson<[email protected]>Cc Samuel Ortiz<[email protected]>Signed-off-by Linus Walleij<[email protected]>---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
---
Quoted 5 lines
This functionality will be used by the platform suspend operation also which I am currently working on. So I would prefer if you can move it to a separate file instead so it can be used by suspend as well. I recommend to have it the same way we have it in our internal track i.e. a file called
pm.cin the machine.
That would be nice to move this driver to drivers/cpuidle.
If you are ok with that, I can take care of moving the driver to this directory and then create the pm.c file in the mach-ux500 to move the prcmu specific code inside. Meanwhile this patch can be merged to group the prcmu code needed for the driver and can be easily identified.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 25 lines · Daniel Lezcano
Quoted 19 lines · Rickard Andersson
Quoted 10 lines · Linus WALLEIJ
From: Linus Walleij<[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
Quoted 8 lines
Cc Daniel Lezcano<[email protected]>Cc Rickard Andersson<[email protected]>Cc Samuel Ortiz<[email protected]>Signed-off-by Linus Walleij<[email protected]>---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
---Quoted 5 lines
This functionality will be used by the platform suspend operation also which I am currently working on. So I would prefer if you can move it to a separate file instead so it can be used by suspend as well. I recommend to have it the same way we have it in our internal track i.e. a file called
pm.cin the machine.
Quoted 10 lines
That would be nice to move this driver to
drivers/cpuidle.If you are ok with that, I can take care of moving the driver to this directory and then create the
pm.cfile in the mach-ux500 to move the prcmu specific code inside. Meanwhile this patch can be merged to group the prcmu code needed for the driver and can be easily identified.
It is ok to me.
BR
Rickard
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
In reply to Daniel LezcanoQuoted 26 lines · Daniel Lezcano
Quoted 19 lines · Rickard Andersson
Quoted 10 lines · Linus WALLEIJ
From: Linus Walleij<[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
Quoted 8 lines
Cc Daniel Lezcano<[email protected]>Cc Rickard Andersson<[email protected]>Cc Samuel Ortiz<[email protected]>Signed-off-by Linus Walleij<[email protected]>---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
---Quoted 5 lines
This functionality will be used by the platform suspend operation also which I am currently working on. So I would prefer if you can move it to a separate file instead so it can be used by suspend as well. I recommend to have it the same way we have it in our internal track i.e. a file called
pm.cin the machine.
Quoted 6 lines
That would be nice to move this driver to
drivers/cpuidle.If you are ok with that, I can take care of moving the driver to this directory and then create the
pm.cfile in the mach-ux500 to move the prcmu specific code inside. Meanwhile this patch can be merged to group the prcmu code needed for the driver and can be easily identified.
If you write a patch like that it needs to go with this patch series because I need this split out of the PRCMU driver to be able to move forward with multiplatform.
I tried figuring out if I could just make this split as part of my patch series which is simpler (then we just merge that into ARM SoC and you can base CPUidle movement on that).
But then I get into the dilemma of where to put the header file for these PM functions.
The goal of this series does away with <mach/*> so it can not be any new <mach/pm.h> header.
The code will need to be called by idle code in drivers/cpuidle and suspend code in mach-ux500. (Unless suspend/resume shall also be moved to drivers/cpuidle? I guess not?)
Shall I put it in <linux/platform_data/arm-ux500-pm.h> or so, with the implementation in arch/arm/mach-ux500/pm.c or so?
Yours,
Linus Walleij
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 43 lines · Linus Walleij
Quoted 26 lines · Daniel Lezcano
Quoted 19 lines · Rickard Andersson
Quoted 10 lines · Linus WALLEIJ
From: Linus Walleij<[email protected]>
We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The CPUidle code is calling down into the PRCMU driver basically just to access these registers, so let's remap them locally in the CPUidle driver and move the code there, simply. Besides, the PRCMU code was poking around in the GIC which is the responsibility of the machine.
Quoted 8 lines
Cc Daniel Lezcano<[email protected]>Cc Rickard Andersson<[email protected]>Cc Samuel Ortiz<[email protected]>Signed-off-by Linus Walleij<[email protected]>---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.
---Quoted 5 lines
This functionality will be used by the platform suspend operation also which I am currently working on. So I would prefer if you can move it to a separate file instead so it can be used by suspend as well. I recommend to have it the same way we have it in our internal track i.e. a file called
pm.cin the machine.Quoted 6 lines
That would be nice to move this driver to
drivers/cpuidle.If you are ok with that, I can take care of moving the driver to this directory and then create the
pm.cfile in the mach-ux500 to move the prcmu specific code inside. Meanwhile this patch can be merged to group the prcmu code needed for the driver and can be easily identified.If you write a patch like that it needs to go with this patch series because I need this split out of the PRCMU driver to be able to move forward with multiplatform.
I tried figuring out if I could just make this split as part of my patch series which is simpler (then we just merge that into ARM SoC and you can base CPUidle movement on that).
Quoted 5 lines
But then I get into the dilemma of where to put the header file for these PM functions.
The goal of this series does away with <mach/*> so it can not be any new <
mach/pm.h> header.
Actually, I considered to move the driver to the right place as an answer to Rickard who suggested to create the pm file.
As he is ok with that, I am ok with your patch splitting the prcmu code and moving the code inside the cpuidle driver.
I proposed to take care of moving the prcmu code which falls in cpuidle.c to a pm.c and then move the cpuidle.c file in driver/cpuidle after your patch is applied.
Quoted 4 lines
The code will need to be called by idle code in
drivers/cpuidleand suspend code in mach-ux500. (Unless suspend/resume shall also be moved todrivers/cpuidle? I guess not?)
No, it shouldn't :)
Quoted 3 lines
Shall I put it in <
linux/platform_data/arm-ux500-pm.h> or so, with the implementation inarch/arm/mach-ux500/pm.cor so?
Wouldn't <asm/pm.h> be better ? So we can have the same header name for all the drivers, no ?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 8 lines · Daniel Lezcano
Quoted 3 lines · Linus Walleij
Shall I put it in <
linux/platform_data/arm-ux500-pm.h> or so, with the implementation inarch/arm/mach-ux500/pm.cor so?Wouldn't <
asm/pm.h> be better ? So we can have the same header name for all the drivers, no ?
I don't think that works with multiplatform. When building multiple systems our approach is to not let any two header files have the same name.
What we did for debug macro for example was to create the <debug/*> namespace, so the old <mach/debug-macro.S> is now <debug/imx.S>, <debug/vt8500.h>, <debug/ux500.h> ... etc.
So what would be needed would then rather be <pm/*> in arch/arm/include/pm and under this we would create <pm/ux500.h>.
But that require Russell and Arnds/Olofs consent I think, what do you guys say? Other recommendations?
Yours,
Linus Walleij
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 19 lines · Linus Walleij
Quoted 8 lines · Daniel Lezcano
Quoted 3 lines · Linus Walleij
Shall I put it in <
linux/platform_data/arm-ux500-pm.h> or so, with the implementation inarch/arm/mach-ux500/pm.cor so?Wouldn't <
asm/pm.h> be better ? So we can have the same header name for all the drivers, no ?I don't think that works with multiplatform. When building multiple systems our approach is to not let any two header files have the same name.
What we did for debug macro for example was to create the <debug/*> namespace, so the old <
mach/debug-macro.S> is now <debug/imx.S>, <debug/vt8500.h>, <debug/ux500.h> ... etc.
Quoted 6 lines
So what would be needed would then rather be <pm/*> in
arch/arm/include/pmand under this we would create <pm/ux500.h>.But that require Russell and Arnds/Olofs consent I think, what do you guys say? Other recommendations?
I would first like to understand what contents you actually need to have in the header file.
Arnd
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 24 lines · Arnd Bergmann
Quoted 23 lines · Linus Walleij
Quoted 8 lines · Daniel Lezcano
Quoted 3 lines · Linus Walleij
Shall I put it in <
linux/platform_data/arm-ux500-pm.h> or so, with the implementation inarch/arm/mach-ux500/pm.cor so?Wouldn't <
asm/pm.h> be better ? So we can have the same header name for all the drivers, no ?I don't think that works with multiplatform. When building multiple systems our approach is to not let any two header files have the same name.
What we did for debug macro for example was to create the <debug/*> namespace, so the old <
mach/debug-macro.S> is now <debug/imx.S>, <debug/vt8500.h>, <debug/ux500.h> ... etc.So what would be needed would then rather be <pm/*> in
arch/arm/include/pmand under this we would create <pm/ux500.h>.
Quoted 5 lines
Quoted 2 lines
But that require Russell and Arnds/Olofs consent I think, what do you guys say? Other recommendations?
I would first like to understand what contents you actually need to have in the header file.
So in this case headers for the PRCMU+GIC code moving out of the PRCMU driver. These are the functions and the comments right above them:
/* This function decouple the gic from the prcmu */ prcmu_gic_decouple()
/* This function recouple the gic with the prcmu */ prcmu_gic_recouple()
/*
* This function checks if there are pending irq on the gic. It only
* makes sense if the gic has been decoupled before with the
* db8500_prcmu_gic_decouple function. Disabling an interrupt only
* disables the forwarding of the interrupt to any CPU interface. It
* does not prevent the interrupt from changing state, for example
* becoming pending, or active and pending if it is already
* active. Hence, we have to check the interrupt is pending *and* is
* active.
*/prcmu_gic_pending_irq()
/*
* This function checks if there are pending interrupt on the
* prcmu which has been delegated to monitor the irqs with the
* db8500_prcmu_copy_gic_settings function.
*/
bool prcmu_pending_irq()
/*
* This function checks if the specified cpu is in in WFI. It's usage
* makes sense only if the gic is decoupled with the db8500_prcmu_gic_decouple
* function. Of course passing smp_processor_id() to this function will
* always return false...
*/
bool prcmu_is_cpu_in_wfi()
/*
* This function copies the gic SPI settings to the prcmu in order to
* monitor them and abort/finish the retention/off sequence or state. */
int prcmu_copy_gic_settings()
This set of functions are called both for idling and suspend, i.e. both by the machine-specific cpuidle driver and the machine-specific suspend code.
They are conceptually coherent functions but messing with both PRCMU and GIC registers, moving the responsibility of keeping track of the IRQs back and forth between the GIC and the PRCMU.
Being able to freeze and decouple the GIC and check if a CPU is in WFI is a ux500-PRCMU-specific pecularity but saves us a lot of criss-cross IPIs when going to idle or sleep.
Yours,
Linus Walleij
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 11 lines · Linus Walleij
This set of functions are called both for idling and suspend, i.e. both by the machine-specific cpuidle driver and the machine-specific suspend code.
They are conceptually coherent functions but messing with both PRCMU and GIC registers, moving the responsibility of keeping track of the IRQs back and forth between the GIC and the PRCMU.
Being able to freeze and decouple the GIC and check if a CPU is in WFI is a ux500-PRCMU-specific pecularity but saves us a lot of criss-cross IPIs when going to idle or sleep.
I still don't understand. From what I can tell, all those functions are now statically declared in the cpuidle driver after your patch, so it sounds like you do not need a header file for them any more, where you needed one before. Which of those would you declare in a hypothetical linux/pm/ux500.h header file?
Arnd
PATCH 5/6 ARM: ux500: move PRCMU functions into the CPUidle driver
Quoted 13 lines · Arnd Bergmann
Quoted 11 lines · Linus Walleij
This set of functions are called both for idling and suspend, i.e. both by the machine-specific cpuidle driver and the machine-specific suspend code.
They are conceptually coherent functions but messing with both PRCMU and GIC registers, moving the responsibility of keeping track of the IRQs back and forth between the GIC and the PRCMU.
Being able to freeze and decouple the GIC and check if a CPU is in WFI is a ux500-PRCMU-specific pecularity but saves us a lot of criss-cross IPIs when going to idle or sleep.
Quoted 5 lines
I still don't understand. From what I can tell, all those functions are now statically declared in the cpuidle driver after your patch, so it sounds like you do not need a header file for them any more, where you needed one before. Which of those would you declare in a hypothetical
linux/pm/ux500.hheader file?
So the issue raised by Rickard was that his suspend code (which was just yesterday posted to linux-pm) is making use of the same functions, so they need to be shared somehow.
Reference:
http://marc.info/?l=linux-pm&m=136397049416914&w=2
You find that this uses the affected funtions.
So they are not only for idling, and there are pending patches for suspend making use of them, and suspend needs to live in the machine.
Yours,
Linus Walleij
PATCH 6/6 ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
This removes <mach/hardware.h> and <mach/db8500-regs.h> from the Ux500, merging them into the local include "db8500-regs.h" in mach-ux500. There is some impact outside the ux500 machine, but most of it is dealt with in earlier patches.
---
Sam, Mike: seeking your ACKs to take this through ARM SoC.
--- arch/arm/include/debug/ux500.S | 23 ++- arch/arm/mach-ux500/board-mop500-audio.c | 1 - arch/arm/mach-ux500/board-mop500-pins.c | 2 - arch/arm/mach-ux500/board-mop500-sdi.c | 2 +- arch/arm/mach-ux500/board-mop500-uib.c | 1 - arch/arm/mach-ux500/board-mop500.c | 2 +- arch/arm/mach-ux500/cache-l2x0.c | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 4 +- arch/arm/mach-ux500/cpu.c | 2 +- arch/arm/mach-ux500/cpuidle.c | 2 +- arch/arm/mach-ux500/db8500-regs.h | 201 +++++++++++++++++++++++++ arch/arm/mach-ux500/devices-common.c | 1 - arch/arm/mach-ux500/devices-db8500.c | 8 +- arch/arm/mach-ux500/devices-db8500.h | 1 + arch/arm/mach-ux500/devices.c | 3 +- arch/arm/mach-ux500/id.c | 2 +- arch/arm/mach-ux500/include/mach/db8500-regs.h | 173 --------------------- arch/arm/mach-ux500/include/mach/hardware.h | 45 ------ arch/arm/mach-ux500/include/mach/irqs.h | 2 - arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-ux500/timer.c | 2 +- arch/arm/mach-ux500/usb.c | 2 +- drivers/clk/ux500/clk-prcc.c | 1 - drivers/clocksource/clksrc-dbx500-prcmu.c | 1 - drivers/mfd/db8500-prcmu.c | 2 - drivers/mfd/dbx500-prcmu-regs.h | 22 --- 27 files changed, 239 insertions(+), 273 deletions(-) create mode 100644 arch/arm/mach-ux500/db8500-regs.h delete mode 100644 arch/arm/mach-ux500/include/mach/db8500-regs.h delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h
arch/arm/include/debug/ux500.S +16 -7
@@ -8,7 +8,7 @@ * published by the Free Software Foundation. * */ -#include <mach/hardware.h> + #if CONFIG_UX500_DEBUG_UART > 2 #error Invalid Ux500 debug UART
@@ -21,19 +21,28 @@ */ #ifdef CONFIG_UX500_SOC_DB8500 -#define __UX500_UART(n) U8500_UART##n##_BASE +#define U8500_UART0_PHYS_BASE (0x80120000) +#define U8500_UART1_PHYS_BASE (0x80121000) +#define U8500_UART2_PHYS_BASE (0x80007000) +#define U8500_UART0_VIRT_BASE (0xa8120000) +#define U8500_UART1_VIRT_BASE (0xa8121000) +#define U8500_UART2_VIRT_BASE (0xa8007000) +#define __UX500_PHYS_UART(n) U8500_UART##n##_PHYS_BASE +#define __UX500_VIRT_UART(n) U8500_UART##n##_VIRT_BASE #endif -#ifndef __UX500_UART +#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART) #error Unknown SOC #endif -#define UX500_UART(n) __UX500_UART(n) -#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) +#define UX500_PHYS_UART(n) __UX500_PHYS_UART(n) +#define UX500_VIRT_UART(n) __UX500_VIRT_UART(n) +#define UART_PHYS_BASE UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART) +#define UART_VIRT_BASE UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART) .macro addruart, rp, rv, tmp - ldr \rp, =UART_BASE @ no, physical address - ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address + ldr \rp, =UART_PHYS_BASE @ no, physical address + ldr \rv, =UART_VIRT_BASE @ yes, virtual address .endm #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-ux500/board-mop500-audio.c +0 -1
@@ -11,7 +11,6 @@#include <linux/platform_data/dma-ste-dma40.h> #include <mach/devices.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/msp.h>
arch/arm/mach-ux500/board-mop500-pins.c +0 -2
@@ -13,8 +13,6 @@#include <asm/mach-types.h> -#include <mach/hardware.h> -#include "pins-db8500.h" #include "board-mop500.h"
arch/arm/mach-ux500/board-mop500-sdi.c +1 -1
@@ -15,8 +15,8 @@#include <asm/mach-types.h> #include <mach/devices.h> -#include <mach/hardware.h> +#include "db8500-regs.h" #include "devices-db8500.h" #include "board-mop500.h" #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500-uib.c +0 -1
@@ -11,7 +11,6 @@#include <linux/init.h> #include <linux/i2c.h> -#include <mach/hardware.h> #include "board-mop500.h" #include "id.h"
arch/arm/mach-ux500/board-mop500.c +1 -1
@@ -41,13 +41,13 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <mach/hardware.h> #include <mach/setup.h> #include <mach/devices.h> #include <mach/irqs.h> #include <linux/platform_data/crypto-ux500.h> #include "ste-dma40-db8500.h" +#include "db8500-regs.h" #include "devices-db8500.h" #include "board-mop500.h" #include "board-mop500-regulators.h"
arch/arm/mach-ux500/cache-l2x0.c +1 -1
@@ -9,8 +9,8 @@#include <asm/cacheflush.h> #include <asm/hardware/cache-l2x0.h> -#include <mach/hardware.h> +#include "db8500-regs.h" #include "id.h" static void __iomem *l2x0_base;
arch/arm/mach-ux500/cpu-db8500.c +1 -3
@@ -28,15 +28,13 @@#include <asm/mach/map.h> #include <asm/mach/arch.h> -#include <mach/hardware.h> #include <mach/setup.h> #include <mach/devices.h> -#include <mach/db8500-regs.h> #include <mach/irqs.h> #include "devices-db8500.h" #include "ste-dma40-db8500.h" - +#include "db8500-regs.h" #include "board-mop500.h" #include "id.h"
arch/arm/mach-ux500/cpu.c +1 -1
@@ -23,11 +23,11 @@#include <asm/mach/map.h> -#include <mach/hardware.h> #include <mach/setup.h> #include <mach/devices.h> #include "board-mop500.h" +#include "db8500-regs.h" #include "id.h" /*
arch/arm/mach-ux500/cpuidle.c +1 -1
@@ -23,7 +23,7 @@#include <asm/cpuidle.h> #include <asm/proc-fns.h> -#include <mach/hardware.h> +#include "db8500-regs.h" /* ARM WFI Standby signal register */ #define PRCM_ARM_WFI_STANDBY (prcmu_base + 0x130)
arch/arm/mach-ux500/db8500-regs.h new file +201 -0
201 lines not on this page · raw message
arch/arm/mach-ux500/devices-common.c +0 -1
@@ -13,7 +13,6 @@#include <linux/platform_device.h> #include <linux/platform_data/pinctrl-nomadik.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include "devices-common.h"
arch/arm/mach-ux500/devices-db8500.c +7 -1
@@ -15,10 +15,10 @@#include <linux/platform_data/dma-ste-dma40.h> #include <linux/mfd/dbx500-prcmu.h> -#include <mach/hardware.h> #include <mach/setup.h> #include <mach/irqs.h> +#include "db8500-regs.h" #include "devices-db8500.h" #include "ste-dma40-db8500.h"
@@ -228,6 +228,12 @@ static struct resource db8500_prcmu_res[] = { .end = U8500_PRCMU_TCPM_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, + { + .name = "gic-distbase", + .start = U8500_GIC_DIST_BASE, + .end = U8500_GIC_DIST_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, };struct platform_device db8500_prcmu_device = {
arch/arm/mach-ux500/devices-db8500.h +1 -0
@@ -10,6 +10,7 @@#include <linux/platform_data/usb-musb-ux500.h> #include <mach/irqs.h> +#include "db8500-regs.h" #include "devices-common.h" struct ske_keypad_platform_data ;
arch/arm/mach-ux500/devices.c +2 -1
@@ -11,9 +11,10 @@#include <linux/io.h> #include <linux/amba/bus.h> -#include <mach/hardware.h> #include <mach/setup.h> +#include "db8500-regs.h" +void __init amba_add_devices (struct amba_device *devs[],int num) {int i;
arch/arm/mach-ux500/id.c +1 -1
@@ -14,9 +14,9 @@#include <asm/cacheflush.h> #include <asm/mach/map.h> -#include <mach/hardware.h> #include <mach/setup.h> +#include "db8500-regs.h" #include "id.h" struct dbx500_asic_id dbx500_id;
arch/arm/mach-ux500/include/mach/db8500-regs.h deleted +0 -173
173 lines not on this page · raw message
arch/arm/mach-ux500/include/mach/hardware.h deleted +0 -45
45 lines not on this page · raw message
arch/arm/mach-ux500/include/mach/irqs.h +0 -2
@@ -10,8 +10,6 @@#ifndef ASM_ARCH_IRQS_H #define ASM_ARCH_IRQS_H -#include <mach/hardware.h> -#define IRQ_LOCALTIMER 29#define IRQ_LOCALWDOG 30
arch/arm/mach-ux500/include/mach/uncompress.h +2 -1
@@ -22,7 +22,8 @@#include <asm/mach-types.h> #include <linux/io.h> #include <linux/amba/serial.h> -#include <mach/hardware.h> +/* TODO: This goes away in multiplatform boot, this file gets deleted */ +#include "../../db8500-regs.h" void __iomem *ux500_uart_base;
arch/arm/mach-ux500/platsmp.c +1 -1
@@ -22,9 +22,9 @@#include <asm/smp_plat.h> #include <asm/smp_scu.h> -#include <mach/hardware.h> #include <mach/setup.h> +#include "db8500-regs.h" #include "id.h" /* This is called from headsmp.S to wakeup the secondary core */
arch/arm/mach-ux500/timer.c +1 -1
@@ -14,9 +14,9 @@#include <asm/smp_twd.h> #include <mach/setup.h> -#include <mach/hardware.h> #include <mach/irqs.h> +#include "db8500-regs.h" #include "id.h" #ifdef CONFIG_HAVE_ARM_TWD
arch/arm/mach-ux500/usb.c +1 -1
@@ -10,7 +10,7 @@#include <linux/platform_data/usb-musb-ux500.h> #include <linux/platform_data/dma-ste-dma40.h> -#include <mach/hardware.h> +#include "db8500-regs.h" #define MUSB_DMA40_RX_CH { \ .mode = STEDMA40_MODE_LOGICAL, \
drivers/clk/ux500/clk-prcc.c +0 -1
@@ -13,7 +13,6 @@#include <linux/io.h> #include <linux/err.h> #include <linux/types.h> -#include <mach/hardware.h> #include "clk.h"
drivers/clocksource/clksrc-dbx500-prcmu.c +0 -1
@@ -18,7 +18,6 @@#include <asm/sched_clock.h> #include <mach/setup.h> -#include <mach/hardware.h> #define RATE_32K 32768
drivers/mfd/db8500-prcmu.c +0 -2
@@ -33,9 +33,7 @@#include <linux/regulator/machine.h> #include <linux/cpufreq.h> #include <linux/platform_data/ux500_wdt.h> -#include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/db8500-regs.h> #include "dbx500-prcmu-regs.h" /* Index of different voltages to be used when accessing AVSData */
drivers/mfd/dbx500-prcmu-regs.h +0 -22
@@ -74,33 +74,11 @@#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN BIT(0)#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN BIT(1) -/* ARM WFI Standby signal register */ -#define PRCM_ARM_WFI_STANDBY (prcmu_base + 0x130) -#define PRCM_ARM_WFI_STANDBY_WFI0 0x08 -#define PRCM_ARM_WFI_STANDBY_WFI1 0x10 -#define PRCM_IOCR (prcmu_base + 0x310) -#define PRCM_IOCR_IOFORCE 0x1 -/* CPU mailbox registers */ #define PRCM_MBOX_CPU_VAL (prcmu_base + 0x0fc)#define PRCM_MBOX_CPU_SET (prcmu_base + 0x100)#define PRCM_MBOX_CPU_CLR (prcmu_base + 0x104) -/* Dual A9 core interrupt management unit registers */ -#define PRCM_A9_MASK_REQ (prcmu_base + 0x328) -#define PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ 0x1 - -#define PRCM_A9_MASK_ACK (prcmu_base + 0x32c) -#define PRCM_ARMITMSK31TO0 (prcmu_base + 0x11c) -#define PRCM_ARMITMSK63TO32 (prcmu_base + 0x120) -#define PRCM_ARMITMSK95TO64 (prcmu_base + 0x124) -#define PRCM_ARMITMSK127TO96 (prcmu_base + 0x128) -#define PRCM_POWER_STATE_VAL (prcmu_base + 0x25C) -#define PRCM_ARMITVAL31TO0 (prcmu_base + 0x260) -#define PRCM_ARMITVAL63TO32 (prcmu_base + 0x264) -#define PRCM_ARMITVAL95TO64 (prcmu_base + 0x268) -#define PRCM_ARMITVAL127TO96 (prcmu_base + 0x26C) -#define PRCM_HOSTACCESS_REQ (prcmu_base + 0x334)#define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ 0x1#define PRCM_HOSTACCESS_REQ_WAKE_REQ BIT(16)
Signature · 1 line
1.7.11.3
PATCH 6/6 ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
Quoted 7 lines · On Thursday 21 March 2013 12:49:13 Linus Walleij wrote:
From: Linus Walleij <[email protected]>
This removes <
mach/hardware.h> and <mach/db8500-regs.h> from the Ux500, merging them into the local include "db8500-regs.h" in mach-ux500. There is some impact outside the ux500 machine, but most of it is dealt with in earlier patches.
Nice
Quoted 38 lines
arch/arm/include/debug/ux500.S +13
-5@@ -8,7 +8,7 @@ * published by the Free Software Foundation. * */ -#include <mach/hardware.h> + #if CONFIG_UX500_DEBUG_UART > 2 #error Invalid Ux500 debug UART@@ -21,19 +21,28 @@ */ #ifdef CONFIG_UX500_SOC_DB8500 -#define __UX500_UART(n) U8500_UART##n##_BASE +#define U8500_UART0_PHYS_BASE (0x80120000) +#define U8500_UART1_PHYS_BASE (0x80121000) +#define U8500_UART2_PHYS_BASE (0x80007000) +#define U8500_UART0_VIRT_BASE (0xa8120000) +#define U8500_UART1_VIRT_BASE (0xa8121000) +#define U8500_UART2_VIRT_BASE (0xa8007000) +#define __UX500_PHYS_UART(n) U8500_UART##n##_PHYS_BASE +#define __UX500_VIRT_UART(n) U8500_UART##n##_VIRT_BASE #endif -#ifndef __UX500_UART +#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART) #error Unknown SOC #endif -#define UX500_UART(n) __UX500_UART(n) -#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) +#define UX500_PHYS_UART(n) __UX500_PHYS_UART(n) +#define UX500_VIRT_UART(n) __UX500_VIRT_UART(n) +#define UART_PHYS_BASE UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART)
arch/arm/include/debug/ux500.S line 48
Quoted 10 lines
arch/arm/include/debug/ux500.S +3
-2+#define UART_VIRT_BASE UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART) .macro addruart, rp, rv, tmp - ldr \rp, =UART_BASE @ no, physical address - ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address + ldr \rp, =UART_PHYS_BASE @ no, physical address + ldr \rv, =UART_VIRT_BASE @ yes, virtual address .endm #include <asm/hardware/debug-pl01x.S>
I would suggest splitting this change out into a separate patch, or folding it into the one that creates the ux500.S file.
arch/arm/mach-ux500/db8500-regs.h line 5
Quoted 11 lines
arch/arm/mach-ux500/db8500-regs.h new file +5
-0@@ -0,0 +1,201 @@ +/* +* Copyright (C) ST-Ericsson SA 2010 +* +* License terms: GNU General Public License (GPL) version 2 +*/
Did you forget to pass '-M' to git-format-patch?
You can set 'git config diff.renames true' to get this right in the future.
arch/arm/mach-ux500/db8500-regs.h static struct resource db8500_prcmu_res[] = { · line 239
Quoted 13 lines
arch/arm/mach-ux500/db8500-regs.h new file +6
-0@@ -228,6 +228,12 @@ static struct resource db8500_prcmu_res[] = { .end = U8500_PRCMU_TCPM_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, + { + .name = "gic-distbase", + .start = U8500_GIC_DIST_BASE, + .end = U8500_GIC_DIST_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, };struct platform_device db8500_prcmu_device = {
Was this meant to have been in a different patch? I don't see what it does here.
Arnd
cover More ux500 multiplatform stuff
In reply to Linus WalleijHi Linus,
Your patches from this morning made me curious about how much is still missing to actually enable multiplatform support on ux500. This is what I came up with, on top of your patches. Feel free to take what you need if you don't already have the same patches.
I've successfully built "allmodconfig" with all the other v6/v7 platforms enabled as well.
Arnd
Arnd Bergmann (9):
ARM: ux500: move mach/msp.h to include/linux/platform_data.h
ARM: ux500: split out prcmu initialization
ARM: ux500: make irqs.h local to platform
ARM: ux500: kill mach/hardware.h some more
staging: ste_rmi4: kill platform_data hack
power: pm2301_charger: remove __devinit annotations
ARM: ux500: make remaining headers local
ARM: ux500: move to multiplatform
ARM: ux500: build hotplug.o for ARMv7-a
arch/arm/Kconfig | 16 ---
arch/arm/mach-ux500/Kconfig | 14 +++
arch/arm/mach-ux500/Makefile | 2 +
arch/arm/mach-ux500/board-mop500-audio.c | 6 +-
arch/arm/mach-ux500/board-mop500-sdi.c | 2 +-
arch/arm/mach-ux500/board-mop500-u8500uib.c | 9 +-
arch/arm/mach-ux500/board-mop500.c | 64 +---------
arch/arm/mach-ux500/board-mop500.h | 4 +-
arch/arm/mach-ux500/cpu-db8500.c | 6 +-
arch/arm/mach-ux500/cpu.c | 4 +-
arch/arm/mach-ux500/devices-common.c | 2 +-
arch/arm/mach-ux500/devices-db8500.c | 6 +-
arch/arm/mach-ux500/devices-db8500.h | 2 +-
arch/arm/mach-ux500/devices.c | 2 +-
arch/arm/mach-ux500/{include/mach => }/devices.h | 0
arch/arm/mach-ux500/hotplug.c | 2 +-
arch/arm/mach-ux500/id.c | 2 +-
arch/arm/mach-ux500/include/mach/timex.h | 6 -
arch/arm/mach-ux500/include/mach/uncompress.h | 58 ---------
.../{include/mach => }/irqs-board-mop500.h | 0
.../mach-ux500/{include/mach => }/irqs-db8500.h | 25 ----
arch/arm/mach-ux500/{include/mach => }/irqs.h | 4 +-
arch/arm/mach-ux500/platsmp.c | 2 +-
arch/arm/mach-ux500/{include/mach => }/setup.h | 0
arch/arm/mach-ux500/timer.c | 4 +-
drivers/clocksource/clksrc-dbx500-prcmu.c | 2 -
drivers/crypto/ux500/cryp/cryp.c | 2 -
drivers/crypto/ux500/cryp/cryp_core.c | 1 -
drivers/crypto/ux500/hash/hash_core.c | 1 -
drivers/mfd/db8500-prcmu.c | 140 ++++++++++++++++-----
drivers/power/pm2301_charger.c | 6 +-
drivers/staging/ste_rmi4/Makefile | 1 -
.../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 31 -----
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 31 +++--
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 -
include/linux/mfd/dbx500-prcmu.h | 2 +
.../linux/platform_data/asoc-ux500-msp.h | 0
sound/soc/ux500/mop500_ab8500.c | 2 -
sound/soc/ux500/ux500_msp_dai.c | 3 +-
sound/soc/ux500/ux500_msp_i2s.c | 3 +-
sound/soc/ux500/ux500_msp_i2s.h | 2 +-
41 files changed, 187 insertions(+), 283 deletions(-)
rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%)
delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h
delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h
rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%)
rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (83%)
rename arch/arm/mach-ux500/{include/mach => }/irqs.h (95%)
rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%)
delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%)Signature · 1 line
1.8.1.2
PATCH 1/9 ARM: ux500: move mach/msp.h to include/linux/platform_data.h
This header file only contains platform data structure definitions, so it's straightforward to move.
--- arch/arm/mach-ux500/board-mop500-audio.c | 2 +- arch/arm/mach-ux500/board-mop500.h | 2 +- .../include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h | 0 sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_msp_i2s.c | 2 +- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%)
arch/arm/mach-ux500/board-mop500-audio.c +1 -1
@@ -12,7 +12,7 @@#include <mach/devices.h> #include <mach/irqs.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include "ste-dma40-db8500.h" #include "board-mop500.h"
arch/arm/mach-ux500/board-mop500.h +1 -1
@@ -9,7 +9,7 @@/* For NOMADIK_NR_GPIO */ #include <mach/irqs.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <linux/amba/mmci.h> /* Snowball specific GPIO assignments, this board has no GPIO expander */
include/linux/platform_data/asoc-ux500-msp.h renamed from arch/arm/mach-ux500/include/mach/msp.h +0 -0
sound/soc/ux500/ux500_msp_dai.c +1 -1
@@ -21,7 +21,7 @@#include <linux/mfd/dbx500-prcmu.h> #include <mach/hardware.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <sound/soc.h> #include <sound/soc-dai.h>
sound/soc/ux500/ux500_msp_i2s.c +1 -1
@@ -22,7 +22,7 @@#include <linux/of.h> #include <mach/hardware.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <sound/soc.h>
sound/soc/ux500/ux500_msp_i2s.h +1 -1
@@ -17,7 +17,7 @@#include <linux/platform_device.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #define MSP_INPUT_FREQ_APB 48000000
Signature · 1 line
1.8.1.2
PATCH 2/9 ARM: ux500: split out prcmu initialization
In reply to Arnd BergmannThis untangles the final bits of the prcmu code from the platform code:
* The IRQ_PRCMU_* definitions move from irqs-db8500.h into prcmu.c because they are only of local significance.
* u8500_thsens_device goes into the prcmu, because it uses a PRCMU IRQ that the platform does not see.
* IRQ_DB8500_AB8500 and IRQ_PRCMU_BASE go into the platform data because the PRCMU does not see it.
--- arch/arm/mach-ux500/board-mop500.c | 58 ---------- arch/arm/mach-ux500/devices-db8500.c | 2 + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 25 ----- drivers/mfd/db8500-prcmu.c | 140 ++++++++++++++++++++----- include/linux/mfd/dbx500-prcmu.h | 2 + 5 files changed, 115 insertions(+), 112 deletions(-)
arch/arm/mach-ux500/board-mop500.c +0 -58
@@ -239,63 +239,6 @@ struct ab8500_platform_data ab8500_platdata = { .codec = &ab8500_codec_pdata, }; -/* -* Thermal Sensor -*/ - -static struct resource db8500_thsens_resources[] = { - { - .name ="IRQ_HOTMON_LOW" , - .start =IRQ_PRCMU_HOTMON_LOW , - .end =IRQ_PRCMU_HOTMON_LOW , - .flags =IORESOURCE_IRQ , - }, - { - .name ="IRQ_HOTMON_HIGH" , - .start =IRQ_PRCMU_HOTMON_HIGH , - .end =IRQ_PRCMU_HOTMON_HIGH , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct db8500_thsens_platform_data db8500_thsens_data = { - .trip_points[0 ] = { - .temp =70000 , - .type =THERMAL_TRIP_ACTIVE , - .cdev_name = { - [0 ] ="thermal-cpufreq-0" , - }, - }, - .trip_points[1 ] = { - .temp =75000 , - .type =THERMAL_TRIP_ACTIVE , - .cdev_name = { - [0 ] ="thermal-cpufreq-0" , - }, - }, - .trip_points[2 ] = { - .temp =80000 , - .type =THERMAL_TRIP_ACTIVE , - .cdev_name = { - [0 ] ="thermal-cpufreq-0" , - }, - }, - .trip_points[3 ] = { - .temp =85000 , - .type =THERMAL_TRIP_CRITICAL , - }, - .num_trips =4 , -}; - -static struct platform_device u8500_thsens_device = { - .name ="db8500-thermal" , - .resource = db8500_thsens_resources, - .num_resources =ARRAY_SIZE (db8500_thsens_resources), - .dev = { - .platform_data = &db8500_thsens_data, - }, -}; -static struct platform_device u8500_cpufreq_cooling_device = { .name ="db8500-cpufreq-cooling" , };
@@ -656,7 +599,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_key_dev, &snowball_sbnet_dev, &snowball_gpio_en_3v3_regulator_dev, - &u8500_thsens_device, &u8500_cpufreq_cooling_device, &sdi0_regulator, };
arch/arm/mach-ux500/devices-db8500.c +2 -0
@@ -199,6 +199,8 @@ struct platform_device u8500_ske_keypad_device = {struct prcmu_pdata db8500_prcmu_pdata = { .ab_platdata = &ab8500_platdata, + .ab_irq =IRQ_DB8500_AB8500 , + .irq_base =IRQ_PRCMU_BASE , .version_offset =DB8500_PRCMU_FW_VERSION_OFFSET , .legacy_offset =DB8500_PRCMU_LEGACY_OFFSET , };
arch/arm/mach-ux500/include/mach/irqs-db8500.h +0 -25
@@ -109,31 +109,6 @@/* Virtual interrupts corresponding to the PRCMU wakeups. */ #define IRQ_PRCMU_BASE IRQ_SOC_START -#define NUM_PRCMU_WAKEUPS (IRQ_PRCMU_END - IRQ_PRCMU_BASE) - -#define IRQ_PRCMU_RTC (IRQ_PRCMU_BASE) -#define IRQ_PRCMU_RTT0 (IRQ_PRCMU_BASE + 1) -#define IRQ_PRCMU_RTT1 (IRQ_PRCMU_BASE + 2) -#define IRQ_PRCMU_HSI0 (IRQ_PRCMU_BASE + 3) -#define IRQ_PRCMU_HSI1 (IRQ_PRCMU_BASE + 4) -#define IRQ_PRCMU_CA_WAKE (IRQ_PRCMU_BASE + 5) -#define IRQ_PRCMU_USB (IRQ_PRCMU_BASE + 6) -#define IRQ_PRCMU_ABB (IRQ_PRCMU_BASE + 7) -#define IRQ_PRCMU_ABB_FIFO (IRQ_PRCMU_BASE + 8) -#define IRQ_PRCMU_ARM (IRQ_PRCMU_BASE + 9) -#define IRQ_PRCMU_MODEM_SW_RESET_REQ (IRQ_PRCMU_BASE + 10) -#define IRQ_PRCMU_GPIO0 (IRQ_PRCMU_BASE + 11) -#define IRQ_PRCMU_GPIO1 (IRQ_PRCMU_BASE + 12) -#define IRQ_PRCMU_GPIO2 (IRQ_PRCMU_BASE + 13) -#define IRQ_PRCMU_GPIO3 (IRQ_PRCMU_BASE + 14) -#define IRQ_PRCMU_GPIO4 (IRQ_PRCMU_BASE + 15) -#define IRQ_PRCMU_GPIO5 (IRQ_PRCMU_BASE + 16) -#define IRQ_PRCMU_GPIO6 (IRQ_PRCMU_BASE + 17) -#define IRQ_PRCMU_GPIO7 (IRQ_PRCMU_BASE + 18) -#define IRQ_PRCMU_GPIO8 (IRQ_PRCMU_BASE + 19) -#define IRQ_PRCMU_CA_SLEEP (IRQ_PRCMU_BASE + 20) -#define IRQ_PRCMU_HOTMON_LOW (IRQ_PRCMU_BASE + 21) -#define IRQ_PRCMU_HOTMON_HIGH (IRQ_PRCMU_BASE + 22)#define IRQ_PRCMU_END (IRQ_PRCMU_BASE + 23)/*
drivers/mfd/db8500-prcmu.c +111 -29
215 lines not on this page · raw message
include/linux/mfd/dbx500-prcmu.h +2 -0
@@ -237,6 +237,8 @@ struct prcmu_pdatabool enable_set_ddr_opp;bool enable_ape_opp_100_voltage;struct ab8500_platform_data *ab_platdata; +int ab_irq; +int irq_base;u32 version_offset;u32 legacy_offset;u32 adt_offset;
Signature · 1 line
1.8.1.2
PATCH 3/9 ARM: ux500: make irqs.h local to platform
In reply to Arnd BergmannWith the PRCMU out of the way, nothing outside of mach-ux500 uses mach/irqs.h any more, so we can make it a local header file, including the two sub-headers.
---
arch/arm/mach-ux500/board-mop500-audio.c | 2 +-
arch/arm/mach-ux500/board-mop500-u8500uib.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 2 +-
arch/arm/mach-ux500/board-mop500.h | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/devices-common.c | 2 +-
arch/arm/mach-ux500/devices-db8500.c | 2 +-
arch/arm/mach-ux500/devices-db8500.h | 2 +-
arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h | 0
arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h | 0
arch/arm/mach-ux500/{include/mach => }/irqs.h | 4 ++--
arch/arm/mach-ux500/timer.c | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%)
rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (100%)
rename arch/arm/mach-ux500/{include/mach => }/irqs.h (95%)arch/arm/mach-ux500/board-mop500-audio.c +1 -1
@@ -11,7 +11,7 @@#include <linux/platform_data/dma-ste-dma40.h> #include <mach/devices.h> -#include <mach/irqs.h> +#include "irqs.h" #include <linux/platform_data/asoc-ux500-msp.h> #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500-u8500uib.c +1 -1
@@ -12,7 +12,7 @@#include <linux/mfd/tc3589x.h> #include <linux/input/matrix_keypad.h> -#include <mach/irqs.h> +#include "irqs.h" #include "board-mop500.h"
arch/arm/mach-ux500/board-mop500.c +1 -1
@@ -45,7 +45,7 @@#include <mach/setup.h> #include <mach/devices.h> -#include <mach/irqs.h> +#include "irqs.h" #include <linux/platform_data/crypto-ux500.h> #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500.h +1 -1
@@ -8,7 +8,7 @@#define __BOARD_MOP500_H/* For NOMADIK_NR_GPIO */ -#include <mach/irqs.h> +#include "irqs.h" #include <linux/platform_data/asoc-ux500-msp.h> #include <linux/amba/mmci.h>
arch/arm/mach-ux500/cpu-db8500.c +1 -1
@@ -30,7 +30,7 @@#include <mach/setup.h> #include <mach/devices.h> -#include <mach/irqs.h> +#include "irqs.h" #include "devices-db8500.h" #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/devices-common.c +1 -1
@@ -13,7 +13,7 @@#include <linux/platform_device.h> #include <linux/platform_data/pinctrl-nomadik.h> -#include <mach/irqs.h> +#include "irqs.h" #include "devices-common.h"
arch/arm/mach-ux500/devices-db8500.c +1 -1
@@ -16,7 +16,7 @@#include <linux/mfd/dbx500-prcmu.h> #include <mach/setup.h> -#include <mach/irqs.h> +#include "irqs.h" #include "db8500-regs.h" #include "devices-db8500.h"
arch/arm/mach-ux500/devices-db8500.h +1 -1
@@ -9,7 +9,7 @@#define __DEVICES_DB8500_H#include <linux/platform_data/usb-musb-ux500.h> -#include <mach/irqs.h> +#include "irqs.h" #include "db8500-regs.h" #include "devices-common.h"
arch/arm/mach-ux500/irqs-board-mop500.h renamed from arch/arm/mach-ux500/include/mach/irqs-board-mop500.h +0 -0
arch/arm/mach-ux500/irqs-db8500.h renamed from arch/arm/mach-ux500/include/mach/irqs-db8500.h +0 -0
arch/arm/mach-ux500/irqs.h renamed from arch/arm/mach-ux500/include/mach/irqs.h +2 -2
@@ -34,14 +34,14 @@/* This will be overridden by SoC-specific irq headers */ #define IRQ_SOC_END IRQ_SOC_START -#include <mach/irqs-db8500.h> +#include "irqs-db8500.h" #define IRQ_BOARD_START IRQ_SOC_END/* This will be overridden by board-specific irq headers */ #define IRQ_BOARD_END IRQ_BOARD_START#ifdef CONFIG_MACH_MOP500 -#include <mach/irqs-board-mop500.h> +#include "irqs-board-mop500.h" #endif #define UX500_NR_IRQS IRQ_BOARD_END
arch/arm/mach-ux500/timer.c +1 -1
@@ -15,7 +15,7 @@#include <asm/smp_twd.h> #include <mach/setup.h> -#include <mach/irqs.h> +#include "irqs.h" #include "db8500-regs.h" #include "id.h"
Signature · 1 line
1.8.1.2
PATCH 4/9 ARM: ux500: kill mach/hardware.h some more
In reply to Arnd BergmannA number of ux500 specific drivers include mach/hardware.h without actually needing it. Let's remove all remaining instances.
--- drivers/crypto/ux500/cryp/cryp.c | 2 -- drivers/crypto/ux500/cryp/cryp_core.c | 1 - drivers/crypto/ux500/hash/hash_core.c | 1 - sound/soc/ux500/mop500_ab8500.c | 2 -- sound/soc/ux500/ux500_msp_dai.c | 1 - sound/soc/ux500/ux500_msp_i2s.c | 1 - 6 files changed, 8 deletions(-)
drivers/crypto/ux500/cryp/cryp.c +0 -2
@@ -12,8 +12,6 @@#include <linux/kernel.h> #include <linux/types.h> -#include <mach/hardware.h> -#include "cryp_p.h" #include "cryp.h"
drivers/crypto/ux500/cryp/cryp_core.c +0 -1
@@ -32,7 +32,6 @@#include <crypto/scatterwalk.h> #include <linux/platform_data/crypto-ux500.h> -#include <mach/hardware.h> #include "cryp_p.h" #include "cryp.h"
drivers/crypto/ux500/hash/hash_core.c +0 -1
@@ -32,7 +32,6 @@#include <crypto/algapi.h> #include <linux/platform_data/crypto-ux500.h> -#include <mach/hardware.h> #include "hash_alg.h"
sound/soc/ux500/mop500_ab8500.c +0 -2
@@ -17,8 +17,6 @@#include <linux/io.h> #include <linux/clk.h> -#include <mach/hardware.h> -#include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/pcm.h>
sound/soc/ux500/ux500_msp_dai.c +0 -1
@@ -20,7 +20,6 @@#include <linux/regulator/consumer.h> #include <linux/mfd/dbx500-prcmu.h> -#include <mach/hardware.h> #include <linux/platform_data/asoc-ux500-msp.h> #include <sound/soc.h>
sound/soc/ux500/ux500_msp_i2s.c +0 -1
@@ -21,7 +21,6 @@#include <linux/io.h> #include <linux/of.h> -#include <mach/hardware.h> #include <linux/platform_data/asoc-ux500-msp.h> #include <sound/soc.h>
Signature · 1 line
1.8.1.2
PATCH 5/9 staging: ste_rmi4: kill platform_data hack
In reply to Arnd BergmannThere is only one instance of the platform data for synaptics_i2c_rmi4 in the mainline kernel, so there is no point of pretending its variable here. The only member that has a dependency on the platform is actually the interrupt number, and there is a field in the i2c_client structure that gets initialized from the board info, so we can trivially move the board_into into the platform without knowledge of the platform_data structure.
--- arch/arm/mach-ux500/board-mop500-u8500uib.c | 7 +++-- drivers/staging/ste_rmi4/Makefile | 1 - .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 31 ---------------------- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 31 +++++++++++++--------- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 - 5 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
arch/arm/mach-ux500/board-mop500-u8500uib.c +5 -2
@@ -16,8 +16,11 @@#include "board-mop500.h" -/* Dummy data that can be overridden by staging driver */ -struct i2c_board_info __initdata __weak mop500_i2c3_devices_u8500[] = { +static struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = { + { +I2C_BOARD_INFO ("synaptics_rmi4_i2c" ,0x4B ), + .irq =NOMADIK_GPIO_TO_IRQ (84 ), + }, };/*
drivers/staging/ste_rmi4/Makefile +0 -1
@@ -2,4 +2,3 @@ # Makefile for the RMI4 touchscreen driver. # obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o -obj-$(CONFIG_MACH_MOP500) += board-mop500-u8500uib-rmi4.o
drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* Some platform data for the RMI4 touchscreen that will override the __weak -* platform data in the Ux500 machine if this driver is activated. -*/ -#include <linux/i2c.h> -#include <linux/gpio.h> -#include <linux/interrupt.h> -#include <mach/irqs.h> -#include "synaptics_i2c_rmi4.h" - -/* -* Synaptics RMI4 touchscreen interface on the U8500 UIB -*/ - -/* -* Descriptor structure. -* Describes the number of i2c devices on the bus that speak RMI. -*/ -static struct synaptics_rmi4_platform_data rmi4_i2c_dev_platformdata = { - .irq_number =NOMADIK_GPIO_TO_IRQ (84 ), - .irq_type = (IRQF_TRIGGER_FALLING |IRQF_SHARED ), - .x_flip = false, - .y_flip = true, -}; - -struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = { - { -I2C_BOARD_INFO ("synaptics_rmi4_i2c" ,0x4B ), - .platform_data = &rmi4_i2c_dev_platformdata, - }, -};
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +18 -13
@@ -864,6 +864,16 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)return 0 ; } +/* +* Descriptor structure. +* Describes the number of i2c devices on the bus that speak RMI. +*/ +static struct synaptics_rmi4_platform_data synaptics_rmi4_platformdata = { + .irq_type = (IRQF_TRIGGER_FALLING |IRQF_SHARED ), + .x_flip = false, + .y_flip = true, +}; +/** * synaptics_rmi4_probe() - Initialze the i2c-client touchscreen driver * @i2c: i2c client structure pointer
@@ -890,10 +900,8 @@ static int synaptics_rmi4_probereturn -EIO ; } -if (!platformdata) { -dev_err (&client->dev,"%s: no platform data\n" , __func__); -return -EINVAL ; - } +if (!platformdata) + platformdata = &synaptics_rmi4_platformdata;/* Allocate and initialize the instance data for this client */ rmi4_data = kcalloc(2, sizeof(struct synaptics_rmi4_data),
@@ -977,13 +985,13 @@ static int synaptics_rmi4_probesynaptics_rmi4_i2c_block_read (rmi4_data, rmi4_data->fn01_data_base_addr +1 , intr_status, rmi4_data->number_of_interrupt_register); - retval =request_threaded_irq (platformdata->irq_number,NULL , + retval =request_threaded_irq (client->irq,NULL , synaptics_rmi4_irq, platformdata->irq_type,DRIVER_NAME , rmi4_data);if (retval) {dev_err (&client->dev,"%s:Unable to get attn irq %d\n" , - __func__, platformdata->irq_number); + __func__, client->irq); goto err_query_dev; }
@@ -996,7 +1004,7 @@ static int synaptics_rmi4_probereturn retval; err_free_irq: -free_irq (platformdata->irq_number, rmi4_data); +free_irq (client->irq, rmi4_data); err_query_dev:regulator_disable (rmi4_data->regulator); err_regulator_enable:
@@ -1019,11 +1027,10 @@ err_input:static int synaptics_rmi4_remove (struct i2c_client *client) {struct synaptics_rmi4_data *rmi4_data =i2c_get_clientdata (client); -const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board; rmi4_data->touch_stopped = true;wake_up (&rmi4_data->wait); -free_irq (pdata->irq_number, rmi4_data); +free_irq (client->irq, rmi4_data);input_unregister_device (rmi4_data->input_dev);regulator_disable (rmi4_data->regulator);regulator_put (rmi4_data->regulator);
@@ -1046,10 +1053,9 @@ static int synaptics_rmi4_suspend(struct device *dev)int retval;unsigned char intr_status;struct synaptics_rmi4_data *rmi4_data =dev_get_drvdata (dev); -const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board; rmi4_data->touch_stopped = true; -disable_irq (pdata->irq_number); +disable_irq (rmi4_data->i2c_client->irq); retval = synaptics_rmi4_i2c_block_read(rmi4_data, rmi4_data->fn01_data_base_addr + 1,
@@ -1080,11 +1086,10 @@ static int synaptics_rmi4_resume(struct device *dev)int retval;unsigned char intr_status;struct synaptics_rmi4_data *rmi4_data =dev_get_drvdata (dev); -const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;regulator_enable (rmi4_data->regulator); -enable_irq (pdata->irq_number); +enable_irq (rmi4_data->i2c_client->irq); rmi4_data->touch_stopped = false; retval = synaptics_rmi4_i2c_block_read(rmi4_data,
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h +0 -1
@@ -38,7 +38,6 @@* This structure gives platform data for rmi4. */ struct synaptics_rmi4_platform_data { -int irq_number;int irq_type;bool x_flip;bool y_flip;
Signature · 1 line
1.8.1.2
PATCH 5/9 staging: ste_rmi4: kill platform_data hack
Quoted 9 lines · Arnd Bergmann
There is only one instance of the platform data for
synaptics_i2c_rmi4in the mainline kernel, so there is no point of pretending its variable here. The only member that has a dependency on the platform is actually the interrupt number, and there is a field in thei2c_clientstructure that gets initialized from the board info, so we can trivially move theboard_intointo the platform without knowledge of theplatform_datastructure.Signed-off-by Arnd Bergmann <[email protected]>
Greg can we have your ACK on this patch to staging so we can take it through the ARM SoC tree?
(Tell me if you can't retrieve it and I'll send it verbose.)
Yours,
Linus Walleij
Greg KH
maintainerPATCH 5/9 staging: ste_rmi4: kill platform_data hack
Quoted 10 lines · Linus Walleij
Quoted 8 lines · Arnd Bergmann
There is only one instance of the platform data for
synaptics_i2c_rmi4in the mainline kernel, so there is no point of pretending its variable here. The only member that has a dependency on the platform is actually the interrupt number, and there is a field in thei2c_clientstructure that gets initialized from the board info, so we can trivially move theboard_intointo the platform without knowledge of theplatform_datastructure.
Quoted 6 lines
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>Greg can we have your ACK on this patch to staging so we can take it through the ARM SoC tree?
(Tell me if you can't retrieve it and I'll send it verbose.)
Please resend it as I don't see it in my mailboxes anywhere...
thanks,
greg k-h
PATCH 6/9 power: pm2301_charger: remove __devinit annotations
In reply to Arnd BergmannThese got missed in the treewide changes because they came in through a new branch, and it now breaks allmodconfig builds.
--- drivers/power/pm2301_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pm2301_charger.c +3 -3
@@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client,return 0 ; } -static int __devinit pm2xxx_wall_charger_probe (struct i2c_client *i2c_client, +static int pm2xxx_wall_charger_probe (struct i2c_client *i2c_client,const struct i2c_device_id *id) {struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data;
@@ -1021,7 +1021,7 @@ free_device_info:return ret; } -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) +static int pm2xxx_wall_charger_remove (struct i2c_client *i2c_client) {struct pm2xxx_charger *pm2 =i2c_get_clientdata (i2c_client);
@@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id);static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, - .remove =__devexit_p (pm2xxx_wall_charger_remove), + .remove = pm2xxx_wall_charger_remove, .suspend = pm2xxx_wall_charger_suspend, .resume = pm2xxx_wall_charger_resume, .driver = {
Signature · 1 line
1.8.1.2
PATCH 6/9 power: pm2301_charger: remove __devinit annotations
Quoted 4 lines · Arnd Bergmann
These got missed in the treewide changes because they came in through a new branch, and it now breaks allmodconfig builds.
Signed-off-by Arnd Bergmann <[email protected]>
Anton can you pick this fix directly to the power subsystem tree?
Yours,
Linus Walleij
PATCH 6/9 power: pm2301_charger: remove __devinit annotations
Quoted 11 lines · Linus Walleij
Quoted 4 lines · Arnd Bergmann
These got missed in the treewide changes because they came in through a new branch, and it now breaks allmodconfig builds.
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Linus Walleij <[email protected]>Anton can you pick this fix directly to the power subsystem tree?
Yup, will do. Thanks!
Anton
PATCH 6/9 power: pm2301_charger: remove __devinit annotations
In reply to Linus WalleijQuoted 11 lines · Linus Walleij
Quoted 4 lines · Arnd Bergmann
These got missed in the treewide changes because they came in through a new branch, and it now breaks allmodconfig builds.
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Linus Walleij <[email protected]>Anton can you pick this fix directly to the power subsystem tree?
It appears that Lars-Peter Clausen sent a similar patch a bit earlier. I added Arnd's Signed-off-by to give a credit, though. So, it is in battery-urgent now.
Thanks!
Anton
PATCH 7/9 ARM: ux500: make remaining headers local
In reply to Arnd Bergmannmach/setup.h and mach/devices.h are only needed from inside of mach-ux500 now, so we can simply move them out of the include/mach directory.
---
arch/arm/mach-ux500/board-mop500-audio.c | 2 +-
arch/arm/mach-ux500/board-mop500-sdi.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 4 ++--
arch/arm/mach-ux500/cpu-db8500.c | 4 ++--
arch/arm/mach-ux500/cpu.c | 4 ++--
arch/arm/mach-ux500/devices-db8500.c | 2 +-
arch/arm/mach-ux500/devices.c | 2 +-
arch/arm/mach-ux500/{include/mach => }/devices.h | 0
arch/arm/mach-ux500/hotplug.c | 2 +-
arch/arm/mach-ux500/id.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 2 +-
arch/arm/mach-ux500/{include/mach => }/setup.h | 0
arch/arm/mach-ux500/timer.c | 2 +-
drivers/clocksource/clksrc-dbx500-prcmu.c | 2 --
14 files changed, 14 insertions(+), 16 deletions(-)
rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%)
rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%)arch/arm/mach-ux500/board-mop500-audio.c +1 -1
@@ -10,7 +10,7 @@#include <linux/platform_data/pinctrl-nomadik.h> #include <linux/platform_data/dma-ste-dma40.h> -#include <mach/devices.h> +#include "devices.h" #include "irqs.h" #include <linux/platform_data/asoc-ux500-msp.h>
arch/arm/mach-ux500/board-mop500-sdi.c +1 -1
@@ -14,7 +14,7 @@#include <linux/platform_data/dma-ste-dma40.h> #include <asm/mach-types.h> -#include <mach/devices.h> +#include "devices.h" #include "db8500-regs.h" #include "devices-db8500.h"
arch/arm/mach-ux500/board-mop500.c +2 -2
@@ -43,8 +43,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <mach/setup.h> -#include <mach/devices.h> +#include "setup.h" +#include "devices.h" #include "irqs.h" #include <linux/platform_data/crypto-ux500.h>
arch/arm/mach-ux500/cpu-db8500.c +2 -2
@@ -28,8 +28,8 @@#include <asm/mach/map.h> #include <asm/mach/arch.h> -#include <mach/setup.h> -#include <mach/devices.h> +#include "setup.h" +#include "devices.h" #include "irqs.h" #include "devices-db8500.h"
arch/arm/mach-ux500/cpu.c +2 -2
@@ -23,8 +23,8 @@#include <asm/mach/map.h> -#include <mach/setup.h> -#include <mach/devices.h> +#include "setup.h" +#include "devices.h" #include "board-mop500.h" #include "db8500-regs.h"
arch/arm/mach-ux500/devices-db8500.c +1 -1
@@ -15,7 +15,7 @@#include <linux/platform_data/dma-ste-dma40.h> #include <linux/mfd/dbx500-prcmu.h> -#include <mach/setup.h> +#include "setup.h" #include "irqs.h" #include "db8500-regs.h"
arch/arm/mach-ux500/devices.c +1 -1
@@ -11,7 +11,7 @@#include <linux/io.h> #include <linux/amba/bus.h> -#include <mach/setup.h> +#include "setup.h" #include "db8500-regs.h"
arch/arm/mach-ux500/devices.h renamed from arch/arm/mach-ux500/include/mach/devices.h +0 -0
arch/arm/mach-ux500/hotplug.c +1 -1
@@ -15,7 +15,7 @@#include <asm/cacheflush.h> #include <asm/smp_plat.h> -#include <mach/setup.h> +#include "setup.h" /* * platform-specific code to shutdown a CPU
arch/arm/mach-ux500/id.c +1 -1
@@ -14,7 +14,7 @@#include <asm/cacheflush.h> #include <asm/mach/map.h> -#include <mach/setup.h> +#include "setup.h" #include "db8500-regs.h" #include "id.h"
arch/arm/mach-ux500/platsmp.c +1 -1
@@ -22,7 +22,7 @@#include <asm/smp_plat.h> #include <asm/smp_scu.h> -#include <mach/setup.h> +#include "setup.h" #include "db8500-regs.h" #include "id.h"
arch/arm/mach-ux500/setup.h renamed from arch/arm/mach-ux500/include/mach/setup.h +0 -0
arch/arm/mach-ux500/timer.c +1 -1
@@ -14,7 +14,7 @@#include <asm/smp_twd.h> -#include <mach/setup.h> +#include "setup.h" #include "irqs.h" #include "db8500-regs.h"
drivers/clocksource/clksrc-dbx500-prcmu.c +0 -2
@@ -17,8 +17,6 @@#include <asm/sched_clock.h> -#include <mach/setup.h> -#define RATE_32K 32768#define TIMER_MODE_CONTINOUS 0x1
Signature · 1 line
1.8.1.2
PATCH 8/9 ARM: ux500: move to multiplatform
In reply to Arnd BergmannNothing is holding us up any more, and we can make ux500 coexist with the rest of the platforms. The timex.h and uncompress.h headers are no longer needed now.
--- arch/arm/Kconfig | 16 -------- arch/arm/mach-ux500/Kconfig | 14 +++++++ arch/arm/mach-ux500/include/mach/timex.h | 6 --- arch/arm/mach-ux500/include/mach/uncompress.h | 58 --------------------------- 4 files changed, 14 insertions(+), 80 deletions(-) delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h
arch/arm/Kconfig +0 -16
@@ -888,22 +888,6 @@ config ARCH_U300 help Support for ST-Ericsson U300 series mobile platforms. -config ARCH_U8500 - bool "ST-Ericsson U8500 Series" - depends on MMU - select ARCH_HAS_CPUFREQ - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select CLKDEV_LOOKUP - select CPU_V7 - select GENERIC_CLOCKEVENTS - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - select SPARSE_IRQ - help - Support for ST-Ericsson's Ux500 architecture - - config ARCH_DAVINCI bool "TI DaVinci" select ARCH_HAS_HOLES_MEMORYMODEL
arch/arm/mach-ux500/Kconfig +14 -0
@@ -1,3 +1,17 @@ +config ARCH_U8500 + bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7 + depends on MMU + select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select CLKDEV_LOOKUP + select CPU_V7 + select GENERIC_CLOCKEVENTS + select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 + help + Support for ST-Ericsson's Ux500 architecture + if ARCH_U8500 config UX500_SOC_COMMON
arch/arm/mach-ux500/include/mach/timex.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_TIMEX_H -#define __ASM_ARCH_TIMEX_H - -#define CLOCK_TICK_RATE 110000000 - -#endif
arch/arm/mach-ux500/include/mach/uncompress.h deleted +0 -58
58 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH 9/9 ARM: ux500: build hotplug.o for ARMv7-a
In reply to Arnd BergmannIf we try to build this file in a multiplatform configuration with ARMv6 enabled, gas complains about the dsb operation being undefined. Adding -march=armv7-a is safe because that code is only ever run on ux500, which is Cortex-A9.
--- arch/arm/mach-ux500/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/Makefile +2 -0
@@ -15,3 +15,5 @@ obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ board-mop500-audio.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o + +CFLAGS_hotplug.o += -march=armv7-a
Signature · 1 line
1.8.1.2
cover More ux500 multiplatform stuff
In reply to Arnd BergmannQuoted 2 lines · Arnd Bergmann
Your patches from this morning made me curious about how much is still missing to actually enable multiplatform support on ux500.
On the surface of it, not that much as you see :-D
Quoted 6 lines
This is
what I came up with, on top of your patches. Feel free to take what you need if you don't already have the same patches.I've successfully built "allmodconfig" with all the other v6/v7 platforms enabled as well.
Unfortunately the platform stops booting after
2/9 "ARM: ux500: split out prcmu initialization"
so I will look closer at this.
This patch:
"ARM: ux500: kill mach/hardware.h some more" I will squash into the actual removal patch, it's just some sloppy work by me :-/
I will try to move some of the patches to the front of the series so we only have the tricky stuff to fix.
And there are some non-bisectable patches due to the
driver in staging (which was put there because Synaptics would submit another driver "real soon now" and that was something like two years ago), so I might have to squash some of them together to one.
Thanks!
Linus Walleij
cover More ux500 multiplatform stuff
Quoted 11 lines · Linus Walleij
Quoted 6 lines · Arnd Bergmann
This is
what I came up with, on top of your patches. Feel free to take what you need if you don't already have the same patches.I've successfully built "allmodconfig" with all the other v6/v7 platforms enabled as well.
Unfortunately the platform stops booting after
2/9 "ARM: ux500: split out prcmu initialization"
so I will look closer at this.
Yes, I can see how it has potential for introducing bugs. I hope it's something obvious that you can find easily.
Quoted 4 lines
This patch:
"ARM: ux500: killmach/hardware.hsome more" I will squash into the actual removal patch, it's just some sloppy work by me :-/
Yes, I expected that.
Quoted 3 lines
I will try to move some of the patches to the front of the series so we only have the tricky stuff to fix.
Ok.
Quoted 4 lines
And there are some non-bisectable patches due to the
driver in staging (which was put there because Synaptics would submit another driver "real soon now" and that was something like two years ago), so I might have to squash some of them together to one.
What breaks bisection here? The "[PATCH 5/9] staging: ste_rmi4: kill platform_data hack" patch should be independent of everything else, it just touches more files than we'd like.
Arnd
cover More ux500 multiplatform stuff
Quoted 9 lines · Arnd Bergmann
[Me]
Quoted 4 lines
And there are some non-bisectable patches due to the
driver in staging (which was put there because Synaptics would submit another driver "real soon now" and that was something like two years ago), so I might have to squash some of them together to one.What breaks bisection here? The "[PATCH 5/9] staging:
ste_rmi4: killplatform_datahack" patch should be independent of everything else, it just touches more files than we'd like.
It includes <mach/irqs.h> that is removed by earlier patches, so it stops compiling before this patch.
Yours,
Linus Walleij
cover More ux500 multiplatform stuff
Quoted 7 lines · Linus Walleij
Quoted 6 lines · Arnd Bergmann
[Me]
Quoted 4 lines
And there are some non-bisectable patches due to the
driver in staging (which was put there because Synaptics would submit another driver "real soon now" and that was something like two years ago), so I might have to squash some of them together to one.
Quoted 7 lines
Quoted 3 lines
What breaks bisection here? The "[PATCH 5/9] staging:
ste_rmi4: killplatform_datahack" patch should be independent of everything else, it just touches more files than we'd like.It includes <
mach/irqs.h> that is removed by earlier patches, so it stops compiling before this patch.
Ah right. I think I reordered the patches in the end and must have gotten that one wrong.
Arnd
cover More ux500 multiplatform stuff
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
Quoted 8 lines · Linus Walleij
Quoted 6 lines · Arnd Bergmann
This is
what I came up with, on top of your patches. Feel free to take what you need if you don't already have the same patches.I've successfully built "allmodconfig" with all the other v6/v7 platforms enabled as well.
Quoted 6 lines
Quoted 3 lines
Unfortunately the platform stops booting after
2/9 "ARM: ux500: split out prcmu initialization"
so I will look closer at this.Yes, I can see how it has potential for introducing bugs. I hope it's something obvious that you can find easily.
You bet:
drivers/mfd/db8500-prcmu.c +0 -0
@@ -2680,7 +2680,7 @@ static int db8500_irq_init(struct device_node
*np, int irq_base)
int i;
/* In the device tree case, just take some IRQs */
- if (!np)
+ if (np)
irq_base = 0;
db8500_irq_domain = irq_domain_add_simple(After this the U8500 and U8520 boot to prompt with all the patches applied!
Patches only need to be agreed upon and ACKed.
I now feel confident that we can merge ux500 multiplatform support for v3.10.
Yours,
Linus Walleij
cover More ux500 multiplatform stuff
Quoted 13 lines · Linus Walleij
drivers/mfd/db8500-prcmu.c +1
-1@@ -2680,7 +2680,7 @@ static int db8500_irq_init(struct device_node *np, int irq_base)int i;/* In the device tree case, just take some IRQs */ -if (!np) +if (np) irq_base =0 ;
Quoted 1 line
db8500_irq_domain = irq_domain_add_simple(
I think I dreamed about this bug last night but didn't remember until now, and I had not looked there to confirm ;-)
Quoted 2 lines
After this the U8500 and U8520 boot to prompt with all the patches applied!
Ah, very good.
Arnd