From ace43e72685ae2c878cbf7d10c42c52dffbbd87d Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Mon, 11 Jan 2016 12:59:06 -0600 Subject: [PATCH] dts: dont forget about am335x-boneblack-bbbmini.dtb Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- patch.sh | 1 + .../0001-sync-am335x-peripheral-pinmux.patch | 408 +++++++++++++++++- ...generated-capes-add-dtbs-to-makefile.patch | 15 +- version.sh | 2 +- 4 files changed, 414 insertions(+), 12 deletions(-) diff --git a/patch.sh b/patch.sh index da6d48a0d..d4a217849 100644 --- a/patch.sh +++ b/patch.sh @@ -529,6 +529,7 @@ beaglebone () { device="am335x-boneblack-bbb-exp-c.dtb" ; dtb_makefile_append device="am335x-boneblack-bbb-exp-r.dtb" ; dtb_makefile_append + device="am335x-boneblack-bbbmini.dtb" ; dtb_makefile_append device="am335x-boneblack-can0.dtb" ; dtb_makefile_append device="am335x-boneblack-cape-bone-argus.dtb" ; dtb_makefile_append device="am335x-boneblack-emmc-overlay.dtb" ; dtb_makefile_append diff --git a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch index a85fc7774..f869a62cd 100644 --- a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch +++ b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch @@ -1,6 +1,6 @@ -From 8b20f7dc2d734b73254ccc0c0df4d9dd8418f0e8 Mon Sep 17 00:00:00 2001 +From 98654f0502fa0fe68e4451079987cc387f5897d1 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 10 Nov 2015 18:06:27 -0600 +Date: Mon, 11 Jan 2016 12:52:46 -0600 Subject: [PATCH] sync: am335x-peripheral/pinmux Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -17,12 +17,16 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi | 45 ++ arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi | 158 ++++++ .../am335x-bone-pinmux-panel-1024x600-24bit.dtsi | 151 ++++++ + arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi | 51 ++ + arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi | 27 + + arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi | 28 + arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi | 48 ++ arch/arm/boot/dts/am335x-bone-pinmux-ttyS2.dtsi | 48 ++ arch/arm/boot/dts/am335x-bone-pinmux-ttyS4.dtsi | 48 ++ arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi | 48 ++ arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 44 ++ arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 44 ++ + arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 199 ++++++++ arch/arm/boot/dts/am335x-boneblack-can0.dts | 63 +++ .../boot/dts/am335x-boneblack-cape-bone-argus.dts | 44 ++ .../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 38 ++ @@ -42,12 +46,15 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi | 13 + arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi | 21 + .../am335x-peripheral-panel-1024x600-24bit.dtsi | 49 ++ + arch/arm/boot/dts/am335x-peripheral-spi0.dtsi | 13 + + arch/arm/boot/dts/am335x-peripheral-spi1.dtsi | 13 + + arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi | 13 + arch/arm/boot/dts/am335x-peripheral-ttyS1.dtsi | 13 + arch/arm/boot/dts/am335x-peripheral-ttyS2.dtsi | 13 + arch/arm/boot/dts/am335x-peripheral-ttyS4.dtsi | 13 + arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi | 13 + include/dt-bindings/board/am335x-bbw-bbb-base.h | 103 ++++ - 42 files changed, 3090 insertions(+), 11 deletions(-) + 49 files changed, 3434 insertions(+), 11 deletions(-) create mode 100644 arch/arm/boot/dts/am335x-arduino-tre.dts create mode 100644 arch/arm/boot/dts/am335x-bone-can0.dts create mode 100644 arch/arm/boot/dts/am335x-bone-cape-bone-argus.dts @@ -59,12 +66,16 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-panel-1024x600-24bit.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS2.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS4.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi create mode 100644 arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts create mode 100644 arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts + create mode 100644 arch/arm/boot/dts/am335x-boneblack-bbbmini.dts create mode 100644 arch/arm/boot/dts/am335x-boneblack-can0.dts create mode 100644 arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts create mode 100644 arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts @@ -81,6 +92,9 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> create mode 100644 arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi create mode 100644 arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi create mode 100644 arch/arm/boot/dts/am335x-peripheral-panel-1024x600-24bit.dtsi + create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi0.dtsi + create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi1.dtsi + create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi create mode 100644 arch/arm/boot/dts/am335x-peripheral-ttyS1.dtsi create mode 100644 arch/arm/boot/dts/am335x-peripheral-ttyS2.dtsi create mode 100644 arch/arm/boot/dts/am335x-peripheral-ttyS4.dtsi @@ -1735,6 +1749,130 @@ index 0000000..65e5fbb + pinctrl-0 = <&lcd_24bit_pins>; + }; +}; +diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi +new file mode 100644 +index 0000000..354e66a +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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 <dt-bindings/board/am335x-bbw-bbb-base.h> ++#include "am335x-peripheral-spi0.dtsi" ++ ++/* cape universal */ ++ ++/* ++ *&ocp { ++ * P9_17_pinmux { ++ * status = "disabled"; ++ * }; ++ * P9_18_pinmux { ++ * status = "disabled"; ++ * }; ++ * P9_21_pinmux { ++ * status = "disabled"; ++ * }; ++ * P9_22_pinmux { ++ * status = "disabled"; ++ * }; ++ *}; ++ * ++ *&spi0 { ++ * pinctrl-0 = <>; ++ *}; ++ * ++ */ ++ ++/* standard */ ++ ++&am33xx_pinmux { ++ spi0_pins: pinmux_spi0_pins { ++ pinctrl-single,pins = < ++ 0x150 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_sclk.spi0_sclk */ ++ 0x154 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_d0.spi0_d0 */ ++ 0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* spi0_d1.spi0_d1 */ ++ 0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* spi0_cs0.spi0_cs0 */ ++ >; ++ }; ++}; ++ ++&spi0 { ++ pinctrl-0 = <&spi0_pins>; ++}; +diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi +new file mode 100644 +index 0000000..bff7f8d +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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 <dt-bindings/board/am335x-bbw-bbb-base.h> ++#include "am335x-peripheral-spi1.dtsi" ++ ++/* standard */ ++ ++&am33xx_pinmux { ++ spi1_pins: pinmux_spi1_pins { ++ 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 */ >; ++ }; ++}; ++ ++&spi1 { ++ pinctrl-0 = <&spi1_pins>; ++}; +diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi +new file mode 100644 +index 0000000..62874c8 +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi +@@ -0,0 +1,28 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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 <dt-bindings/board/am335x-bbw-bbb-base.h> ++#include "am335x-peripheral-spi1.dtsi" ++ ++/* standard */ ++ ++&am33xx_pinmux { ++ spi1a_pins: pinmux_spi1a_pins { ++ pinctrl-single,pins = < ++ 0x164 0x34 /* eCAP0_in_PWM0_out.spi1_sclk, INPUT_PULLUP | MODE4 */ ++ /* NOTE: P9.42 is connected to two pads */ ++ // 0x1A0 0x27 /* set the other pad to gpio input */ ++ 0x194 0x33 /* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */ ++ 0x198 0x13 /* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */ ++ 0x178 0x14 /* uart1_ctsn.spi1_cs0, OUTPUT_PULLUP | MODE4 */ >; ++ }; ++}; ++ ++&spi1 { ++ pinctrl-0 = <&spi1a_pins>; ++}; diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi new file mode 100644 index 0000000..ae5b813 @@ -2051,6 +2189,211 @@ index 0000000..9877591 +}; + +#include "am335x-cape-bbb-exp-r.dtsi" +diff --git a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts +new file mode 100644 +index 0000000..86e2190 +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts +@@ -0,0 +1,199 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * Modified by Mirko Denecke <mirkix@gmail.com> ++ * ++ * 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. ++ */ ++/dts-v1/; ++ ++#include "am33xx.dtsi" ++#include "am335x-bone-common.dtsi" ++#include <dt-bindings/board/am335x-bbw-bbb-base.h> ++#include <dt-bindings/pinctrl/am33xx.h> ++ ++/ { ++ model = "TI AM335x BeagleBone Black"; ++ compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; ++}; ++ ++&ldo3_reg { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++}; ++ ++&mmc1 { ++ vmmc-supply = <&vmmcsd_fixed>; ++}; ++ ++&mmc2 { ++ vmmc-supply = <&vmmcsd_fixed>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_pins>; ++ bus-width = <8>; ++ status = "okay"; ++}; ++ ++&am33xx_pinmux { ++ dcan1_pins: pinmux_dcan1_pins { ++ pinctrl-single,pins = < ++ /* P9_26: uart1_rxd.d_can1_tx */ ++ BONE_P9_26 (PIN_OUTPUT_PULLUP | MUX_MODE2) ++ /* P9_24: uart1_txd.d_can1_rx */ ++ BONE_P9_24 (PIN_INPUT_PULLUP | MUX_MODE2) ++ >; ++ }; ++ ++ pru_pins: pinmux_pru_pins { ++ pinctrl-single,pins = < ++ 0x03c 0x35 /* ecap0_in_pwm0_out.pr1_ecap0_ecap_capin, MODE5 | INPUT_PULLUP | PRU, PPM-sum, SBUS, DSM */ ++ ++ 0x0e8 0x25 /* lcd_pclk.pr1_pru1_pru_r30_10, MODE5 | OUTPUT | PRU, CH_1 */ ++ 0x0e0 0x25 /* lcd_vsync.pr1_pru1_pru_r30_8, MODE5 | OUTPUT | PRU, CH_2 */ ++ 0x0ec 0x25 /* lcd_ac_bias_en.pr1_pru1_pru_r30_11, MODE5 | OUTPUT | PRU, CH_3 */ ++ 0x0e4 0x25 /* lcd_hsync.pr1_pru1_pru_r30_9, MODE5 | OUTPUT | PRU, CH_4 */ ++ 0x0bc 0x25 /* lcd_data7.pr1_pru1_pru_r30_7, MODE5 | OUTPUT | PRU, CH_5 */ ++ 0x0b8 0x25 /* lcd_data6.pr1_pru1_pru_r30_6, MODE5 | OUTPUT | PRU, CH_6 */ ++ 0x0b4 0x25 /* lcd_data5.pr1_pru1_pru_r30_5, MODE5 | OUTPUT | PRU, CH_7 */ ++ 0x0b0 0x25 /* lcd_data4.pr1_pru1_pru_r30_4, MODE5 | OUTPUT | PRU, CH_8 */ ++ 0x0ac 0x25 /* lcd_data3.pr1_pru1_pru_r30_3, MODE5 | OUTPUT | PRU, CH_9 */ ++ 0x0a8 0x25 /* lcd_data2.pr1_pru1_pru_r30_2, MODE5 | OUTPUT | PRU, CH_10 */ ++ 0x0a4 0x25 /* lcd_data1.pr1_pru1_pru_r30_1, MODE5 | OUTPUT | PRU, CH_11 */ ++ 0x0a0 0x25 /* lcd_data0.pr1_pru1_pru_r30_0, MODE5 | OUTPUT | PRU, CH_12 */ ++ ++ BONE_P8_12 (PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* HC-SR04 TRIG */ ++ BONE_P8_16 (PIN_INPUT_PULLDOWN | MUX_MODE6) /* HC-SR04 ECHO */ ++ ++ BONE_P9_25 (PIN_INPUT_PULLDOWN | MUX_MODE6) /* MPU9250 INT */ ++ >; ++ }; ++ ++ spi0_pins: pinmux_spi0_pins { ++ pinctrl-single,pins = < ++ /* P9_22: spi0_sclk.spi0_sclk */ ++ BONE_P9_22 (PIN_INPUT_PULLUP | MUX_MODE0) ++ /* P9_21: spi0_d0.spi0_d0 */ ++ BONE_P9_21 (PIN_INPUT_PULLUP | MUX_MODE0) ++ /* P9_18: spi0_d1.spi0_d1 */ ++ BONE_P9_18 (PIN_OUTPUT_PULLUP | MUX_MODE0) ++ /* P9_17: spi0_cs0.spi0_cs0 */ ++ BONE_P9_17 (PIN_OUTPUT_PULLUP | MUX_MODE0) ++ >; ++ }; ++ ++ spi1_pins: pinmux_spi1_pins { ++ pinctrl-single,pins = < ++ /* P9_31: mcasp0_aclkx.spi1_sclk */ ++ BONE_P9_31 (PIN_INPUT_PULLUP | MUX_MODE3) ++ ++ /* P9_29: mcasp0_fsx.spi1_d0 */ ++ BONE_P9_29 (PIN_INPUT_PULLUP | MUX_MODE3) ++ ++ /* P9_30: mcasp0_axr0.spi1_d1 */ ++ BONE_P9_30 (PIN_OUTPUT_PULLUP | MUX_MODE3) ++ ++ /* P9_28: mcasp0_ahclkr.spi1_cs0 */ ++ BONE_P9_28 (PIN_OUTPUT_PULLUP | MUX_MODE3) ++ ++ /* P9_19: uart1_rtsn.spi1_cs1 */ ++/* BONE_P9_19 (PIN_OUTPUT_PULLUP | MUX_MODE4)*/ ++ ++ /* P9_42: ecap0_in_pwm0_out.spi1_cs1 */ ++ BONE_P9_42A (PIN_OUTPUT_PULLUP | MUX_MODE2) ++ >; ++ }; ++ ++ uart4_pins: pinmux_uart4_pins { ++ pinctrl-single,pins = < ++ /* P9_11: gpmc_wait0.uart4_rxd_mux2 */ ++ BONE_P9_11 (PIN_INPUT_PULLUP | MUX_MODE6) ++ /* P9_13: gpmc_wpn.uart4_txd_mux2 */ ++ BONE_P9_13 (PIN_OUTPUT_PULLDOWN | MUX_MODE6) ++ >; ++ }; ++ ++ uart5_pins: pinmux_uart5_pins { ++ pinctrl-single,pins = < ++ /* P8_38: lcd_data9.uart5_rxd */ ++ BONE_P8_38 (PIN_INPUT_PULLUP | MUX_MODE4) ++ /* P8_37: lcd_data8.uart5_txd */ ++ BONE_P8_37 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) ++ >; ++ }; ++}; ++ ++&dcan1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&dcan1_pins>; ++ status = "okay"; ++}; ++ ++&i2c2 { ++ clock-frequency = <400000>; ++}; ++ ++&spi0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi0_pins>; ++ status = "okay"; ++ ++ spi0_0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ spi-max-frequency = <24000000>; ++ reg = <0>; ++ compatible = "spidev"; ++ }; ++}; ++ ++&spi1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi1_pins>; ++ status = "okay"; ++ ++ spi1_0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0>; ++ spi-max-frequency = <24000000>; ++ compatible = "spidev"; ++ }; ++ ++ spi1_1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <1>; ++ spi-max-frequency = <24000000>; ++ compatible = "spidev"; ++ }; ++}; ++ ++&tscadc { ++ adc { ++ ti,adc-channels = <0 1>; ++ }; ++}; ++ ++&pruss { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pru_pins>; ++ status = "okay"; ++}; ++ ++&uart4 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart4_pins>; ++ status = "okay"; ++}; ++ ++&uart5 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart5_pins>; ++ status = "okay"; ++}; ++ ++&rtc { ++ system-power-controller; ++}; diff --git a/arch/arm/boot/dts/am335x-boneblack-can0.dts b/arch/arm/boot/dts/am335x-boneblack-can0.dts new file mode 100644 index 0000000..454e0df @@ -3293,6 +3636,63 @@ index 0000000..74ddc12 + }; + }; +}; +diff --git a/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi +new file mode 100644 +index 0000000..969e352 +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi +@@ -0,0 +1,13 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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. ++ */ ++ ++&spi0 { ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; +diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi +new file mode 100644 +index 0000000..ac5fe97 +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi +@@ -0,0 +1,13 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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. ++ */ ++ ++&spi1 { ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; +diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi +new file mode 100644 +index 0000000..ac5fe97 +--- /dev/null ++++ b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi +@@ -0,0 +1,13 @@ ++/* ++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * 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. ++ */ ++ ++&spi1 { ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; diff --git a/arch/arm/boot/dts/am335x-peripheral-ttyS1.dtsi b/arch/arm/boot/dts/am335x-peripheral-ttyS1.dtsi new file mode 100644 index 0000000..f59fa4c @@ -3479,5 +3879,5 @@ index 0000000..35f6d57 + +#endif -- -2.6.2 +2.6.4 diff --git a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch index eeefbe6d7..d1b8a6824 100644 --- a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch +++ b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch @@ -1,18 +1,18 @@ -From 10b1d3dda8206929fe9743a8a10f7272d8a2d00c Mon Sep 17 00:00:00 2001 +From c6bf7d1ad13debeab24bf307d59087286e975f06 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 10 Nov 2015 18:07:29 -0600 +Date: Mon, 11 Jan 2016 12:54:41 -0600 Subject: [PATCH] auto generated: capes: add dtbs to makefile Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - arch/arm/boot/dts/Makefile | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + arch/arm/boot/dts/Makefile | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index c217b26..68c9026 100644 +index c217b26..636b3d12 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -468,6 +468,21 @@ dtb-$(CONFIG_SOC_AM33XX) += \ +@@ -468,6 +468,22 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-base0033.dtb \ am335x-bone.dtb \ am335x-boneblack.dtb \ @@ -26,6 +26,7 @@ index c217b26..68c9026 100644 + am335x-boneblack-emmc-overlay.dtb \ + am335x-boneblack-cape-bone-argus.dtb \ + am335x-boneblack-can0.dtb \ ++ am335x-boneblack-bbbmini.dtb \ + am335x-boneblack-bbb-exp-r.dtb \ + am335x-boneblack-bbb-exp-c.dtb \ + am335x-bone-cape-bone-argus.dtb \ @@ -35,5 +36,5 @@ index c217b26..68c9026 100644 am335x-sl50.dtb \ am335x-evm.dtb \ -- -2.6.2 +2.6.4 diff --git a/version.sh b/version.sh index 53ea9ece7..c64bf3138 100644 --- a/version.sh +++ b/version.sh @@ -21,7 +21,7 @@ toolchain="gcc_linaro_gnueabihf_5" #Kernel/Build KERNEL_REL=4.4 KERNEL_TAG=${KERNEL_REL} -BUILD=bone1 +BUILD=bone1.1 kernel_rt=".X-rtY" #v4.X-rcX + upto SHA -- GitLab