diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 12:07:47 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 12:07:47 +0100 |
| commit | d538d94f0ca86cfedc892cc427169219acb3c2f7 (patch) | |
| tree | 8363c4ff35907edb5245da737d7f6982bf22b945 /arch/arm/boot/dts/at91sam9x5_isi.dtsi | |
| parent | KVM: PPC: Book3S HV: radix: Fix uninitialized var build error (diff) | |
| parent | Remove 'type' argument from access_ok() function (diff) | |
| download | linux-d538d94f0ca86cfedc892cc427169219acb3c2f7.tar.xz linux-d538d94f0ca86cfedc892cc427169219acb3c2f7.zip | |
Merge branch 'master' into fixes
We have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function"), so merge master to get it.
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5_isi.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5_isi.dtsi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5_isi.dtsi b/arch/arm/boot/dts/at91sam9x5_isi.dtsi index 8fc45ca4dcb5..c3e45b57b6a2 100644 --- a/arch/arm/boot/dts/at91sam9x5_isi.dtsi +++ b/arch/arm/boot/dts/at91sam9x5_isi.dtsi @@ -44,22 +44,13 @@ }; }; - pmc: pmc@fffffc00 { - periphck { - isi_clk: isi_clk { - #clock-cells = <0>; - reg = <25>; - }; - }; - }; - isi: isi@f8048000 { compatible = "atmel,at91sam9g45-isi"; reg = <0xf8048000 0x4000>; interrupts = <25 IRQ_TYPE_LEVEL_HIGH 5>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_isi_data_0_7>; - clocks = <&isi_clk>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 25>; clock-names = "isi_clk"; status = "disabled"; port { |