arm64: Juno: Collect last remaining updates in preparation release.

Update the Mali device tree node label, register size resource,
update GICv2 register resource and remove UAS as a module from
defconfig. All small patches that were sitting in my inbox.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>

diff --git a/arch/arm64/boot/dts/juno.dts b/arch/arm64/boot/dts/juno.dts
index 248314a7896457b5fa1cf3043ddb1417da42f85c..1de81d5c16c0f829d9912810ab4aa922589114b0 100644 (file)
--- a/arch/arm64/boot/dts/juno.dts
+++ b/arch/arm64/boot/dts/juno.dts
@@ -148,7 +148,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x0 0x2c010000 0 0x1000>,
-                     <0x0 0x2c02f000 0 0x1000>,
+                     <0x0 0x2c02f000 0 0x2000>,
                      <0x0 0x2c04f000 0 0x2000>,
                      <0x0 0x2c06f000 0 0x2000>;
                interrupts = <GIC_PPI 9 0xf04>;
@@ -468,11 +468,13 @@
                };
        };
 
-       gpu@0xfc010000 {
+       gpu@0x2d000000 {
                compatible = "arm,malit6xx", "arm,mali";
-               reg = <0x0 0x2d000000 0x0 0x10000>;
+               reg = <0x0 0x2d000000 0x0 0x4000>;
                interrupts = <0 33 4>, <0 34 4>, <0 32 4>;
                interrupt-names = "JOB", "MMU", "GPU";
+               clocks = <&scpi_dvfs 2>;
+               clock-names = "clk_mali";
        };
 
        smb {

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 1b8a0e0380b1711cc8d5dc7e7364b35c6f334dd8..1a9fda686cfebbc1bba0e97f705890154f04cf04 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -205,7 +205,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_OTG_FSM=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_SAMSUNG_USB2PHY=m