From 88e3a2895d7a2956dcdceba34bc93ad99b61141d Mon Sep 17 00:00:00 2001 From: Liviu Dudau Date: Thu, 3 Jul 2014 00:16:59 +0100 Subject: [PATCH] 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 --- arch/arm64/boot/dts/juno.dts | 8 +++++--- arch/arm64/configs/defconfig | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/juno.dts b/arch/arm64/boot/dts/juno.dts index 248314a7896..1de81d5c16c 100644 --- 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 = ; @@ -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 1b8a0e0380b..1a9fda686cf 100644 --- 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 -- 2.34.1