summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-10-27 21:15:45 -0700
committerOlof Johansson <olof@lixom.net>2013-10-27 21:15:45 -0700
commit17761fc80fca546470708cd9bcffc37eaaeb2ff7 (patch)
tree5e55fb7ab3be4604929f79baec398260b56deef7 /arch
parentc90d19be2716aa677d2941828d802f4cfbecab80 (diff)
parent439d9f58017af96f0375d9443ff957c19056d6ec (diff)
Merge tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux into next/dt
From Maxime Ripard: Allwinner sunXi SoCs minor fixes for 3.13 * tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux: ARM: sun6i: Fix the APB2 clock gates register size Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sun6i-a31.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index f244f5f02365..c1751a64889a 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -175,7 +175,7 @@
apb2_gates: apb2_gates@01c2006c {
#clock-cells = <1>;
compatible = "allwinner,sun6i-a31-apb2-gates-clk";
- reg = <0x01c2006c 0x8>;
+ reg = <0x01c2006c 0x4>;
clocks = <&apb2>;
clock-output-names = "apb2_i2c0", "apb2_i2c1",
"apb2_i2c2", "apb2_i2c3", "apb2_uart0",