Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6bff5474
Commit
6bff5474
authored
Mar 23, 2017
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hwmod-cleanup' into omap-for-v4.12/soc
parents
342bef7c
3cdf2f80
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
210 deletions
+15
-210
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.c
+13
-186
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod.h
+2
-14
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+0
-1
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+0
-4
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+0
-2
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+0
-2
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+0
-1
No files found.
arch/arm/mach-omap2/omap_hwmod.c
View file @
6bff5474
This diff is collapsed.
Click to expand it.
arch/arm/mach-omap2/omap_hwmod.h
View file @
6bff5474
...
...
@@ -313,6 +313,7 @@ struct omap_hwmod_ocp_if {
struct
omap_hwmod_addr_space
*
addr
;
const
char
*
clk
;
struct
clk
*
_clk
;
struct
list_head
node
;
union
{
struct
omap_hwmod_omap2_firewall
omap2
;
}
fw
;
...
...
@@ -410,7 +411,6 @@ struct omap_hwmod_class_sysconfig {
struct
omap_hwmod_sysc_fields
*
sysc_fields
;
u8
srst_udelay
;
u8
idlemodes
;
u8
clockact
;
};
/**
...
...
@@ -616,16 +616,6 @@ struct omap_hwmod_class {
void
(
*
unlock
)(
struct
omap_hwmod
*
oh
);
};
/**
* struct omap_hwmod_link - internal structure linking hwmods with ocp_ifs
* @ocp_if: OCP interface structure record pointer
* @node: list_head pointing to next struct omap_hwmod_link in a list
*/
struct
omap_hwmod_link
{
struct
omap_hwmod_ocp_if
*
ocp_if
;
struct
list_head
node
;
};
/**
* struct omap_hwmod - integration data for OMAP hardware "modules" (IP blocks)
* @name: name of the hwmod
...
...
@@ -686,9 +676,8 @@ struct omap_hwmod {
const
char
*
main_clk
;
struct
clk
*
_clk
;
struct
omap_hwmod_opt_clk
*
opt_clks
;
c
har
*
clkdm_name
;
c
onst
char
*
clkdm_name
;
struct
clockdomain
*
clkdm
;
struct
list_head
master_ports
;
/* connect to *_IA */
struct
list_head
slave_ports
;
/* connect to *_TA */
void
*
dev_attr
;
u32
_sysc_cache
;
...
...
@@ -703,7 +692,6 @@ struct omap_hwmod {
u8
response_lat
;
u8
rst_lines_cnt
;
u8
opt_clks_cnt
;
u8
masters_cnt
;
u8
slaves_cnt
;
u8
hwmods_cnt
;
u8
_int_flags
;
...
...
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
View file @
6bff5474
...
...
@@ -55,7 +55,6 @@ static struct omap_hwmod_class_sysconfig omap2xxx_timer_sysc = {
SYSC_HAS_ENAWAKEUP
|
SYSC_HAS_SOFTRESET
|
SYSC_HAS_AUTOIDLE
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View file @
6bff5474
...
...
@@ -149,7 +149,6 @@ static struct omap_hwmod_class_sysconfig omap3xxx_timer_sysc = {
SYSC_HAS_EMUFREE
|
SYSC_HAS_AUTOIDLE
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
@@ -424,7 +423,6 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = {
SYSC_HAS_ENAWAKEUP
|
SYSC_HAS_SOFTRESET
|
SYSC_HAS_AUTOIDLE
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
@@ -1045,7 +1043,6 @@ static struct omap_hwmod_class_sysconfig omap3xxx_mcbsp_sysc = {
SYSC_HAS_SIDLEMODE
|
SYSC_HAS_SOFTRESET
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
),
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
.
clockact
=
0x2
,
};
static
struct
omap_hwmod_class
omap3xxx_mcbsp_hwmod_class
=
{
...
...
@@ -1210,7 +1207,6 @@ static struct omap_hwmod_sysc_fields omap34xx_sr_sysc_fields = {
static
struct
omap_hwmod_class_sysconfig
omap34xx_sr_sysc
=
{
.
sysc_offs
=
0x24
,
.
sysc_flags
=
(
SYSC_HAS_CLOCKACTIVITY
|
SYSC_NO_CACHE
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap34xx_sr_sysc_fields
,
};
...
...
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
View file @
6bff5474
...
...
@@ -1320,7 +1320,6 @@ static struct omap_hwmod_class_sysconfig omap44xx_i2c_sysc = {
SYSC_HAS_SOFTRESET
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
|
SIDLE_SMART_WKUP
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
@@ -2548,7 +2547,6 @@ static struct omap_hwmod_class_sysconfig omap44xx_timer_1ms_sysc = {
SYSC_HAS_SIDLEMODE
|
SYSC_HAS_SOFTRESET
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
View file @
6bff5474
...
...
@@ -839,7 +839,6 @@ static struct omap_hwmod_class_sysconfig omap54xx_i2c_sysc = {
SYSC_HAS_SOFTRESET
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
|
SIDLE_SMART_WKUP
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
@@ -1530,7 +1529,6 @@ static struct omap_hwmod_class_sysconfig omap54xx_timer_1ms_sysc = {
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
|
SIDLE_SMART_WKUP
),
.
sysc_fields
=
&
omap_hwmod_sysc_type2
,
.
clockact
=
CLOCKACT_TEST_ICLK
,
};
static
struct
omap_hwmod_class
omap54xx_timer_1ms_hwmod_class
=
{
...
...
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
View file @
6bff5474
...
...
@@ -1098,7 +1098,6 @@ static struct omap_hwmod_class_sysconfig dra7xx_i2c_sysc = {
SYSC_HAS_SOFTRESET
|
SYSS_HAS_RESET_STATUS
),
.
idlemodes
=
(
SIDLE_FORCE
|
SIDLE_NO
|
SIDLE_SMART
|
SIDLE_SMART_WKUP
),
.
clockact
=
CLOCKACT_TEST_ICLK
,
.
sysc_fields
=
&
omap_hwmod_sysc_type1
,
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment