diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-23 06:52:46 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-23 06:52:56 +0200 |
| commit | 3c91f97aaf383cb63375deca796ab45afdfa0441 (patch) | |
| tree | 50b0ca1cd5f37ca40b53026fe5aecd371520fb97 /arch | |
| parent | ARM: imx: fix .is_enabled() of shared gate clock (diff) | |
| parent | ARM: keystone: dts: fix bindings for pcie and usb clock nodes (diff) | |
| download | linux-3c91f97aaf383cb63375deca796ab45afdfa0441.tar.xz linux-3c91f97aaf383cb63375deca796ab45afdfa0441.zip | |
Merge tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes
Keystone Edision dts fix for -rc cycle. Fix the PCIE and USB nodes.
* tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: dts: fix bindings for pcie and usb clock nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/k2e-clocks.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/k2e-clocks.dtsi b/arch/arm/boot/dts/k2e-clocks.dtsi index 598afe91c676..4773d6af66a0 100644 --- a/arch/arm/boot/dts/k2e-clocks.dtsi +++ b/arch/arm/boot/dts/k2e-clocks.dtsi @@ -40,7 +40,7 @@ clocks { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; - clock-output-names = "usb"; + clock-output-names = "usb1"; reg = <0x02350004 0xb00>, <0x02350000 0x400>; reg-names = "control", "domain"; domain-id = <0>; @@ -60,8 +60,8 @@ clocks { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; - clock-output-names = "pcie"; - reg = <0x0235006c 0xb00>, <0x02350000 0x400>; + clock-output-names = "pcie1"; + reg = <0x0235006c 0xb00>, <0x02350048 0x400>; reg-names = "control", "domain"; domain-id = <18>; }; |