diff options
| author |   Tony Lindgren <tony@atomide.com> | 2018-04-19 15:48:46 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-04-19 15:48:46 -0700 |
| commit | fb289e3ab10c16834741bb02be740fa9d025fde0 (patch) | |
| tree | c12f9534fadebdb1c01e1ef47418af3a47555307 | |
| parent | ARM: OMAP2+: Fix build when using split object directories (diff) | |
| parent | ARM: dts: Fix cm2 and prm sizes for omap4 (diff) | |
| download | wireguard-linux-fb289e3ab10c16834741bb02be740fa9d025fde0.tar.xz wireguard-linux-fb289e3ab10c16834741bb02be740fa9d025fde0.zip | |
Merge branch 'omap-for-v4.17/fixes-ti-sysc' into omap-for-v4.17/fixes
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 475904894b86..e554b6e039f3 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -163,10 +163,10 @@ cm2: cm2@8000 { compatible = "ti,omap4-cm2", "simple-bus"; - reg = <0x8000 0x3000>; + reg = <0x8000 0x2000>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x8000 0x3000>; + ranges = <0 0x8000 0x2000>; cm2_clocks: clocks { #address-cells = <1>; @@ -250,11 +250,11 @@ prm: prm@6000 { compatible = "ti,omap4-prm"; - reg = <0x6000 0x3000>; + reg = <0x6000 0x2000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x6000 0x3000>; + ranges = <0 0x6000 0x2000>; prm_clocks: clocks { #address-cells = <1>; |