diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-21 15:39:46 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-17 07:54:29 -0400 |
commit | 20d4af68306c0e9b61ec158570502d4f89a00014 (patch) | |
tree | 9f4379f47d74de2967b3910cad7f5f182409104a /arch | |
parent | cf4af8670b7377a9e9dbb4c5d3622538185ca362 (diff) |
ARM: u300: probe the U300 dummy-spichip from device tree
This probes the U300 dummy-spichip from the device tree
and adds the apropriate node to the tree.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/ste-u300.dts | 5 | ||||
-rw-r--r-- | arch/arm/mach-u300/dummyspichip.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 355ac60369c2..1b20769d261a 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts | |||
@@ -233,6 +233,11 @@ | |||
233 | num-cs = <3>; | 233 | num-cs = <3>; |
234 | #address-cells = <1>; | 234 | #address-cells = <1>; |
235 | #size-cells = <0>; | 235 | #size-cells = <0>; |
236 | spi-dummy@1 { | ||
237 | compatible = "arm,pl022-dummy"; | ||
238 | reg = <1>; | ||
239 | spi-max-frequency = <20000000>; | ||
240 | }; | ||
236 | }; | 241 | }; |
237 | }; | 242 | }; |
238 | }; | 243 | }; |
diff --git a/arch/arm/mach-u300/dummyspichip.c b/arch/arm/mach-u300/dummyspichip.c index 2785cb67b5e8..52962bf83900 100644 --- a/arch/arm/mach-u300/dummyspichip.c +++ b/arch/arm/mach-u300/dummyspichip.c | |||
@@ -263,10 +263,16 @@ static int pl022_dummy_remove(struct spi_device *spi) | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | static const struct of_device_id pl022_dummy_dt_match[] = { | ||
267 | { .compatible = "arm,pl022-dummy" }, | ||
268 | {}, | ||
269 | }; | ||
270 | |||
266 | static struct spi_driver pl022_dummy_driver = { | 271 | static struct spi_driver pl022_dummy_driver = { |
267 | .driver = { | 272 | .driver = { |
268 | .name = "spi-dummy", | 273 | .name = "spi-dummy", |
269 | .owner = THIS_MODULE, | 274 | .owner = THIS_MODULE, |
275 | .of_match_table = pl022_dummy_dt_match, | ||
270 | }, | 276 | }, |
271 | .probe = pl022_dummy_probe, | 277 | .probe = pl022_dummy_probe, |
272 | .remove = pl022_dummy_remove, | 278 | .remove = pl022_dummy_remove, |