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
8df81af1
Commit
8df81af1
authored
Oct 30, 2019
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rng' into omap-for-v5.5/dt
parents
fedc8844
308607e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
1 deletion
+37
-1
arch/arm/boot/dts/am3517.dtsi
arch/arm/boot/dts/am3517.dtsi
+6
-0
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/omap3-n900.dts
+5
-0
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap3.dtsi
+25
-0
arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
+1
-1
No files found.
arch/arm/boot/dts/am3517.dtsi
View file @
8df81af1
...
...
@@ -115,6 +115,12 @@ sgx_module: target-module@50000000 {
};
};
/* Not currently working, probably needs at least different clocks */
&rng_target {
status = "disabled";
/delete-property/ clocks;
};
/* Table Table 5-79 of the TRM shows 480ab000 is reserved */
&usb_otg_hs {
status = "disabled";
...
...
arch/arm/boot/dts/omap3-n900.dts
View file @
8df81af1
...
...
@@ -1013,6 +1013,11 @@ wl1251@0 {
};
};
/* RNG not directly accessible on n900, see omap3-rom-rng instead */
&rng_target {
status = "disabled";
};
&usb_otg_hs {
interface-type = <0>;
usb-phy = <&usb2_phy>;
...
...
arch/arm/boot/dts/omap3.dtsi
View file @
8df81af1
...
...
@@ -8,6 +8,7 @@
* kind, whether express or implied.
*/
#include <dt-bindings/bus/ti-sysc.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/omap.h>
...
...
@@ -502,6 +503,30 @@ mcbsp1: mcbsp@48074000 {
status = "disabled";
};
/* Likely needs to be tagged disabled on HS devices */
rng_target: target-module@480a0000 {
compatible = "ti,sysc-omap2", "ti,sysc";
reg = <0x480a003c 0x4>,
<0x480a0040 0x4>,
<0x480a0044 0x4>;
reg-names = "rev", "sysc", "syss";
ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>;
ti,syss-mask = <1>;
clocks = <&rng_ick>;
clock-names = "ick";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x480a0000 0x2000>;
rng: rng@0 {
compatible = "ti,omap2-rng";
reg = <0x0 0x2000>;
interrupts = <52>;
};
};
mcbsp2: mcbsp@49022000 {
compatible = "ti,omap3-mcbsp";
reg = <0x49022000 0xff>,
...
...
arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
View file @
8df81af1
...
...
@@ -260,6 +260,6 @@ core_l4_clkdm: core_l4_clkdm {
<&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>,
<&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, <&icr_ick>,
<&des2_ick>, <&mspro_ick>, <&mailboxes_ick>,
<&mspro_fck>;
<&
rng_ick>, <&
mspro_fck>;
};
};
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