Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+7 -4
+2 -3
arch/arm/boot/dts/imx7s.dtsi
··· 643 643 reg = <0x30730000 0x10000>; 644 644 interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; 645 645 clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>, 646 - <&clks IMX7D_CLK_DUMMY>, 647 - <&clks IMX7D_CLK_DUMMY>; 648 - clock-names = "pix", "axi", "disp_axi"; 646 + <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>; 647 + clock-names = "pix", "axi"; 649 648 status = "disabled"; 650 649 }; 651 650 };
+4
arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
··· 82 82 gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; 83 83 }; 84 84 85 + &sata { 86 + nr-ports = <2>; 87 + }; 88 + 85 89 &ehci1 { 86 90 status = "okay"; 87 91 };
+1 -1
arch/arm/boot/dts/sun8i-h3.dtsi
··· 410 410 }; 411 411 412 412 uart3_pins: uart3 { 413 - allwinner,pins = "PG13", "PG14"; 413 + allwinner,pins = "PA13", "PA14"; 414 414 allwinner,function = "uart3"; 415 415 allwinner,drive = <SUN4I_PINCTRL_10_MA>; 416 416 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;