diogo/lsts_glued
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from krisklau/pr/ntnu-b2xx/update-20160423

Browse Source 
ntnu-b2xx: Complete transition from lctr-b2xx, move to hardfp
This commit is contained in:
Ricardo Martins 2016-04-26 13:59:19 +01:00
commit 79439e298c
25 changed files with 2847 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2626
systems/ntnu-b2xx/cfg/linux-3.14.64-rt67.cfg Normal file
View File

File diff suppressed because it is too large Load Diff

4
systems/ntnu-b2xx/config
View File

@ -1,11 +1,11 @@
cfg_architecture='cortex-a8'
cfg_architecture='cortex-a8-hardfp'
cfg_storage='data0:ext4:/opt'
cfg_modules=''
cfg_services0='network dropbear storage upgrade syslog ptpd'
cfg_services2='dune'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux'
cfg_target_linux_kernel='arch/arm/boot/zImage'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx.dtb'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-ntnu-b2xx.dtb'
cfg_target_uboot_config='am335x_bbb'
cfg_ptpd_interface='eth0'
cfg_terminal='ttyO0'

1
systems/ntnu-b2xx/ntnu-hexa-001.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.200'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libphidget'
cfg_services1='rtc-ds3231'

1
systems/ntnu-b2xx/ntnu-hexa-002.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.205'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libphidget'
cfg_services1='rtc-ds3231'

1
systems/ntnu-b2xx/ntnu-hexa-003.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.210'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib libphidget ethtool socat'
cfg_services1='vsp_pair rtc-ds3231 force_10mbit rtklib_rtkrcv'

1
systems/ntnu-b2xx/ntnu-hexa-004.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.215'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib libphidget ethtool socat'
cfg_services1='vsp_pair rtc-ds3231 force_10mbit rtklib_rtkrcv'

1
systems/ntnu-b2xx/ntnu-hexa-testbed.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.220'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libphidget'
cfg_services1='rtc-ds3231'

1
systems/lctr-b2xx/ntnu-nest-01.cfg → systems/ntnu-b2xx/ntnu-nest-01.cfg
View File

@ -4,5 +4,4 @@ cfg_eth_ext_ip='192.168.1.45'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libswiftnav'

1
systems/ntnu-b2xx/ntnu-nest-02.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.51'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib'
cfg_services1='vsp_pair rtklib_str2str rtklib_single'

7
systems/ntnu-b2xx/ntnu-nest-03.cfg Normal file
View File

@ -0,0 +1,7 @@
# ntnu-nest-0x
cfg_hostname='ntnu-nest-03'
cfg_eth_ext_ip='10.0.60.55'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux openssl openssh sshpass'

6
systems/lctr-b2xx/ntnu-penguin-001.cfg → systems/ntnu-b2xx/ntnu-penguin-001.cfg
View File

@ -1,8 +1,8 @@
# ntnu-penguin-00x
# Adds libav package.
cfg_hostname='ntnu-penguin-001'
cfg_eth_ext_ip='192.168.1.235'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.235'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav'

7
systems/ntnu-b2xx/ntnu-ptu-02.cfg Normal file
View File

@ -0,0 +1,7 @@
# ntnu-nest-0x
cfg_hostname='ntnu-nest-03'
cfg_eth_ext_ip='10.0.60.55'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux openssl openssh sshpass'

7
systems/lctr-b2xx/ntnu-x8-001.cfg → systems/ntnu-b2xx/ntnu-x8-001.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-001'
cfg_eth_ext_ip='192.168.1.100'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.100'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

1
systems/ntnu-b2xx/ntnu-x8-002.cfg
View File

@ -4,6 +4,5 @@ cfg_eth_ext_ip='10.0.60.105'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib libphidget ethtool socat'
cfg_services1='vsp_pair rtc-ds3231 rtklib_rtkrcv'

1
systems/lctr-b2xx/ntnu-x8-003.cfg → systems/ntnu-b2xx/ntnu-x8-003.cfg
View File

@ -5,5 +5,4 @@ cfg_eth_ext_ip='10.0.60.110'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav openssl openssh sshpass'

1
systems/lctr-b2xx/ntnu-x8-004.cfg → systems/ntnu-b2xx/ntnu-x8-004.cfg
View File

@ -5,5 +5,4 @@ cfg_eth_ext_ip='10.0.60.115'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav openssl openssh sshpass'

1
systems/lctr-b2xx/ntnu-x8-005.cfg → systems/ntnu-b2xx/ntnu-x8-005.cfg
View File

@ -5,5 +5,4 @@ cfg_eth_ext_ip='10.0.60.120'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav openssl openssh sshpass'

7
systems/lctr-b2xx/ntnu-x8-006.cfg → systems/ntnu-b2xx/ntnu-x8-006.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-006'
cfg_eth_ext_ip='192.168.1.125'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.125'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

7
systems/lctr-b2xx/ntnu-x8-007.cfg → systems/ntnu-b2xx/ntnu-x8-007.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-007'
cfg_eth_ext_ip='192.168.1.130'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.130'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

7
systems/lctr-b2xx/ntnu-x8-008.cfg → systems/ntnu-b2xx/ntnu-x8-008.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-008'
cfg_eth_ext_ip='192.168.1.135'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.135'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

7
systems/lctr-b2xx/ntnu-x8-009.cfg → systems/ntnu-b2xx/ntnu-x8-009.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-009'
cfg_eth_ext_ip='192.168.1.140'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.140'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

7
systems/lctr-b2xx/ntnu-x8-010.cfg → systems/ntnu-b2xx/ntnu-x8-010.cfg
View File

@ -1,9 +1,8 @@
# ntnu-x8-00x
# Adds libav package.
cfg_hostname='ntnu-x8-010'
cfg_eth_ext_ip='192.168.1.145'
cfg_eth_ext_mk='255.255.255.0'
cfg_eth_ext_gw='192.168.1.1'
cfg_eth_ext_ip='10.0.60.145'
cfg_eth_ext_mk='255.255.0.0'
cfg_eth_ext_gw='10.0.60.1'
cfg_ptpd_interface='eth0'
cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-gpio.dtb'
cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav libswiftnav'

92
systems/ntnu-b2xx/patches/linux/3.14.63/00-lctr-b2xx-dts.patch
View File

@ -1,92 +0,0 @@
diff -Nru linux-3.13.1/arch/arm/boot/dts/Makefile linux-3.13.1.rasm/arch/arm/boot/dts/Makefile
--- linux-3.13.1/arch/arm/boot/dts/Makefile 2014-01-29 13:06:37.000000000 +0000
+++ linux-3.13.1.rasm/arch/arm/boot/dts/Makefile 2014-02-01 06:53:43.968486026 +0000
@@ -198,6 +198,7 @@
am335x-evmsk.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
+ am335x-lctr-b2xx.dtb \
am335x-nano.dtb \
am335x-base0033.dtb \
am3517-evm.dtb \
diff -Nru linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts
--- linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts 2014-02-01 06:51:48.273816483 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2014 Universidade do Porto - Faculdade de Engenharia
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "am335x-boneblack.dts"
+
+/ {
+ /* No need for HDMI. */
+ hdmi {
+ status = "disabled";
+ };
+
+ /* PPS. */
+ pps {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pps_pins>;
+ compatible = "pps-gpio";
+ status = "okay";
+ gpios = <&gpio2 13 0>;
+ assert-rising-edge;
+ };
+};
+
+&am33xx_pinmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&board_pins>;
+
+ /* User space. */
+ board_pins: pinmux_board_pins {
+ /* lcd_data6 / gpio2_12 / GPIO 76 */
+ pinctrl-single,pins = <0xb8 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)>;
+ };
+
+ /* PPS. */
+ pps_pins: pinmux_pps_pins {
+ /* lcd_data7 / gpio2_13 */
+ pinctrl-single,pins = <0xbc (PIN_INPUT_PULLDOWN | MUX_MODE7)>;
+ };
+
+ /* UART1. */
+ uart1_pins: pinmux_uart1_pins {
+ pinctrl-single,pins = <
+ /* uart1_rxd */
+ 0x180 (PIN_INPUT_PULLUP | MUX_MODE0)
+ /* uart1_txd */
+ 0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)
+ >;
+ };
+
+ /* UART2. */
+ uart2_pins: pinmux_uart2_pins {
+ pinctrl-single,pins = <
+ /* uart2_rxd */
+ 0x150 (PIN_INPUT_PULLUP | MUX_MODE1)
+ /* uart2_txd */
+ 0x154 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)
+ >;
+ };
+};
+
+/* Enable UART1. */
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>;
+ status = "okay";
+};
+
+/* Enable UART2 (actual UART3). */
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart2_pins>;
+ status = "okay";
+};

139
systems/ntnu-b2xx/patches/linux/3.14.63/00-lctr-b2xx-ntnu-x-dts.patch
View File

@ -1,139 +0,0 @@
diff -ruN linux-3.14.16/arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dts linux-3.14.16.kk/arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dts
--- linux-3.14.16/arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dts 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.14.16.kk/arch/arm/boot/dts/am335x-lctr-b2xx-ntnu-uart.dts 2015-08-13 13:31:06.308000000 +0200
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2014 Universidade do Porto - Faculdade de Engenharia
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "am335x-lctr-b2xx.dts"
+
+
+
+&am33xx_pinmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&board_pins>;
+
+
+ /* UART2. */
+ uart2_pins: pinmux_uart2_pins {
+ pinctrl-single,pins = <
+ /* uart2_rxd */
+ 0x150 (PIN_INPUT_PULLUP | MUX_MODE1)
+ /* uart2_txd */
+ 0x154 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)
+ >;
+ };
+
+ /* GPIO on ntnu cape v1.2. */
+ gpio_pins: pinmux_gpio_pins {
+ pinctrl-single,pins = <
+ /* GPIO 48 - Pin P9 15 - GPIO 1_16 */
+ 0x040 (PIN_INPUT_PULLUP | MUX_MODE7)
+ /* GPIO 51 - Pin P9 16 - GPIO 1_19 */
+ 0x04c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)
+ /* GPIO 4 - Pin P9 17 - GPIO 0_5 */
+ 0x15c (PIN_INPUT_PULLUP | MUX_MODE7)
+ /* GPIO 48 - Pin P9 18 - GPIO 0_4 */
+ 0x158 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)
+ >;
+ };
+
+ /* UART4. */
+ uart4_pins: pinmux_uart4_pins {
+ pinctrl-single,pins = <
+ /* uart4_rxd */
+ 0x70 (PIN_INPUT_PULLUP | MUX_MODE6)
+ /* uart4_txd */
+ 0x74 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)
+ >;
+ };
+
+ /* SPI1 */
+ spi1_pins_s0: spi1_pins_s0 {
+ pinctrl-single,pins = <
+ 0x190 0x33 /* mcasp0_aclkx.spi1_sclk, INPUT_PULLUP | MODE3 */
+ 0x194 0x33 /* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */
+ 0x198 0x13 /* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */
+ 0x19c 0x13 /* mcasp0_ahclkr.spi1_cs0, OUTPUT_PULLUP | MODE3 */
+ 0x164 0x12 /* eCAP0_in_PWM0_out.spi1_cs1 , OUTPUT_PULLUP | MODE2 */
+ >;
+ };
+
+ /* I2C 2 */
+ i2c2_pins: pinmux_i2c2_pins {
+ pinctrl-single,pins = <
+ 0x178 (PIN_INPUT_PULLUP | MUX_MODE3) // spi0_d1.i2c2_sda, IMPUT_PULLUP | MODE3
+ 0x17c (PIN_INPUT_PULLUP | MUX_MODE3) // spi0_cs0.i2c2_scl, INPUT_PULLUP | MODE3
+ >;
+ };
+};
+
+/ {
+/* GPIO. */
+ ntnu_gpio {
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_pins>;
+ compatible = "ntnu-gpio";
+ status = "okay";
+ };
+};
+
+/* Enable UART2. */
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart2_pins>;
+ status = "okay";
+};
+
+/* Enable UART4. */
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart4_pins>;
+ status = "okay";
+};
+
+/* Enable SPI1 */
+&spi1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi1_pins_s0>;
+
+ spidev@1 {
+ spi-max-frequency = <24000000>;
+ reg = <0>;
+ compatible = "linux,spidev";
+ };
+ spidev@2 {
+ spi-max-frequency = <24000000>;
+ reg = <1>;
+ compatible = "linux,spidev";
+ };
+};
+
+/* Enable i2c-2 */
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
+
+ status = "okay";
+ clock-frequency = <400000>;
+
+};
diff -ruN linux-3.14.16/arch/arm/boot/dts/Makefile linux-3.14.16.kk/arch/arm/boot/dts/Makefile
--- linux-3.14.16/arch/arm/boot/dts/Makefile 2014-08-08 01:50:59.000000000 +0200
+++ linux-3.14.16.kk/arch/arm/boot/dts/Makefile 2015-11-04 13:15:01.096000000 +0100
@@ -227,6 +227,7 @@
am335x-bone.dtb \
am335x-boneblack.dtb \
am335x-nano.dtb \
+ am335x-lctr-b2xx-ntnu-uart.dtb \
am335x-base0033.dtb \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \

184
systems/ntnu-b2xx/patches/linux/3.14/00-ntnu-b2xx-dts.patch Normal file
View File

@ -0,0 +1,184 @@
diff -Nru linux-3.14.16/arch/arm/boot/dts/am335x-ntnu-b2xx.dts linux-3.14.16.kk/arch/arm/boot/dts/am335x-ntnu-b2xx.dts
--- linux-3.14.16/arch/arm/boot/dts/am335x-ntnu-b2xx.dts 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.14.16.kk/arch/arm/boot/dts/am335x-ntnu-b2xx.dts 2016-03-31 11:45:37.584000000 +0200
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2014 Universidade do Porto - Faculdade de Engenharia
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "am335x-boneblack.dts"
+
+/ {
+ /* No need for HDMI. */
+ hdmi {
+ status = "disabled";
+ };
+
+ /* PPS. */
+ pps {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pps_pins>;
+ compatible = "pps-gpio";
+ status = "okay";
+ gpios = <&gpio2 13 0>;
+ assert-rising-edge;
+ };
+};
+
+
+
+&am33xx_pinmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&board_pins>;
+
+ /* User space. */
+ board_pins: pinmux_board_pins {
+ /* lcd_data6 / gpio2_12 / GPIO 76 */
+ pinctrl-single,pins = <0xb8 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)>;
+ };
+
+ /* PPS. */
+ pps_pins: pinmux_pps_pins {
+ /* lcd_data7 / gpio2_13 */
+ pinctrl-single,pins = <0xbc (PIN_INPUT_PULLDOWN | MUX_MODE7)>;
+ };
+
+ /* UART1. */
+ uart1_pins: pinmux_uart1_pins {
+ pinctrl-single,pins = <
+ /* uart1_rxd */
+ 0x180 (PIN_INPUT_PULLUP | MUX_MODE0)
+ /* uart1_txd */
+ 0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)
+ >;
+ };
+
+ /* UART2. */
+ uart2_pins: pinmux_uart2_pins {
+ pinctrl-single,pins = <
+ /* uart2_rxd */
+ 0x150 (PIN_INPUT_PULLUP | MUX_MODE1)
+ /* uart2_txd */
+ 0x154 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)
+ >;
+ };
+
+ /* UART4. */
+ uart4_pins: pinmux_uart4_pins {
+ pinctrl-single,pins = <
+ /* uart4_rxd */
+ 0x70 (PIN_INPUT_PULLUP | MUX_MODE6)
+ /* uart4_txd */
+ 0x74 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)
+ >;
+ };
+
+ /* GPIO on ntnu cape v1.2. */
+ gpio_pins: pinmux_gpio_pins {
+ pinctrl-single,pins = <
+ /* GPIO 48 - Pin P9 15 - GPIO 1_16 */
+ 0x040 (PIN_INPUT_PULLUP | MUX_MODE7)
+ /* GPIO 51 - Pin P9 16 - GPIO 1_19 */
+ 0x04c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)
+ /* GPIO 4 - Pin P9 17 - GPIO 0_5 */
+ 0x15c (PIN_INPUT_PULLUP | MUX_MODE7)
+ /* GPIO 48 - Pin P9 18 - GPIO 0_4 */
+ 0x158 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)
+ >;
+ };
+
+
+
+ /* SPI1 */
+ spi1_pins_s0: spi1_pins_s0 {
+ pinctrl-single,pins = <
+ 0x190 0x33 /* mcasp0_aclkx.spi1_sclk, INPUT_PULLUP | MODE3 */
+ 0x194 0x33 /* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */
+ 0x198 0x13 /* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */
+ 0x19c 0x13 /* mcasp0_ahclkr.spi1_cs0, OUTPUT_PULLUP | MODE3 */
+ 0x164 0x12 /* eCAP0_in_PWM0_out.spi1_cs1 , OUTPUT_PULLUP | MODE2 */
+ >;
+ };
+
+ /* I2C 2 */
+ i2c2_pins: pinmux_i2c2_pins {
+ pinctrl-single,pins = <
+ 0x178 (PIN_INPUT_PULLUP | MUX_MODE3) // spi0_d1.i2c2_sda, IMPUT_PULLUP | MODE3
+ 0x17c (PIN_INPUT_PULLUP | MUX_MODE3) // spi0_cs0.i2c2_scl, INPUT_PULLUP | MODE3
+ >;
+ };
+};
+
+/ {
+/* GPIO. */
+ ntnu_gpio {
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_pins>;
+ compatible = "ntnu-gpio";
+ status = "okay";
+ };
+};
+
+/* Enable UART1. */
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>;
+ status = "okay";
+};
+
+/* Enable UART2 (actual UART3). */
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart2_pins>;
+ status = "okay";
+};
+
+/* Enable UART4. */
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart4_pins>;
+ status = "okay";
+};
+
+/* Enable SPI1 */
+&spi1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi1_pins_s0>;
+
+ spidev@1 {
+ spi-max-frequency = <24000000>;
+ reg = <0>;
+ compatible = "linux,spidev";
+ };
+ spidev@2 {
+ spi-max-frequency = <24000000>;
+ reg = <1>;
+ compatible = "linux,spidev";
+ };
+};
+
+/* Enable i2c-2 */
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
+ status = "okay";
+ clock-frequency = <400000>;
+};
diff -Nru linux-3.14.16/arch/arm/boot/dts/Makefile linux-3.14.16.kk/arch/arm/boot/dts/Makefile
--- linux-3.14.16/arch/arm/boot/dts/Makefile 2014-08-08 01:50:59.000000000 +0200
+++ linux-3.14.16.kk/arch/arm/boot/dts/Makefile 2016-03-31 11:46:14.640000000 +0200
@@ -226,6 +226,7 @@
am335x-evmsk.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
+ am335x-ntnu-b2xx.dtb \
am335x-nano.dtb \
am335x-base0033.dtb \
am3517-evm.dtb \