diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:18:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:18:09 -0700 |
commit | b37668d0808a1bf15d05e678f431fb5fb4659c90 (patch) | |
tree | c53c3f1c7043e87954f4b253332a3f577f99d1ce /arch/arm/boot/dts/bcm2835.dtsi | |
parent | 451372066dab1d98ba571b176bd1ce71922702f2 (diff) | |
parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) |
Merge 3.10-rc5 into staging-next
Diffstat (limited to 'arch/arm/boot/dts/bcm2835.dtsi')
-rw-r--r-- | arch/arm/boot/dts/bcm2835.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index f0052dccf9a..1e12aeff403 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -44,6 +44,7 @@ reg = <0x7e201000 0x1000>; interrupts = <2 25>; clock-frequency = <3000000>; + arm,primecell-periphid = <0x00241011>; }; gpio: gpio { |