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
Kirill Smelkov
linux
Commits
5bd30ed9
Commit
5bd30ed9
authored
Jun 26, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/topic/mxs' into spi-next
parents
95e40cc5
86db3b04
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
drivers/spi/spi-mxs.c
drivers/spi/spi-mxs.c
+0
-6
No files found.
drivers/spi/spi-mxs.c
View file @
5bd30ed9
...
...
@@ -46,7 +46,6 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/module.h>
#include <linux/pinctrl/consumer.h>
#include <linux/stmp_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/mxs-spi.h>
...
...
@@ -500,7 +499,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
struct
mxs_spi
*
spi
;
struct
mxs_ssp
*
ssp
;
struct
resource
*
iores
;
struct
pinctrl
*
pinctrl
;
struct
clk
*
clk
;
void
__iomem
*
base
;
int
devid
,
clk_freq
;
...
...
@@ -522,10 +520,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
if
(
IS_ERR
(
base
))
return
PTR_ERR
(
base
);
pinctrl
=
devm_pinctrl_get_select_default
(
&
pdev
->
dev
);
if
(
IS_ERR
(
pinctrl
))
return
PTR_ERR
(
pinctrl
);
clk
=
devm_clk_get
(
&
pdev
->
dev
,
NULL
);
if
(
IS_ERR
(
clk
))
return
PTR_ERR
(
clk
);
...
...
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