sunxi: various 3.13 usb changes
[openwrt.git] / target / linux / sunxi / patches-3.13 / 202-reset-rename-compat-prop.patch
1 From a1c859ab115c043662c2779d2e965bb09a90b8cb Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Tue, 17 Dec 2013 23:57:24 +0100
4 Subject: [PATCH] ARM: sunxi-clock-reset: rename compat property
5
6 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
7 ---
8  arch/arm/boot/dts/sun6i-a31.dtsi | 4 ++--
9  drivers/reset/reset-sunxi.c      | 2 +-
10  2 files changed, 3 insertions(+), 3 deletions(-)
11
12 diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
13 index 5256ad9..ab6ea43 100644
14 --- a/arch/arm/boot/dts/sun6i-a31.dtsi
15 +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
16 @@ -220,13 +220,13 @@
17  
18                 apb1_rst: reset@01c202d0 {
19                         #reset-cells = <1>;
20 -                       compatible = "allwinner,sun6i-a31-clock-reset";
21 +                       compatible = "allwinner,sun4i-clock-reset";
22                         reg = <0x01c202d0 0x4>;
23                 };
24  
25                 apb2_rst: reset@01c202d8 {
26                         #reset-cells = <1>;
27 -                       compatible = "allwinner,sun6i-a31-clock-reset";
28 +                       compatible = "allwinner,sun4i-clock-reset";
29                         reg = <0x01c202d8 0x4>;
30                 };
31  
32 diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
33 index 695bd34..3db179c 100644
34 --- a/drivers/reset/reset-sunxi.c
35 +++ b/drivers/reset/reset-sunxi.c
36 @@ -138,7 +138,7 @@ void __init sun6i_reset_init(void)
37   * device model.
38   */
39  static const struct of_device_id sunxi_reset_dt_ids[] = {
40 -        { .compatible = "allwinner,sun6i-a31-clock-reset", },
41 +        { .compatible = "allwinner,sun4i-clock-reset", },
42          { /* sentinel */ },
43  };
44  MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids);
45 -- 
46 1.8.5.1
47