Commit 5f1f1528 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v5.5/dt-late-signed' of...

Merge tag 'omap-for-v5.5/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Few late dts changes for omaps for v5.5 merge window

Let's configure omap3 rng as we can now easily do it with a dts change
only by tagging it with status = "disabled" for n900 where it's not
accessible. This improves the boot-up time with distros quite a bit with
proper entropy source around.

There's also another minor update for logicpd-torpedo that does not have
USB host pins wired.

* tag 'omap-for-v5.5/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: logicpd-torpedo: Disable USB Host
  ARM: dts: Configure omap3 rng

Link: https://lore.kernel.org/r/pull-1573579927-542764@atomide.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f1deadb5 abb0e36b
......@@ -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";
......
......@@ -35,6 +35,11 @@ hfclk_26m: oscillator {
};
};
/* The Torpedo doesn't route the USB host pins */
&usbhshost {
status = "disabled";
};
&gpmc {
ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */
......
......@@ -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>;
......
......@@ -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>,
......
......@@ -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>;
};
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment