diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 00:15:45 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 00:15:45 -0400 |
| commit | 17761fc80fca546470708cd9bcffc37eaaeb2ff7 (patch) | |
| tree | 5e55fb7ab3be4604929f79baec398260b56deef7 | |
| parent | c90d19be2716aa677d2941828d802f4cfbecab80 (diff) | |
| parent | 439d9f58017af96f0375d9443ff957c19056d6ec (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>
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 2 |
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 @@ | |||
| 175 | apb2_gates: apb2_gates@01c2006c { | 175 | apb2_gates: apb2_gates@01c2006c { |
| 176 | #clock-cells = <1>; | 176 | #clock-cells = <1>; |
| 177 | compatible = "allwinner,sun6i-a31-apb2-gates-clk"; | 177 | compatible = "allwinner,sun6i-a31-apb2-gates-clk"; |
| 178 | reg = <0x01c2006c 0x8>; | 178 | reg = <0x01c2006c 0x4>; |
| 179 | clocks = <&apb2>; | 179 | clocks = <&apb2>; |
| 180 | clock-output-names = "apb2_i2c0", "apb2_i2c1", | 180 | clock-output-names = "apb2_i2c0", "apb2_i2c1", |
| 181 | "apb2_i2c2", "apb2_i2c3", "apb2_uart0", | 181 | "apb2_i2c2", "apb2_i2c3", "apb2_uart0", |