diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-09 11:00:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-09 11:00:39 -0800 |
| commit | 1f6c926c0aa9180d42fcda53578881fc57f83a9a (patch) | |
| tree | e49794a8ba2e3679a23daf52af1d92dd64a9e995 /arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | |
| parent | Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k (diff) | |
| parent | ARM: dts: orion5x: fix number of sata port for linkstation ls-gl (diff) | |
| download | linux-dev-1f6c926c0aa9180d42fcda53578881fc57f83a9a.tar.xz linux-dev-1f6c926c0aa9180d42fcda53578881fc57f83a9a.zip | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"Final batch of SoC fixes
A few fixes that have trickled in over the last week, all fixing minor
errors in devicetrees -- UART pin assignment on Allwinner H3,
correcting number of SATA ports on a Marvell-based Linkstation
platform and a display clock fix for Freescale/NXP i.MX7D that fixes a
freeze when starting up X"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: orion5x: fix number of sata port for linkstation ls-gl
ARM: dts: imx7d: fix LCDIF clock assignment
dts: sun8i-h3: correct UART3 pin definitions
Diffstat (limited to 'arch/arm/boot/dts/orion5x-linkstation-lsgl.dts')
| -rw-r--r-- | arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts index 1cf644bfd7ea..51dc734cd5b9 100644 --- a/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts +++ b/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts @@ -82,6 +82,10 @@ gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; +&sata { + nr-ports = <2>; +}; + &ehci1 { status = "okay"; }; |