Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index bd2d883..2ea2caa 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -70,7 +70,7 @@
                };
        };
 
-       cpu0_opp_table: opp_table0 {
+       cpu0_opp_table: opp-table0 {
                compatible = "operating-points-v2";
                opp-shared;
 
@@ -635,8 +635,8 @@
                        #size-cells = <1>;
                        ranges;
 
-                       usbdrd_dwc3: dwc3@12000000 {
-                               compatible = "synopsys,dwc3";
+                       usbdrd_dwc3: usb@12000000 {
+                               compatible = "snps,dwc3";
                                reg = <0x12000000 0x10000>;
                                interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
                                phys = <&usbdrd_phy 0>, <&usbdrd_phy 1>;
@@ -844,7 +844,6 @@
                        clocks = <&clock CLK_ADC>;
                        clock-names = "adc";
                        #io-channel-cells = <1>;
-                       io-channel-ranges;
                        samsung,syscon-phandle = <&pmu_system_controller>;
                        status = "disabled";
                };