github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

TI keystone SoC updates for v6.6

Browse Source 
Updates:
  - Consolidation of files and drop pm_domain.c and keystone.h
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE+KKGk1TrgjIXoxo03bWEnRc2JJ0FAmTaSXkACgkQ3bWEnRc2
 JJ3xwQ//aXbS2nrgWMUgK8JkcoPKSnRYL8DVp9ng3gsJb3VrVxKsYjqCvKVfeJ37
 ppRIR/5SFMu/vT1fWWVS28sQOoEb211avY6bd2x0Hoj58uTQ5lch40R63j6e6vT1
 cWrJose27KYJELY9tGnDYlKp+eh+0RhBJUCmwdLkPwFlldXqlpzFFLzD1baXHaYL
 R2wZJl1EQuc/o3r2G2kQIX6PlV/F3+/8RGrVqpbXWbe9pFRiZZeKiuHnaXxd45AS
 +mbdxYYUQCnylfxg1q34qjB5AQ33Vl/LZLhsh2lblBqZITo11hiv2+XIsxMhBJQ1
 lJO7fNe6wWrZ8HJUzu9NtTpy1omQCFBHWG/iN3vyYzbIgfqDqyz8lSGpze/UOoX6
 AwvDPhPrHB/LyNOC/tHt68dGaqSTtfv75JgyLJf48fxngOBjPO8kqYDCtFpJvAUC
 M/hhkJlm7MCVK8y0gtQhwSyjC957DzSvxKHsYKXfMdR68JU+uD7MI7kx2stWxY22
 /WjWqAQIGoRpb9vDC2ylgGVPuGtfSJBwIRg+0biceB3AiMnbGCxFBxC68UGQ4dW2
 2+8AHmeyr35QMH5U+uZxhZtwULzVSQKhH62IPEg5eK7XZOQzkcne59qae2zwiL1h
 qSuO29xqr9lknY3cUG8Cvfs5dQ7wVauAjrmQGobzDzgPbMLxPL0=
 =QSA2
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTaU1QACgkQYKtH/8kJ
 UicCRQ//Q+1UQlzbh0cYP2Rrn6KOoCbyhepYE52/MVOhSR+UiRJjjuTI7niOgzsK
 2X0ZS0LYM1aaVju1RVsi4wk5MpjSXf9R0WhfH7MnPGCalx5NvuvXS46pu6mvUE6U
 oc8MKJZl8BPSvW63BT72UhA4d2MMoEZgeIUVc8x6ZsWkO+0crkNuy6qypAJWUctA
 2br5137l4JmuwxSPTsZ3Dz1q3xbHvdX4oL13OlokMpLMwTEw0IPEnCFjRscs8qa+
 YiK5V7I00CvVOZZf2R4VahJkFpehgQS8oKXghhQKcg34sKvFj/YKmAg8sZPSyQfI
 ETEHFmsnCMJhIW094OrdaY29TfE6E+6hPyBW5QNiOq2pLlD3kn1o6adnSG1gAc4A
 frSsPbQ4jxZWSKkpkUWl9e47pHsp/2sN9+5Ga/YLtcorbX8xzs4hZmSLSrMA8Spm
 H7MfPZZ7aJH8K4aYcoiHNpki+aUolIRqxTjssu86lrRnHs16qcFtjNHH5OnMYxu9
 8w20/rW9ahqrpkf9kvwhvB1OOW3b1JATGGCejoL4DoZ4W2CISqo6rJjIxCDUcMSN
 uykFDFvQV3o53ybAJkpQk7+JjOBkmKG3NVlk0vWevGoPyBiT/rmH/ziwLmpG3Bah
 qklejmjPUzkcDAn8TwWCj2Zq5mudOXlscevVeVC7PvUjyWts4lI=
 =kFIn
 -----END PGP SIGNATURE-----

Merge tag 'ti-keystone-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/arm

TI keystone SoC updates for v6.6

Updates:
 - Consolidation of files and drop pm_domain.c and keystone.h

* tag 'ti-keystone-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  ARM: keystone: Merge PM function into main support file
  ARM: keystone: Merge memory.h into the only file that uses it
  ARM: keystone: Drop unused includes

Link: https://lore.kernel.org/r/20230814160702.6l2fcujbx33eogap@junction
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-08-14 18:16:09 +02:00
commit 446f0a4b33
5 changed files with 45 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-keystone/Makefile
View File

@ -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

50
arch/arm/mach-keystone/keystone.c
View File

@ -6,13 +6,15 @@
* Cyril Chemparathy <cyril@ti.com>
* Santosh Shilimkar <santosh.shillimkar@ti.com>
*/
#include <linux/io.h>
#include <linux/of.h>
#include <linux/dma-map-ops.h>
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/of_address.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>
#include <asm/mach/map.h>
@ -20,9 +22,47 @@
#include <asm/mach/time.h>
#include <asm/page.h>
#include "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)
#include "keystone.h"
#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)
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,

16
arch/arm/mach-keystone/keystone.h
View File

@ -1,16 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright 2013 Texas Instruments, Inc.
* Cyril Chemparathy <cyril@ti.com>
* Santosh Shilimkar <santosh.shillimkar@ti.com>
*/
#ifndef __KEYSTONE_H__
#define __KEYSTONE_H__
#ifndef __ASSEMBLER__
extern int keystone_pm_runtime_init(void);
#endif /* __ASSEMBLER__ */
#endif /* __KEYSTONE_H__ */

18
arch/arm/mach-keystone/memory.h
View File

@ -1,18 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright 2014 Texas Instruments, Inc.
* Santosh Shilimkar <santosh.shilimkar@ti.com>
*/
#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 */

50
arch/arm/mach-keystone/pm_domain.c
View File

@ -1,50 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* PM domain driver for Keystone2 devices
*
* Copyright 2013 Texas Instruments, Inc.
* Santosh Shilimkar <santosh.shillimkar@ti.com>
*
* Based on Kevins work on DAVINCI SOCs
* Kevin Hilman <khilman@linaro.org>
*/
#include <linux/init.h>
#include <linux/pm_runtime.h>
#include <linux/pm_clock.h>
#include <linux/platform_device.h>
#include <linux/of.h>
#include "keystone.h"
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 */ },
};
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;
}