ARM: u300 multiplatform support
Subsystems (3)
cover ARM: u300 multiplatform support
From: Linus Walleij <[email protected]>
This series builds on top of the recently iterated U300 device tree support to convert the platform to multiplatform (a.k.a. single zImage).
This is intended to be pulled on top of the DT support.
Linus Walleij (7):
ARM: u300: push down syscon registers
ARM: u300: remove deps from debug macro
ARM: u300: delete <mach/hardware.h>
ARM: u300: delete <mach/irqs.h>
ARM: u300: localize <mach/u300-regs.h>
ARM: u300: convert to multiplatform
ARM: u300: delete remnant machine headers
arch/arm/Kconfig | 21 +-
arch/arm/configs/u300_defconfig | 11 +-
arch/arm/include/debug/u300.S | 9 +-
arch/arm/mach-u300/Kconfig | 31 +-
arch/arm/mach-u300/core.c | 29 +-
arch/arm/mach-u300/include/mach/hardware.h | 5 -
arch/arm/mach-u300/include/mach/irqs.h | 80 ---
arch/arm/mach-u300/include/mach/syscon.h | 592 ----------------------
arch/arm/mach-u300/include/mach/timex.h | 17 -
arch/arm/mach-u300/include/mach/uncompress.h | 45 --
arch/arm/mach-u300/regulator.c | 9 +-
arch/arm/mach-u300/timer.c | 3 -
arch/arm/mach-u300/{include/mach => }/u300-regs.h | 0
drivers/clk/clk-u300.c | 343 ++++++++++++-
14 files changed, 407 insertions(+), 788 deletions(-)
delete mode 100644 arch/arm/mach-u300/include/mach/hardware.h
delete mode 100644 arch/arm/mach-u300/include/mach/irqs.h
delete mode 100644 arch/arm/mach-u300/include/mach/syscon.h
delete mode 100644 arch/arm/mach-u300/include/mach/timex.h
delete mode 100644 arch/arm/mach-u300/include/mach/uncompress.h
rename arch/arm/mach-u300/{include/mach => }/u300-regs.h (100%)Signature · 1 line
1.7.11.3
PATCH 1/7 ARM: u300: push down syscon registers
From: Linus Walleij <[email protected]>
Get rid of the <mach/syscon.h> header as a prerequisite for multiplatform support. Do this by pushing the registers down to their respective drivers and deleting the unused remainder.
---
Mike: I'm seeking an ACK for this to take it through the ARM SoC tree alongside the big bowl of DT enablement patches.
--- arch/arm/mach-u300/core.c | 26 +- arch/arm/mach-u300/include/mach/syscon.h | 592 ------------------------------- arch/arm/mach-u300/regulator.c | 9 +- drivers/clk/clk-u300.c | 343 +++++++++++++++++- 4 files changed, 373 insertions(+), 597 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/syscon.h
arch/arm/mach-u300/core.c +25 -1
@@ -26,11 +26,35 @@#include <asm/mach/arch.h> #include <mach/u300-regs.h> -#include <mach/syscon.h> #include "timer.h" /* +* SYSCON addresses applicable to the core machine. +*/ + +/* Chip ID register 16bit (R/-) */ +#define U300_SYSCON_CIDR (0x400) +/* SMCR */ +#define U300_SYSCON_SMCR (0x4d0) +#define U300_SYSCON_SMCR_FIELD_MASK (0x000e) +#define U300_SYSCON_SMCR_SEMI_SREFACK_IND (0x0008) +#define U300_SYSCON_SMCR_SEMI_SREFREQ_ENABLE (0x0004) +#define U300_SYSCON_SMCR_SEMI_EXT_BOOT_MODE_ENABLE (0x0002) +/* CPU_SW_DBGEN Software Debug Enable 16bit (R/W) */ +#define U300_SYSCON_CSDR (0x4f0) +#define U300_SYSCON_CSDR_SW_DEBUG_ENABLE (0x0001) +/* PRINT_CONTROL Print Control 16bit (R/-) */ +#define U300_SYSCON_PCR (0x4f8) +#define U300_SYSCON_PCR_SERV_IND (0x0001) +/* BOOT_CONTROL 16bit (R/-) */ +#define U300_SYSCON_BCR (0x4fc) +#define U300_SYSCON_BCR_ACC_CPU_SUBSYS_VINITHI_IND (0x0400) +#define U300_SYSCON_BCR_APP_CPU_SUBSYS_VINITHI_IND (0x0200) +#define U300_SYSCON_BCR_EXTRA_BOOT_OPTION_MASK (0x01FC) +#define U300_SYSCON_BCR_APP_BOOT_SERV_MASK (0x0003) + +/* * Static I/O mappings that are needed for booting the U300 platforms. The * only things we need are the areas where we find the timer, syscon and * intcon, since the remaining device drivers will map their own memory
arch/arm/mach-u300/include/mach/syscon.h deleted +0 -592
592 lines not on this page · raw message
arch/arm/mach-u300/regulator.c +6 -3
@@ -17,9 +17,12 @@#include <linux/regulator/consumer.h> /* Those are just for writing in syscon */ #include <linux/io.h> -#include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/syscon.h> +#include <mach/u300-regs.h> + +/* Power Management Control 16bit (R/W) */ +#define U300_SYSCON_PMCR (0x50) +#define U300_SYSCON_PMCR_DCON_ENABLE (0x0002) +#define U300_SYSCON_PMCR_PWR_MGNT_ENABLE (0x0001)/* * Regulators that power the board and chip and which are
drivers/clk/clk-u300.c +342 -1
349 lines not on this page · raw message
Signature · 1 line
1.7.11.3
PATCH 1/7 ARM: u300: push down syscon registers
Quoted 6 lines · Linus Walleij
From: Linus Walleij <[email protected]>
Get rid of the <
mach/syscon.h> header as a prerequisite for multiplatform support. Do this by pushing the registers down to their respective drivers and deleting the unused remainder.
Quoted 6 lines
Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Mike: I'm seeking an ACK for this to take it through the ARM SoC tree alongside the big bowl of DT enablement patches.
---
How do those drivers get to the SYSCON base address? Should they be using drivers/mfd/syscon.c as the multiplexor instead?
Arnd
PATCH 1/7 ARM: u300: push down syscon registers
Quoted 14 lines · Arnd Bergmann
Quoted 6 lines · Linus Walleij
From: Linus Walleij <[email protected]>
Get rid of the <
mach/syscon.h> header as a prerequisite for multiplatform support. Do this by pushing the registers down to their respective drivers and deleting the unused remainder.Quoted 6 lines
Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Mike: I'm seeking an ACK for this to take it through the ARM SoC tree alongside the big bowl of DT enablement patches.
---
Quoted 2 lines
How do those drivers get to the SYSCON base address? Should they be using
drivers/mfd/syscon.cas the multiplexor instead?
No, there is no mutex to be taken. The consecutive range of memory addresses are used by different things (mainly the clocks) but there is no register that needs to be protected against access from two subsystems simultaneously.
As a follow-up to this series I plan to move also the U300 clocks to the device tree (similar three-step ladder as used for the Nomadik) and then they will (hopefully) get the syscon base address from the device tree.
Yours,
Linus Walleij
PATCH 1/7 ARM: u300: push down syscon registers
Quoted 8 lines · Linus Walleij
Quoted 2 lines
How do those drivers get to the SYSCON base address? Should they be using
drivers/mfd/syscon.cas the multiplexor instead?No, there is no mutex to be taken. The consecutive range of memory addresses are used by different things (mainly the clocks) but there is no register that needs to be protected against access from two subsystems simultaneously.
Quoted 4 lines
As a follow-up to this series I plan to move also the U300 clocks to the device tree (similar three-step ladder as used for the Nomadik) and then they will (hopefully) get the syscon base address from the device tree.
I was less worried about mutexes than a correct representation in the device tree. With the syscon driver, you can have the register ranges described exactly once and just use the offsets on the regmap in the other drivers.
Arnd
PATCH 1/7 ARM: u300: push down syscon registers
Quoted 14 lines · Arnd Bergmann
Quoted 8 lines · Linus Walleij
Quoted 2 lines
How do those drivers get to the SYSCON base address? Should they be using
drivers/mfd/syscon.cas the multiplexor instead?No, there is no mutex to be taken. The consecutive range of memory addresses are used by different things (mainly the clocks) but there is no register that needs to be protected against access from two subsystems simultaneously.
Quoted 4 lines
As a follow-up to this series I plan to move also the U300 clocks to the device tree (similar three-step ladder as used for the Nomadik) and then they will (hopefully) get the syscon base address from the device tree.
Quoted 4 lines
I was less worried about mutexes than a correct representation in the device tree. With the syscon driver, you can have the register ranges described exactly once and just use the offsets on the regmap in the other drivers.
Hm. This sounds a bit like modeling the Linux subsystems after the needs of the device tree rather than keeping these two as separate concepts.
It is true however that the same register base will appear twice:
once for the clk driver, and once for the syscon, which is not yet in the device tree.
The system controllers on several systems typically share this aspect.
For the DBx500 PRCMU we have solved the case where the pinctrl is using a few registers inside the PRCMU range like this:
pinctrl {
compatible = "stericsson,nmk-pinctrl";
prcm = <&prcmu>;
};prcmu: prcmu at 80157000 {
compatible = "stericsson,db8500-prcmu";
reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
(...)
};Then in the code:
if (np) {
prcm_np = of_parse_phandle(np, "prcm", 0);
if (prcm_np)
npct->prcm_base = of_iomap(prcm_np, 0);
}I could do something similar by creating a U300 syscon node and referring to it from the clk node, so the clk looks up its syscon to find the base.
If so, I can build this on top of the current patch series with multiplatform and all, as I convert the clocks to DT (which is the next and final step).
Yours,
Linus Walleij
PATCH 1/7 ARM: u300: push down syscon registers
Quoted 7 lines · Linus Walleij
I could do something similar by creating a U300 syscon node and referring to it from the clk node, so the clk looks up its syscon to find the base.
If so, I can build this on top of the current patch series with multiplatform and all, as I convert the clocks to DT (which is the next and final step).
Yes, I think this is a good plan. If there are just two drivers, that is probably the easiest way to do it. Using the syscon driver is not very different in the end and avoids mapping the same physical address range multiple times (having a static mapping avoids this too), and I'd prefer that if you have more drivers that need to get to the same registers.
Arnd
PATCH 1/7 ARM: u300: push down syscon registers
In reply to Linus WalleijQuoting Linus Walleij (2013-05-02 09:16:49)
Quoted 11 lines
From: Linus Walleij <[email protected]>
Get rid of the <
mach/syscon.h> header as a prerequisite for multiplatform support. Do this by pushing the registers down to their respective drivers and deleting the unused remainder.Cc Mike Turquette <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Mike: I'm seeking an ACK for this to take it through the ARM SoC tree alongside the big bowl of DT enablement patches.
For the clk-u300.c part:
PATCH 2/7 ARM: u300: remove deps from debug macro
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
This rids the dependency to <mach/hardware.h> (which is an implicit dependency to <mach/u300-regs.h>) from the U300 debug macro. Take this opportunity to update the file header.
--- arch/arm/include/debug/u300.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/arm/include/debug/u300.S +3 -6
@@ -1,14 +1,11 @@ /* - * - * arch-arm/mach-u300/include/mach/debug-macro.S - * - * - * Copyright (C) 2006-2009 ST-Ericsson AB + * Copyright (C) 2006-2013 ST-Ericsson AB * License terms: GNU General Public License (GPL) version 2 * Debugging macro include header. * Author: Linus Walleij <[email protected]> */ -#include <mach/hardware.h> +#define U300_SLOW_PER_PHYS_BASE 0xc0010000 +#define U300_SLOW_PER_VIRT_BASE 0xff000000 .macro addruart, rp, rv, tmp /* If we move the address using MMU, use this. */
Signature · 1 line
1.7.11.3
PATCH 3/7 ARM: u300: delete <mach/hardware.h>
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
This file is now unused and can be deleted.
--- arch/arm/mach-u300/include/mach/hardware.h | 5 ----- arch/arm/mach-u300/timer.c | 1 - 2 files changed, 6 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/hardware.h
arch/arm/mach-u300/include/mach/hardware.h deleted +0 -5
@@ -1,5 +0,0 @@ -/* -* arch/arm/mach-u300/include/mach/hardware.h -*/ -#include <asm/sizes.h> -#include <mach/u300-regs.h>
arch/arm/mach-u300/timer.c +0 -1
@@ -22,7 +22,6 @@#include <linux/of_address.h> #include <linux/of_irq.h> -#include <mach/hardware.h> #include <mach/irqs.h> /* Generic stuff */
Signature · 1 line
1.7.11.3
PATCH 4/7 ARM: u300: delete <mach/irqs.h>
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
All IRQs are now obtained from the device tree, and this file is unused, so delete it.
--- arch/arm/mach-u300/include/mach/irqs.h | 80 ---------------------------------- arch/arm/mach-u300/timer.c | 2 - 2 files changed, 82 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/irqs.h
arch/arm/mach-u300/include/mach/irqs.h deleted +0 -80
@@ -1,80 +0,0 @@ -/* -* -* arch/arm/mach-u300/include/mach/irqs.h -* -* -* Copyright (C) 2006-2012 ST-Ericsson AB -* License terms: GNU General Public License (GPL) version 2 -* IRQ channel definitions for the U300 platforms. -* Author: Linus Walleij <[email protected]> -*/ - -#ifndef __MACH_IRQS_H -#define __MACH_IRQS_H - -#define IRQ_U300_INTCON0_START 32 -#define IRQ_U300_INTCON1_START 64 -/* These are on INTCON0 - 30 lines */ -#define IRQ_U300_IRQ0_EXT 32 -#define IRQ_U300_IRQ1_EXT 33 -#define IRQ_U300_DMA 34 -#define IRQ_U300_VIDEO_ENC_0 35 -#define IRQ_U300_VIDEO_ENC_1 36 -#define IRQ_U300_AAIF_RX 37 -#define IRQ_U300_AAIF_TX 38 -#define IRQ_U300_AAIF_VGPIO 39 -#define IRQ_U300_AAIF_WAKEUP 40 -#define IRQ_U300_PCM_I2S0_FRAME 41 -#define IRQ_U300_PCM_I2S0_FIFO 42 -#define IRQ_U300_PCM_I2S1_FRAME 43 -#define IRQ_U300_PCM_I2S1_FIFO 44 -#define IRQ_U300_XGAM_GAMCON 45 -#define IRQ_U300_XGAM_CDI 46 -#define IRQ_U300_XGAM_CDICON 47 -#define IRQ_U300_XGAM_PDI 49 -#define IRQ_U300_XGAM_PDICON 50 -#define IRQ_U300_XGAM_GAMEACC 51 -#define IRQ_U300_XGAM_MCIDCT 52 -#define IRQ_U300_APEX 53 -#define IRQ_U300_UART0 54 -#define IRQ_U300_SPI 55 -#define IRQ_U300_TIMER_APP_OS 56 -#define IRQ_U300_TIMER_APP_DD 57 -#define IRQ_U300_TIMER_APP_GP1 58 -#define IRQ_U300_TIMER_APP_GP2 59 -#define IRQ_U300_TIMER_OS 60 -#define IRQ_U300_TIMER_MS 61 -#define IRQ_U300_KEYPAD_KEYBF 62 -#define IRQ_U300_KEYPAD_KEYBR 63 -/* These are on INTCON1 - 32 lines */ -#define IRQ_U300_GPIO_PORT0 64 -#define IRQ_U300_GPIO_PORT1 65 -#define IRQ_U300_GPIO_PORT2 66 - -/* These are for DB3150, DB3200 and DB3350 */ -#define IRQ_U300_WDOG 67 -#define IRQ_U300_EVHIST 68 -#define IRQ_U300_MSPRO 69 -#define IRQ_U300_MMCSD_MCIINTR0 70 -#define IRQ_U300_MMCSD_MCIINTR1 71 -#define IRQ_U300_I2C0 72 -#define IRQ_U300_I2C1 73 -#define IRQ_U300_RTC 74 -#define IRQ_U300_NFIF 75 -#define IRQ_U300_NFIF2 76 - -/* The DB3350-specific interrupt lines */ -#define IRQ_U300_ISP_F0 77 -#define IRQ_U300_ISP_F1 78 -#define IRQ_U300_ISP_F2 79 -#define IRQ_U300_ISP_F3 80 -#define IRQ_U300_ISP_F4 81 -#define IRQ_U300_GPIO_PORT3 82 -#define IRQ_U300_SYSCON_PLL_LOCK 83 -#define IRQ_U300_UART1 84 -#define IRQ_U300_GPIO_PORT4 85 -#define IRQ_U300_GPIO_PORT5 86 -#define IRQ_U300_GPIO_PORT6 87 -#define U300_VIC_IRQS_END 88 - -#endif
arch/arm/mach-u300/timer.c +0 -2
@@ -22,8 +22,6 @@#include <linux/of_address.h> #include <linux/of_irq.h> -#include <mach/irqs.h> -/* Generic stuff */ #include <asm/sched_clock.h> #include <asm/mach/map.h>
Signature · 1 line
1.7.11.3
PATCH 5/7 ARM: u300: localize <mach/u300-regs.h>
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
This register base file is now only used in the machine itself so move it down into mach-u300.
---
arch/arm/mach-u300/core.c | 3 +--
arch/arm/mach-u300/regulator.c | 2 +-
arch/arm/mach-u300/{include/mach => }/u300-regs.h | 0
3 files changed, 2 insertions(+), 3 deletions(-)
rename arch/arm/mach-u300/{include/mach => }/u300-regs.h (100%)arch/arm/mach-u300/core.c +1 -2
@@ -25,9 +25,8 @@#include <asm/mach/map.h> #include <asm/mach/arch.h> -#include <mach/u300-regs.h> -#include "timer.h" +#include "u300-regs.h" /* * SYSCON addresses applicable to the core machine.
arch/arm/mach-u300/regulator.c +1 -1
@@ -17,7 +17,7 @@#include <linux/regulator/consumer.h> /* Those are just for writing in syscon */ #include <linux/io.h> -#include <mach/u300-regs.h> +#include "u300-regs.h" /* Power Management Control 16bit (R/W) */ #define U300_SYSCON_PMCR (0x50)
arch/arm/mach-u300/u300-regs.h renamed from arch/arm/mach-u300/include/mach/u300-regs.h +0 -0
Signature · 1 line
1.7.11.3
PATCH 6/7 ARM: u300: convert to multiplatform
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
Now that we removed our dependency on <mach/*> the U300 can be converted to mutliplatform. Remove the invalid restriction that U300 would not support AUTO_ZRELADDR (it does) and update the defconfig in the process.
--- arch/arm/Kconfig | 21 +-------------------- arch/arm/configs/u300_defconfig | 11 ++++------- arch/arm/mach-u300/Kconfig | 31 +++++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 33 deletions(-)
arch/arm/Kconfig +1 -20
@@ -886,25 +886,6 @@ config ARCH_SHARK Support for the StrongARM based Digital DNARD machine, also known as "Shark" (<http://www.shark-linux.de/shark.html>). -config ARCH_U300 - bool "ST-Ericsson U300 Series" - depends on MMU - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select ARM_PATCH_PHYS_VIRT - select ARM_VIC - select CLKDEV_LOOKUP - select CLKSRC_MMIO - select CLKSRC_OF - select COMMON_CLK - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select HAVE_TCM - select SPARSE_IRQ - select USE_OF - help - Support for ST-Ericsson U300 series mobile platforms. - config ARCH_U8500 bool "ST-Ericsson U8500 Series" depends on MMU
@@ -2151,7 +2132,7 @@ config CRASH_DUMP config AUTO_ZRELADDR bool "Auto calculation of the decompressed kernel image address" - depends on !ZBOOT_ROM && !ARCH_U300 + depends on !ZBOOT_ROM help ZRELADDR is the physical address where the decompressed kernel image will be placed. If AUTO_ZRELADDR is selected, the address
arch/arm/configs/u300_defconfig +4 -7
@@ -1,7 +1,8 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y # CONFIG_AIO is not set
@@ -11,12 +12,9 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_CFQ is not set +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_U300=y -CONFIG_MACH_U300=y -CONFIG_MACH_U300_BS335=y CONFIG_MACH_U300_SPIDUMMY=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -44,11 +42,11 @@ CONFIG_I2C=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y CONFIG_MMC_CLKGATE=y
@@ -70,4 +68,3 @@ CONFIG_DEBUG_FS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y -# CONFIG_CRC32 is not set
arch/arm/mach-u300/Kconfig +25 -6
@@ -1,24 +1,45 @@ -if ARCH_U300 - menu "ST-Ericsson AB U300/U335 Platform" comment "ST-Ericsson Mobile Platform Products" -config MACH_U300 - bool "U300" +config ARCH_U300 + bool "ST-Ericsson U300 Series" + depends on MMU + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select ARM_PATCH_PHYS_VIRT + select ARM_VIC + select CLKDEV_LOOKUP + select CLKSRC_MMIO + select CLKSRC_OF + select COMMON_CLK + select CPU_ARM926T + select GENERIC_CLOCKEVENTS + select HAVE_TCM select PINCTRL select PINCTRL_COH901 select PINCTRL_U300 + select SPARSE_IRQ + select USE_OF + help + Support for ST-Ericsson U300 series mobile platforms. comment "ST-Ericsson U300/U335 Feature Selections" +config MACH_U300 + depends on ARCH_U300 + bool "U300" + default y + config U300_DEBUG + depends on ARCH_U300 bool "Debug support for U300" depends on PM help Debug support for U300 in sysfs, procfs etc. config MACH_U300_SPIDUMMY + depends on ARCH_U300 bool "SSP/SPI dummy chip" select SPI select SPI_MASTER
@@ -31,5 +52,3 @@ config MACH_U300_SPIDUMMY SPI framework and ARM PL022 support. endmenu - -endif
Signature · 1 line
1.7.11.3
PATCH 7/7 ARM: u300: delete remnant machine headers
In reply to Linus WalleijFrom: Linus Walleij <[email protected]>
Two files remain in <mach/*> for U300: timex.h and uncompress.h. The former is done away with by using defaults, the latter is unused in multiplatform.
--- arch/arm/mach-u300/include/mach/timex.h | 17 ----------- arch/arm/mach-u300/include/mach/uncompress.h | 45 ---------------------------- 2 files changed, 62 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/timex.h delete mode 100644 arch/arm/mach-u300/include/mach/uncompress.h
arch/arm/mach-u300/include/mach/timex.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* -* arch/arm/mach-u300/include/mach/timex.h -* -* -* Copyright (C) 2006-2009 ST-Ericsson AB -* License terms: GNU General Public License (GPL) version 2 -* Platform tick rate definition. -* Author: Linus Walleij <[email protected]> -*/ -#ifndef __MACH_TIMEX_H -#define __MACH_TIMEX_H - -/* This is for the APP OS GP1 (General Purpose 1) timer */ -#define CLOCK_TICK_RATE 1000000 - -#endif
arch/arm/mach-u300/include/mach/uncompress.h deleted +0 -45
45 lines not on this page · raw message
Signature · 1 line
1.7.11.3
cover ARM: u300 multiplatform support
In reply to Linus WalleijQuoted 8 lines · Linus Walleij
From: Linus Walleij <[email protected]>
This series builds on top of the recently iterated U300 device tree support to convert the platform to multiplatform (a.k.a. single zImage).
This is intended to be pulled on top of the DT support.
Very nice! For the patches 2-7:
For patch 1, I'll wait for your reply. It's probably ok too.
Arnd