3036: usb: fix wrong address

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 4180765ff8899d4f3d8dfc1fc81b7551847bdd6c..6bbc3e1ce2954a509113bbfc14fa3e8c338a1015 100755 (executable)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -466,6 +466,7 @@
          };
        dwc_control_usb: dwc-control-usb@20008000 {
                compatible = "rockchip,rk3036-dwc-control-usb";
+               reg = <0x20008000 0x4>;
                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "otg_bvalid";
                clocks = <&clk_gates9 13>;

diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3036.c b/drivers/usb/dwc_otg_310/usbdev_rk3036.c
index a8186c15d99f824bf4817cbaf5bce84031fc63f3..b8fe46c40ce6d2b3d89df1035f2ec32014d49834 100755 (executable)
--- a/drivers/usb/dwc_otg_310/usbdev_rk3036.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3036.c
@@ -111,7 +111,7 @@ static void usb20otg_clock_enable(void *pdata, int enable)
 static int usb20otg_get_status(int id)
 {
        int ret = -1;
-       u32 soc_status0 = readl(RK_GRF_VIRT + RK3036_GRF_CPU_STATUS0);
+       u32 soc_status0 = readl(RK_GRF_VIRT + RK3036_GRF_SOC_STATUS0);
 
        switch (id) {
        case USB_STATUS_BVABLID:
@@ -292,7 +292,7 @@ static void usb20host_clock_enable(void *pdata, int enable)
 static int usb20host_get_status(int id)
 {
        int ret = -1;
-       u32 soc_status0 = readl(RK_GRF_VIRT + RK3036_GRF_CPU_STATUS0);
+       u32 soc_status0 = readl(RK_GRF_VIRT + RK3036_GRF_SOC_STATUS0);
 
        switch (id) {
        case USB_STATUS_BVABLID: