diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-24 07:09:08 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-24 07:09:08 +0300 |
| commit | 69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch) | |
| tree | 3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /arch/arm/boot/dts/uniphier-pro5.dtsi | |
| parent | 6a6b12e2125591e24891e6860410795ea53aed11 (diff) | |
| parent | 10b9dd56860e93f11cd352e8c75a33357b80b70b (diff) | |
| download | linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.tar.xz | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/uniphier-pro5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-pro5.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi index 2c49c3614bda..5357ea9c14b1 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -184,11 +184,11 @@ }; &mio_clk { - compatible = "socionext,uniphier-pro5-mio-clock"; + compatible = "socionext,uniphier-pro5-sd-clock"; }; &mio_rst { - compatible = "socionext,uniphier-pro5-mio-reset"; + compatible = "socionext,uniphier-pro5-sd-reset"; }; &peri_clk { |