tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
reset: sti: Remove STiH415/6 reset support
Support for STiH415/6 SoCs is being removed from the
kernel because the platforms are obsolete. This patch removes
the reset drivers for these SoC's.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
authored by
Peter Griffin
and committed by
Philipp Zabel
64933513
1001354c
-267
-2
arch/arm/mach-sti/Kconfig
-2
arch/arm/mach-sti/Kconfig
···
28
28
config SOC_STIH415
29
29
bool "STiH415 STMicroelectronics Consumer Electronics family"
30
30
default y
31
-
select STIH415_RESET
32
31
help
33
32
This enables support for STMicroelectronics Digital Consumer
34
33
Electronics family StiH415 parts, primarily targeted at set-top-box
···
37
38
config SOC_STIH416
38
39
bool "STiH416 STMicroelectronics Consumer Electronics family"
39
40
default y
40
-
select STIH416_RESET
41
41
help
42
42
This enables support for STMicroelectronics Digital Consumer
43
43
Electronics family StiH416 parts, primarily targeted at set-top-box
-8
drivers/reset/sti/Kconfig
-8
drivers/reset/sti/Kconfig
-2
drivers/reset/sti/Makefile
-2
drivers/reset/sti/Makefile
-112
drivers/reset/sti/reset-stih415.c
-112
drivers/reset/sti/reset-stih415.c
···
1
-
/*
2
-
* Copyright (C) 2013 STMicroelectronics (R&D) Limited
3
-
* Author: Stephen Gallimore <stephen.gallimore@st.com>
4
-
* Author: Srinivas Kandagatla <srinivas.kandagatla@st.com>
5
-
*
6
-
* This program is free software; you can redistribute it and/or modify
7
-
* it under the terms of the GNU General Public License as published by
8
-
* the Free Software Foundation; either version 2 of the License, or
9
-
* (at your option) any later version.
10
-
*/
11
-
#include <linux/module.h>
12
-
#include <linux/of.h>
13
-
#include <linux/of_platform.h>
14
-
#include <linux/platform_device.h>
15
-
16
-
#include <dt-bindings/reset/stih415-resets.h>
17
-
18
-
#include "reset-syscfg.h"
19
-
20
-
/*
21
-
* STiH415 Peripheral powerdown definitions.
22
-
*/
23
-
static const char stih415_front[] = "st,stih415-front-syscfg";
24
-
static const char stih415_rear[] = "st,stih415-rear-syscfg";
25
-
static const char stih415_sbc[] = "st,stih415-sbc-syscfg";
26
-
static const char stih415_lpm[] = "st,stih415-lpm-syscfg";
27
-
28
-
#define STIH415_PDN_FRONT(_bit) \
29
-
_SYSCFG_RST_CH(stih415_front, SYSCFG_114, _bit, SYSSTAT_187, _bit)
30
-
31
-
#define STIH415_PDN_REAR(_cntl, _stat) \
32
-
_SYSCFG_RST_CH(stih415_rear, SYSCFG_336, _cntl, SYSSTAT_384, _stat)
33
-
34
-
#define STIH415_SRST_REAR(_reg, _bit) \
35
-
_SYSCFG_RST_CH_NO_ACK(stih415_rear, _reg, _bit)
36
-
37
-
#define STIH415_SRST_SBC(_reg, _bit) \
38
-
_SYSCFG_RST_CH_NO_ACK(stih415_sbc, _reg, _bit)
39
-
40
-
#define STIH415_SRST_FRONT(_reg, _bit) \
41
-
_SYSCFG_RST_CH_NO_ACK(stih415_front, _reg, _bit)
42
-
43
-
#define STIH415_SRST_LPM(_reg, _bit) \
44
-
_SYSCFG_RST_CH_NO_ACK(stih415_lpm, _reg, _bit)
45
-
46
-
#define SYSCFG_114 0x38 /* Powerdown request EMI/NAND/Keyscan */
47
-
#define SYSSTAT_187 0x15c /* Powerdown status EMI/NAND/Keyscan */
48
-
49
-
#define SYSCFG_336 0x90 /* Powerdown request USB/SATA/PCIe */
50
-
#define SYSSTAT_384 0x150 /* Powerdown status USB/SATA/PCIe */
51
-
52
-
#define SYSCFG_376 0x130 /* Reset generator 0 control 0 */
53
-
#define SYSCFG_166 0x108 /* Softreset Ethernet 0 */
54
-
#define SYSCFG_31 0x7c /* Softreset Ethernet 1 */
55
-
#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
56
-
57
-
static const struct syscfg_reset_channel_data stih415_powerdowns[] = {
58
-
[STIH415_EMISS_POWERDOWN] = STIH415_PDN_FRONT(0),
59
-
[STIH415_NAND_POWERDOWN] = STIH415_PDN_FRONT(1),
60
-
[STIH415_KEYSCAN_POWERDOWN] = STIH415_PDN_FRONT(2),
61
-
[STIH415_USB0_POWERDOWN] = STIH415_PDN_REAR(0, 0),
62
-
[STIH415_USB1_POWERDOWN] = STIH415_PDN_REAR(1, 1),
63
-
[STIH415_USB2_POWERDOWN] = STIH415_PDN_REAR(2, 2),
64
-
[STIH415_SATA0_POWERDOWN] = STIH415_PDN_REAR(3, 3),
65
-
[STIH415_SATA1_POWERDOWN] = STIH415_PDN_REAR(4, 4),
66
-
[STIH415_PCIE_POWERDOWN] = STIH415_PDN_REAR(5, 8),
67
-
};
68
-
69
-
static const struct syscfg_reset_channel_data stih415_softresets[] = {
70
-
[STIH415_ETH0_SOFTRESET] = STIH415_SRST_FRONT(SYSCFG_166, 0),
71
-
[STIH415_ETH1_SOFTRESET] = STIH415_SRST_SBC(SYSCFG_31, 0),
72
-
[STIH415_IRB_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 6),
73
-
[STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9),
74
-
[STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10),
75
-
[STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11),
76
-
[STIH415_KEYSCAN_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 8),
77
-
};
78
-
79
-
static struct syscfg_reset_controller_data stih415_powerdown_controller = {
80
-
.wait_for_ack = true,
81
-
.nr_channels = ARRAY_SIZE(stih415_powerdowns),
82
-
.channels = stih415_powerdowns,
83
-
};
84
-
85
-
static struct syscfg_reset_controller_data stih415_softreset_controller = {
86
-
.wait_for_ack = false,
87
-
.active_low = true,
88
-
.nr_channels = ARRAY_SIZE(stih415_softresets),
89
-
.channels = stih415_softresets,
90
-
};
91
-
92
-
static const struct of_device_id stih415_reset_match[] = {
93
-
{ .compatible = "st,stih415-powerdown",
94
-
.data = &stih415_powerdown_controller, },
95
-
{ .compatible = "st,stih415-softreset",
96
-
.data = &stih415_softreset_controller, },
97
-
{},
98
-
};
99
-
100
-
static struct platform_driver stih415_reset_driver = {
101
-
.probe = syscfg_reset_probe,
102
-
.driver = {
103
-
.name = "reset-stih415",
104
-
.of_match_table = stih415_reset_match,
105
-
},
106
-
};
107
-
108
-
static int __init stih415_reset_init(void)
109
-
{
110
-
return platform_driver_register(&stih415_reset_driver);
111
-
}
112
-
arch_initcall(stih415_reset_init);
-143
drivers/reset/sti/reset-stih416.c
-143
drivers/reset/sti/reset-stih416.c
···
1
-
/*
2
-
* Copyright (C) 2013 STMicroelectronics (R&D) Limited
3
-
* Author: Stephen Gallimore <stephen.gallimore@st.com>
4
-
* Author: Srinivas Kandagatla <srinivas.kandagatla@st.com>
5
-
*
6
-
* This program is free software; you can redistribute it and/or modify
7
-
* it under the terms of the GNU General Public License as published by
8
-
* the Free Software Foundation; either version 2 of the License, or
9
-
* (at your option) any later version.
10
-
*/
11
-
#include <linux/module.h>
12
-
#include <linux/of.h>
13
-
#include <linux/of_platform.h>
14
-
#include <linux/platform_device.h>
15
-
16
-
#include <dt-bindings/reset/stih416-resets.h>
17
-
18
-
#include "reset-syscfg.h"
19
-
20
-
/*
21
-
* STiH416 Peripheral powerdown definitions.
22
-
*/
23
-
static const char stih416_front[] = "st,stih416-front-syscfg";
24
-
static const char stih416_rear[] = "st,stih416-rear-syscfg";
25
-
static const char stih416_sbc[] = "st,stih416-sbc-syscfg";
26
-
static const char stih416_lpm[] = "st,stih416-lpm-syscfg";
27
-
static const char stih416_cpu[] = "st,stih416-cpu-syscfg";
28
-
29
-
#define STIH416_PDN_FRONT(_bit) \
30
-
_SYSCFG_RST_CH(stih416_front, SYSCFG_1500, _bit, SYSSTAT_1578, _bit)
31
-
32
-
#define STIH416_PDN_REAR(_cntl, _stat) \
33
-
_SYSCFG_RST_CH(stih416_rear, SYSCFG_2525, _cntl, SYSSTAT_2583, _stat)
34
-
35
-
#define SYSCFG_1500 0x7d0 /* Powerdown request EMI/NAND/Keyscan */
36
-
#define SYSSTAT_1578 0x908 /* Powerdown status EMI/NAND/Keyscan */
37
-
38
-
#define SYSCFG_2525 0x834 /* Powerdown request USB/SATA/PCIe */
39
-
#define SYSSTAT_2583 0x91c /* Powerdown status USB/SATA/PCIe */
40
-
41
-
#define SYSCFG_2552 0x8A0 /* Reset Generator control 0 */
42
-
#define SYSCFG_1539 0x86c /* Softreset Ethernet 0 */
43
-
#define SYSCFG_510 0x7f8 /* Softreset Ethernet 1 */
44
-
#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
45
-
#define SYSCFG_2553 0x8a4 /* Softreset SATA0/1, PCIE0/1 */
46
-
#define SYSCFG_7563 0x8cc /* MPE softresets 0 */
47
-
#define SYSCFG_7564 0x8d0 /* MPE softresets 1 */
48
-
49
-
#define STIH416_SRST_CPU(_reg, _bit) \
50
-
_SYSCFG_RST_CH_NO_ACK(stih416_cpu, _reg, _bit)
51
-
52
-
#define STIH416_SRST_FRONT(_reg, _bit) \
53
-
_SYSCFG_RST_CH_NO_ACK(stih416_front, _reg, _bit)
54
-
55
-
#define STIH416_SRST_REAR(_reg, _bit) \
56
-
_SYSCFG_RST_CH_NO_ACK(stih416_rear, _reg, _bit)
57
-
58
-
#define STIH416_SRST_LPM(_reg, _bit) \
59
-
_SYSCFG_RST_CH_NO_ACK(stih416_lpm, _reg, _bit)
60
-
61
-
#define STIH416_SRST_SBC(_reg, _bit) \
62
-
_SYSCFG_RST_CH_NO_ACK(stih416_sbc, _reg, _bit)
63
-
64
-
static const struct syscfg_reset_channel_data stih416_powerdowns[] = {
65
-
[STIH416_EMISS_POWERDOWN] = STIH416_PDN_FRONT(0),
66
-
[STIH416_NAND_POWERDOWN] = STIH416_PDN_FRONT(1),
67
-
[STIH416_KEYSCAN_POWERDOWN] = STIH416_PDN_FRONT(2),
68
-
[STIH416_USB0_POWERDOWN] = STIH416_PDN_REAR(0, 0),
69
-
[STIH416_USB1_POWERDOWN] = STIH416_PDN_REAR(1, 1),
70
-
[STIH416_USB2_POWERDOWN] = STIH416_PDN_REAR(2, 2),
71
-
[STIH416_USB3_POWERDOWN] = STIH416_PDN_REAR(6, 5),
72
-
[STIH416_SATA0_POWERDOWN] = STIH416_PDN_REAR(3, 3),
73
-
[STIH416_SATA1_POWERDOWN] = STIH416_PDN_REAR(4, 4),
74
-
[STIH416_PCIE0_POWERDOWN] = STIH416_PDN_REAR(7, 9),
75
-
[STIH416_PCIE1_POWERDOWN] = STIH416_PDN_REAR(5, 8),
76
-
};
77
-
78
-
static const struct syscfg_reset_channel_data stih416_softresets[] = {
79
-
[STIH416_ETH0_SOFTRESET] = STIH416_SRST_FRONT(SYSCFG_1539, 0),
80
-
[STIH416_ETH1_SOFTRESET] = STIH416_SRST_SBC(SYSCFG_510, 0),
81
-
[STIH416_IRB_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 6),
82
-
[STIH416_USB0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 9),
83
-
[STIH416_USB1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 10),
84
-
[STIH416_USB2_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 11),
85
-
[STIH416_USB3_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 28),
86
-
[STIH416_SATA0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 7),
87
-
[STIH416_SATA1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 3),
88
-
[STIH416_PCIE0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 15),
89
-
[STIH416_PCIE1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 2),
90
-
[STIH416_AUD_DAC_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 14),
91
-
[STIH416_HDTVOUT_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 5),
92
-
[STIH416_VTAC_M_RX_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 25),
93
-
[STIH416_VTAC_A_RX_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 26),
94
-
[STIH416_SYNC_HD_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 5),
95
-
[STIH416_SYNC_SD_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 6),
96
-
[STIH416_BLITTER_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 10),
97
-
[STIH416_GPU_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 11),
98
-
[STIH416_VTAC_M_TX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 18),
99
-
[STIH416_VTAC_A_TX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 19),
100
-
[STIH416_VTG_AUX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 21),
101
-
[STIH416_JPEG_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 23),
102
-
[STIH416_HVA_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 2),
103
-
[STIH416_COMPO_M_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 3),
104
-
[STIH416_COMPO_A_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 4),
105
-
[STIH416_VP8_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 10),
106
-
[STIH416_VTG_MAIN_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 16),
107
-
[STIH416_KEYSCAN_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 8),
108
-
};
109
-
110
-
static struct syscfg_reset_controller_data stih416_powerdown_controller = {
111
-
.wait_for_ack = true,
112
-
.nr_channels = ARRAY_SIZE(stih416_powerdowns),
113
-
.channels = stih416_powerdowns,
114
-
};
115
-
116
-
static struct syscfg_reset_controller_data stih416_softreset_controller = {
117
-
.wait_for_ack = false,
118
-
.active_low = true,
119
-
.nr_channels = ARRAY_SIZE(stih416_softresets),
120
-
.channels = stih416_softresets,
121
-
};
122
-
123
-
static const struct of_device_id stih416_reset_match[] = {
124
-
{ .compatible = "st,stih416-powerdown",
125
-
.data = &stih416_powerdown_controller, },
126
-
{ .compatible = "st,stih416-softreset",
127
-
.data = &stih416_softreset_controller, },
128
-
{},
129
-
};
130
-
131
-
static struct platform_driver stih416_reset_driver = {
132
-
.probe = syscfg_reset_probe,
133
-
.driver = {
134
-
.name = "reset-stih416",
135
-
.of_match_table = stih416_reset_match,
136
-
},
137
-
};
138
-
139
-
static int __init stih416_reset_init(void)
140
-
{
141
-
return platform_driver_register(&stih416_reset_driver);
142
-
}
143
-
arch_initcall(stih416_reset_init);