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

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Olof Johansson:
"A couple of fixes have come in that would be good to include in this
release:

- A fix for amount of memory on Beaglebone Black. Surfaced now since
GRUB2 doesn't update memory size in the booted kernel.

- A fix to make SPI interfaces work on am43x-epos-evm.

- Small Kconfig fix for OPTEE (adds a depend on MMU) to avoid build
failures"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1
tee: optee: Fix compilation issue with nommu
ARM: dts: am335x-boneblack-common: fix memory size

Linus Torvalds f041eada a075f23d

options
unified split
Changed files
+8
arch
arm
boot
dts
am335x-boneblack-common.dtsi
am43x-epos-evm.dts
drivers
tee
optee
Kconfig
+5
arch/arm/boot/dts/am335x-boneblack-common.dtsi
··· 131 131 }; 132 132 133 133 / { 134 + memory@80000000 { 135 + device_type = "memory"; 136 + reg = <0x80000000 0x20000000>; /* 512 MB */ 137 + }; 138 + 134 139 clk_mcasp0_fixed: clk_mcasp0_fixed { 135 140 #clock-cells = <0>; 136 141 compatible = "fixed-clock";
+2
arch/arm/boot/dts/am43x-epos-evm.dts
··· 848 848 pinctrl-names = "default", "sleep"; 849 849 pinctrl-0 = <&spi0_pins_default>; 850 850 pinctrl-1 = <&spi0_pins_sleep>; 851 + ti,pindir-d0-out-d1-in = <1>; 851 852 }; 852 853 853 854 &spi1 { ··· 856 855 pinctrl-names = "default", "sleep"; 857 856 pinctrl-0 = <&spi1_pins_default>; 858 857 pinctrl-1 = <&spi1_pins_sleep>; 858 + ti,pindir-d0-out-d1-in = <1>; 859 859 }; 860 860 861 861 &usb2_phy1 {
+1
drivers/tee/optee/Kconfig
··· 3 3 config OPTEE 4 4 tristate "OP-TEE" 5 5 depends on HAVE_ARM_SMCCC 6 + depends on MMU 6 7 help 7 8 This implements the OP-TEE Trusted Execution Environment (TEE) 8 9 driver.