Skip to content

Commit

Permalink
bbb: disable clkout2 by default and let use use p9_41 in overlays
Browse files Browse the repository at this point in the history 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
@RobertCNelson
RobertCNelson committed Feb 12, 2016
1 parent 80e7d80 commit 270d9d3
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 39 deletions.
106 changes: 68 additions & 38 deletions patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
View file
@@ -1,13 +1,14 @@
From b560087419ee91461e8c4c8112483295ccb1e280 Mon Sep 17 00:00:00 2001
From 5f7fac494938da302147b5666a0fb92fa4d6ec16 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 5 Feb 2016 09:18:25 -0600
Date: Fri, 12 Feb 2016 14:15:01 -0600
Subject: [PATCH] sync: am335x-peripheral/pinmux

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/am335x-abbbi.dts | 1 +
arch/arm/boot/dts/am335x-arduino-tre.dts | 570 +++++++++++++++++++++
.../boot/dts/am335x-bone-common-no-capemgr.dtsi | 374 ++++++++++++++
.../boot/dts/am335x-bone-common-no-capemgr.dtsi | 368 +++++++++++++
arch/arm/boot/dts/am335x-bone-common.dtsi | 9 -
arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi | 18 +
arch/arm/boot/dts/am335x-bone-pinmux-can0.dtsi | 45 ++
arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi | 88 ++++
Expand All @@ -17,14 +18,14 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
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-bone.dts | 1 +
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-bbb-exp-c.dts | 39 ++
arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 39 ++
arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 197 +++++++
.../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 39 ++
.../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 163 ++++++
.../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 98 ++++
arch/arm/boot/dts/am335x-boneblack-overlay.dts | 19 +-
arch/arm/boot/dts/am335x-boneblack-replicape.dts | 13 +-
arch/arm/boot/dts/am335x-boneblack-replicape.dts | 23 +-
arch/arm/boot/dts/am335x-boneblack-spi0.dts | 189 +++++++
arch/arm/boot/dts/am335x-boneblack-ttyS2.dts | 177 +++++++
arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts | 8 +-
Expand All @@ -45,7 +46,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi | 25 +
arch/arm/boot/dts/am57xx-beagle-x15.dts | 24 +-
include/dt-bindings/board/am335x-bbw-bbb-base.h | 103 ++++
40 files changed, 3180 insertions(+), 37 deletions(-)
41 files changed, 3164 insertions(+), 56 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-arduino-tre.dts
create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
Expand Down Expand Up @@ -667,10 +668,10 @@ index 0000000..7fa0849
+};
diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
new file mode 100644
index 0000000..39c2e2d
index 0000000..fde3d40
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
@@ -0,0 +1,374 @@
@@ -0,0 +1,368 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
Expand Down Expand Up @@ -765,12 +766,6 @@ index 0000000..39c2e2d
+ >;
+ };
+
+ clkout2_pin: pinmux_clkout2_pin {
+ pinctrl-single,pins = <
+ 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
+ >;
+ };
+
+ cpsw_default: cpsw_default {
+ pinctrl-single,pins = <
+ /* Slave 1 */
Expand Down Expand Up @@ -1045,6 +1040,33 @@ index 0000000..39c2e2d
+&rtc {
+ system-power-controller;
+};
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 393af39..5b6943b 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -62,9 +62,6 @@
};

&am33xx_pinmux {
- pinctrl-names = "default";
- pinctrl-0 = <&clkout2_pin>;
-
user_leds_s0: user_leds_s0 {
pinctrl-single,pins = <
0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
@@ -95,12 +92,6 @@
>;
};

- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
cpsw_default: cpsw_default {
pinctrl-single,pins = <
/* Slave 1 */
diff --git a/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi b/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
new file mode 100644
index 0000000..7d8f673
Expand Down Expand Up @@ -1601,10 +1623,10 @@ index ce1b68a..b5d3815 100644
model = "TI AM335x BeagleBone";
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
new file mode 100644
index 0000000..bd8cb57
index 0000000..d8ac5a9
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
@@ -0,0 +1,44 @@
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
Expand Down Expand Up @@ -1636,11 +1658,6 @@ index 0000000..bd8cb57
+ status = "okay";
+};
+
+&am33xx_pinmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-peripheral-emmc.dtsi"
+#include "am335x-bone-pinmux-emmc.dtsi"
+/* #include "am335x-bone-emmc-in-reset.dtsi" */
Expand All @@ -1651,10 +1668,10 @@ index 0000000..bd8cb57
+#include "am335x-cape-bbb-exp-c.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
new file mode 100644
index 0000000..76a48c1
index 0000000..7364630
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
@@ -0,0 +1,44 @@
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
Expand Down Expand Up @@ -1686,11 +1703,6 @@ index 0000000..76a48c1
+ status = "okay";
+};
+
+&am33xx_pinmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-peripheral-emmc.dtsi"
+#include "am335x-bone-pinmux-emmc.dtsi"
+/* #include "am335x-bone-emmc-in-reset.dtsi" */
Expand Down Expand Up @@ -2261,7 +2273,7 @@ index 8206843..ba86fad 100644
+ };
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-replicape.dts b/arch/arm/boot/dts/am335x-boneblack-replicape.dts
index 53371bb..914ca87 100644
index 53371bb..c03d68f 100644
--- a/arch/arm/boot/dts/am335x-boneblack-replicape.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-replicape.dts
@@ -9,16 +9,13 @@
Expand All @@ -2282,18 +2294,36 @@ index 53371bb..914ca87 100644
&ldo3_reg {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@@ -37,6 +34,10 @@
@@ -37,10 +34,11 @@
status = "okay";
};

-&am33xx_pinmux {
- pinctrl-names = "default";
- pinctrl-0 = <&clkout2_pin>;
+&sgx {
+ status = "okay";
+};
+
&am33xx_pinmux {
pinctrl-names = "default";
pinctrl-0 = <&clkout2_pin>;
@@ -94,7 +95,3 @@

+&am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
pinctrl-single,pins = <
0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
@@ -71,13 +69,6 @@
0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
>;
};
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* xdma_event_intr1.clkout2 */
- >;
- };
-
};

&lcdc {
@@ -94,7 +85,3 @@
status = "okay";
};
};
Expand Down Expand Up @@ -3513,7 +3543,7 @@ index 0000000..88c8d04
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index da7ac65..739c488 100644
index b655397..558db7e 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -58,22 +58,22 @@
Expand Down Expand Up @@ -3546,7 +3576,7 @@ index da7ac65..739c488 100644
};

vdd_3v3: fixedregulator-vdd_3v3 {
@@ -230,13 +230,13 @@
@@ -232,13 +232,13 @@
cmem_block_0: cmem_block@0 {
reg = <0>;
memory-region = <&cmem_block_mem_0>;
Expand Down
2 changes: 1 addition & 1 deletion version.sh
View file
Expand Up @@ -25,7 +25,7 @@ toolchain="gcc_linaro_gnueabihf_4_9"
#Kernel/Build
KERNEL_REL=4.1
KERNEL_TAG=${KERNEL_REL}.17
BUILD=${build_prefix}47.1
BUILD=${build_prefix}47.2
kernel_rt=".15-rt17"

#v4.X-rcX + upto SHA
Expand Down

0 comments on commit 270d9d3

Please sign in to comment.