Skip to content

Commit 6716cb1

Browse files
committed
Merge tag 'omap-for-fixes-whenever-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Few minor fixes for omaps Looks like we have wrong default memory size for beaglebone black, it has at least 512 MB of RAM and not 256 MB. This causes an issue when booted with GRUB2 that does not seem to pass memory info to the kernel. And for am43x-epos-evm the SPI pin directions need to be configured for SPI to work. * tag 'omap-for-fixes-whenever-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1 ARM: dts: am335x-boneblack-common: fix memory size Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 088307d + b0b0395 commit 6716cb1

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

arch/arm/boot/dts/am335x-boneblack-common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@
131131
};
132132

133133
/ {
134+
memory@80000000 {
135+
device_type = "memory";
136+
reg = <0x80000000 0x20000000>; /* 512 MB */
137+
};
138+
134139
clk_mcasp0_fixed: clk_mcasp0_fixed {
135140
#clock-cells = <0>;
136141
compatible = "fixed-clock";

arch/arm/boot/dts/am43x-epos-evm.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,13 +848,15 @@
848848
pinctrl-names = "default", "sleep";
849849
pinctrl-0 = <&spi0_pins_default>;
850850
pinctrl-1 = <&spi0_pins_sleep>;
851+
ti,pindir-d0-out-d1-in = <1>;
851852
};
852853

853854
&spi1 {
854855
status = "okay";
855856
pinctrl-names = "default", "sleep";
856857
pinctrl-0 = <&spi1_pins_default>;
857858
pinctrl-1 = <&spi1_pins_sleep>;
859+
ti,pindir-d0-out-d1-in = <1>;
858860
};
859861

860862
&usb2_phy1 {

0 commit comments

Comments
 (0)