Commit f041eada authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a075f23d 6716cb16
...@@ -131,6 +131,11 @@ ...@@ -131,6 +131,11 @@
}; };
/ { / {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};
clk_mcasp0_fixed: clk_mcasp0_fixed { clk_mcasp0_fixed: clk_mcasp0_fixed {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
......
...@@ -848,6 +848,7 @@ ...@@ -848,6 +848,7 @@
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi0_pins_default>; pinctrl-0 = <&spi0_pins_default>;
pinctrl-1 = <&spi0_pins_sleep>; pinctrl-1 = <&spi0_pins_sleep>;
ti,pindir-d0-out-d1-in = <1>;
}; };
&spi1 { &spi1 {
...@@ -855,6 +856,7 @@ ...@@ -855,6 +856,7 @@
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi1_pins_default>; pinctrl-0 = <&spi1_pins_default>;
pinctrl-1 = <&spi1_pins_sleep>; pinctrl-1 = <&spi1_pins_sleep>;
ti,pindir-d0-out-d1-in = <1>;
}; };
&usb2_phy1 { &usb2_phy1 {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
config OPTEE config OPTEE
tristate "OP-TEE" tristate "OP-TEE"
depends on HAVE_ARM_SMCCC depends on HAVE_ARM_SMCCC
depends on MMU
help help
This implements the OP-TEE Trusted Execution Environment (TEE) This implements the OP-TEE Trusted Execution Environment (TEE)
driver. driver.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment