ARM: keystone: Merge memory.h into the only file that uses it
PATCH v2 1/2 ARM: keystone: Merge memory.h into the only file that uses it
The defines in memory.h can go into the file that makes use of them. No reason to have a header here, remove.
--- arch/arm/mach-keystone/keystone.c | 12 ++++++++++-- arch/arm/mach-keystone/memory.h | 18 ------------------ 2 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 arch/arm/mach-keystone/memory.h
arch/arm/mach-keystone/keystone.c +10 -2
@@ -18,10 +18,18 @@#include <asm/mach/time.h> #include <asm/page.h> -#include "memory.h" -#include "keystone.h" +#define KEYSTONE_LOW_PHYS_START 0x80000000ULL +#define KEYSTONE_LOW_PHYS_SIZE 0x80000000ULL/* 2G */ +#define KEYSTONE_LOW_PHYS_END (KEYSTONE_LOW_PHYS_START + \ + KEYSTONE_LOW_PHYS_SIZE - 1) + +#define KEYSTONE_HIGH_PHYS_START 0x800000000ULL +#define KEYSTONE_HIGH_PHYS_SIZE 0x400000000ULL/* 16G */ +#define KEYSTONE_HIGH_PHYS_END (KEYSTONE_HIGH_PHYS_START + \ + KEYSTONE_HIGH_PHYS_SIZE - 1) +#ifdef CONFIG_ARM_LPAE static int keystone_platform_notifier (struct notifier_block *nb,unsigned long event,void *data)
arch/arm/mach-keystone/memory.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright 2014 Texas Instruments, Inc. -* Santosh Shilimkar <[email protected]> -*/ -#ifndef __MEMORY_H -#define __MEMORY_H - -#define KEYSTONE_LOW_PHYS_START 0x80000000ULL -#define KEYSTONE_LOW_PHYS_SIZE 0x80000000ULL/* 2G */ -#define KEYSTONE_LOW_PHYS_END (KEYSTONE_LOW_PHYS_START + \ - KEYSTONE_LOW_PHYS_SIZE - 1) - -#define KEYSTONE_HIGH_PHYS_START 0x800000000ULL -#define KEYSTONE_HIGH_PHYS_SIZE 0x400000000ULL/* 16G */ -#define KEYSTONE_HIGH_PHYS_END (KEYSTONE_HIGH_PHYS_START + \ - KEYSTONE_HIGH_PHYS_SIZE - 1) -#endif /* __MEMORY_H */
Signature · 1 line
2.39.2
PATCH v2 2/2 ARM: keystone: Merge PM function into main support file
The one function left in this file does not justify a whole extra file nor the keystone.h support file used to forward declare that function. Merge this into the main keystone.c file.
---
Changes for v2:
- Make keystone_pm_runtime_init static (kernel test robot <[email protected]>)
- Rebase on next to get patch dropping headers
- Drop all taken patches after this one in series
arch/arm/mach-keystone/Makefile | 3 -- arch/arm/mach-keystone/keystone.c | 38 +++++++++++++++++++++-- arch/arm/mach-keystone/keystone.h | 16 ---------- arch/arm/mach-keystone/pm_domain.c | 50 ------------------------------ 4 files changed, 36 insertions(+), 71 deletions(-) delete mode 100644 arch/arm/mach-keystone/keystone.h delete mode 100644 arch/arm/mach-keystone/pm_domain.c
arch/arm/mach-keystone/Makefile +0 -3
@@ -1,5 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := keystone.o - -# PM domain driver for Keystone SOCs -obj-$(CONFIG_ARCH_KEYSTONE) += pm_domain.o
arch/arm/mach-keystone/keystone.c +36 -2
@@ -6,10 +6,14 @@* Cyril Chemparathy <[email protected]> * Santosh Shilimkar <[email protected]> */ +#include <linux/io.h> #include <linux/dma-map-ops.h> #include <linux/init.h> +#include <linux/pm_runtime.h> +#include <linux/pm_clock.h> #include <linux/memblock.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <asm/setup.h>
@@ -18,8 +22,6 @@#include <asm/mach/time.h> #include <asm/page.h> -#include "keystone.h" -#define KEYSTONE_LOW_PHYS_START 0x80000000ULL#define KEYSTONE_LOW_PHYS_SIZE 0x80000000ULL/* 2G */ #define KEYSTONE_LOW_PHYS_END (KEYSTONE_LOW_PHYS_START + \
@@ -30,6 +32,38 @@#define KEYSTONE_HIGH_PHYS_END (KEYSTONE_HIGH_PHYS_START + \ KEYSTONE_HIGH_PHYS_SIZE - 1) +static struct dev_pm_domain keystone_pm_domain = { + .ops = { + USE_PM_CLK_RUNTIME_OPS +USE_PLATFORM_PM_SLEEP_OPS + }, +}; + +static struct pm_clk_notifier_block platform_domain_notifier = { + .pm_domain = &keystone_pm_domain, + .con_ids = {NULL }, +}; + +static const struct of_device_id of_keystone_table[] = { + {.compatible ="ti,k2hk" }, + {.compatible ="ti,k2e" }, + {.compatible ="ti,k2l" }, + {/* end of list */ }, +}; + +static int __init keystone_pm_runtime_init (void ) +{ +struct device_node *np; + + np =of_find_matching_node (NULL , of_keystone_table); +if (!np) +return 0 ; + +pm_clk_add_notifier (&platform_bus_type, &platform_domain_notifier); + +return 0 ; +} +#ifdef CONFIG_ARM_LPAE static int keystone_platform_notifier (struct notifier_block *nb,unsigned long event,void *data)
arch/arm/mach-keystone/keystone.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright 2013 Texas Instruments, Inc. -* Cyril Chemparathy <[email protected]> -* Santosh Shilimkar <[email protected]> -*/ - -#ifndef __KEYSTONE_H__ -#define __KEYSTONE_H__ - -#ifndef __ASSEMBLER__ - -extern int keystone_pm_runtime_init (void ); - -#endif /* __ASSEMBLER__ */ -#endif /* __KEYSTONE_H__ */
arch/arm/mach-keystone/pm_domain.c deleted +0 -50
50 lines not on this page · raw message
Signature · 1 line
2.39.2
Hi Andrew Davis,
Quoted 4 lines · Andrew Davis
The defines in
memory.hcan go into the file that makes use of them. No reason to have a header here, remove.
I have applied the following to branch ti-keystone-next on [1]. Thank you!
[1/2] ARM: keystone: Merge memory.h into the only file that uses it
commit: 04a0137fc36d0b544afd5afd59f8f739ca97e33e
[2/2] ARM: keystone: Merge PM function into main support file
commit: d33dbddf43a055f69bda7f3488bb1e136d1b6bbcAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D