cape: add audio reva

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
RobertCNelson · Sep 18, 2014 · 2de4255 · 2de4255
1 parent ec0332b
commit 2de4255
Show file tree

Hide file tree

Showing 15 changed files with 463 additions and 85 deletions.
diff --git a/patch.sh b/patch.sh
@@ -234,9 +234,10 @@ beaglebone () {
 	${git} "${DIR}/patches/beaglebone/pinmux/0026-panel-disable-usart5.patch"
 	${git} "${DIR}/patches/beaglebone/pinmux/0027-trivial-fix-tty0x.patch"
 	${git} "${DIR}/patches/beaglebone/pinmux/0028-cape-bb-view-43.patch"
+	${git} "${DIR}/patches/beaglebone/pinmux/0029-cape-audio-rev-a.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then
-		number=28
+		number=29
 		cleanup
 	fi
 
@@ -246,6 +247,9 @@ beaglebone () {
 	${git} "${DIR}/patches/beaglebone/dts/0002-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0003-ARM-dts-am335x-bone-Fix-model-name-and-update-compat.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0004-ARM-dts-am335x-boneblack-dcdc1-set-to-1.35v-for-ddr3.patch"
+
+	#patch -p1 < "${DIR}/patches/beaglebone/dts/0005-add-base-files.patch"
+	#exit
 	${git} "${DIR}/patches/beaglebone/dts/0005-add-base-files.patch"
 
 	echo "dir: beaglebone/capes"
@@ -289,6 +293,15 @@ beaglebone () {
 	fi
 
 	if [ "x${regenerate}" = "xenable" ] ; then
+		base_dts="am335x-bone"
+		cape="audio-reva"
+		dtsi_append
+
+		base_dts="am335x-boneblack"
+		cape="audio-reva"
+		dtsi_append_hdmi_no_audio
+		dtsi_drop_nxp_hdmi_audio
+
 		base_dts="am335x-bone"
 		cape="audio"
 		dtsi_append
@@ -472,6 +485,9 @@ beaglebone () {
 
 	#dtb makefile
 	if [ "x${regenerate}" = "xenable" ] ; then
+		device="am335x-bone-audio-reva.dtb"
+		dtb_makefile_append
+
 		device="am335x-bone-audio.dtb"
 		dtb_makefile_append
 
@@ -511,6 +527,9 @@ beaglebone () {
 		device="am335x-bone-ttyO5.dtb"
 		dtb_makefile_append
 
+		device="am335x-boneblack-audio-reva.dtb"
+		dtb_makefile_append
+
 		device="am335x-boneblack-audio.dtb"
 		dtb_makefile_append
 

diff --git a/patches/beaglebone/dts/0005-add-base-files.patch b/patches/beaglebone/dts/0005-add-base-files.patch
@@ -1,22 +1,22 @@
-From 2883c53e036dc0e4dd8a206dced4e965712cc1a9 Mon Sep 17 00:00:00 2001
+From 967a5758296702185483683fee3a8c4a74c8f76b Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 18 Sep 2014 14:35:04 -0500
+Date: Thu, 18 Sep 2014 16:14:48 -0500
 Subject: [PATCH 5/5] add base files
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/boot/dts/am335x-bone-base.dts      | 47 ++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-base.dts      | 51 ++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack-base.dts | 55 +++++++++++++++++++++++++++++
- 2 files changed, 102 insertions(+)
+ 2 files changed, 106 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-base.dts
  create mode 100644 arch/arm/boot/dts/am335x-boneblack-base.dts
 
 diff --git a/arch/arm/boot/dts/am335x-bone-base.dts b/arch/arm/boot/dts/am335x-bone-base.dts
 new file mode 100644
-index 0000000..97a662a
+index 0000000..76247ec
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-base.dts
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,51 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -42,6 +42,10 @@ index 0000000..97a662a
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";

diff --git a/patches/beaglebone/generated/0001-auto-generated-cape-uarts.patch b/patches/beaglebone/generated/0001-auto-generated-cape-uarts.patch
@@ -1,19 +1,19 @@
-From 562c857c033a815c4698e3dd7ad4fc6ab4c13e0a Mon Sep 17 00:00:00 2001
+From 234da79f46a0bf80a986466099e1f995c90e613b Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 18 Sep 2014 14:36:22 -0500
+Date: Thu, 18 Sep 2014 16:16:24 -0500
 Subject: [PATCH 1/9] auto generated: cape: uarts
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/boot/dts/am335x-bone-ttyO1.dts      | 49 ++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-bone-ttyO2.dts      | 49 ++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-bone-ttyO4.dts      | 49 ++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-bone-ttyO5.dts      | 49 ++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-ttyO1.dts      | 53 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-ttyO2.dts      | 53 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-ttyO4.dts      | 53 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-ttyO5.dts      | 53 ++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack-ttyO1.dts | 57 ++++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack-ttyO2.dts | 57 ++++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack-ttyO4.dts | 57 ++++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack-ttyO5.dts | 57 ++++++++++++++++++++++++++++
- 8 files changed, 424 insertions(+)
+ 8 files changed, 440 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-ttyO1.dts
  create mode 100644 arch/arm/boot/dts/am335x-bone-ttyO2.dts
  create mode 100644 arch/arm/boot/dts/am335x-bone-ttyO4.dts
@@ -25,10 +25,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 
 diff --git a/arch/arm/boot/dts/am335x-bone-ttyO1.dts b/arch/arm/boot/dts/am335x-bone-ttyO1.dts
 new file mode 100644
-index 0000000..27add09
+index 0000000..15a8f63
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-ttyO1.dts
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -54,6 +54,10 @@ index 0000000..27add09
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";
@@ -80,10 +84,10 @@ index 0000000..27add09
 +#include "am335x-bone-ttyO1.dtsi"
 diff --git a/arch/arm/boot/dts/am335x-bone-ttyO2.dts b/arch/arm/boot/dts/am335x-bone-ttyO2.dts
 new file mode 100644
-index 0000000..9dae664
+index 0000000..eabcead
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-ttyO2.dts
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -109,6 +113,10 @@ index 0000000..9dae664
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";
@@ -135,10 +143,10 @@ index 0000000..9dae664
 +#include "am335x-bone-ttyO2.dtsi"
 diff --git a/arch/arm/boot/dts/am335x-bone-ttyO4.dts b/arch/arm/boot/dts/am335x-bone-ttyO4.dts
 new file mode 100644
-index 0000000..938eb59
+index 0000000..2413af4
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-ttyO4.dts
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -164,6 +172,10 @@ index 0000000..938eb59
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";
@@ -190,10 +202,10 @@ index 0000000..938eb59
 +#include "am335x-bone-ttyO4.dtsi"
 diff --git a/arch/arm/boot/dts/am335x-bone-ttyO5.dts b/arch/arm/boot/dts/am335x-bone-ttyO5.dts
 new file mode 100644
-index 0000000..4d3dcb9
+index 0000000..de84138
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-ttyO5.dts
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -219,6 +231,10 @@ index 0000000..4d3dcb9
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";

diff --git a/patches/beaglebone/generated/0002-auto-generated-cape-audio.patch b/patches/beaglebone/generated/0002-auto-generated-cape-audio.patch
@@ -1,22 +1,85 @@
-From 0e268b34363e2adbc36ebe4d2cd49d9c9f9c2ced Mon Sep 17 00:00:00 2001
+From ff368d06562bd43385dc04a6a9bdf337f3f20c04 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 18 Sep 2014 14:36:22 -0500
+Date: Thu, 18 Sep 2014 16:16:25 -0500
 Subject: [PATCH 2/9] auto generated: cape: audio
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/boot/dts/am335x-bone-audio.dts      | 49 +++++++++++++++++++++++
- arch/arm/boot/dts/am335x-boneblack-audio.dts | 58 ++++++++++++++++++++++++++++
- 2 files changed, 107 insertions(+)
+ arch/arm/boot/dts/am335x-bone-audio-reva.dts      | 53 +++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-audio.dts           | 53 +++++++++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack-audio-reva.dts | 58 +++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack-audio.dts      | 58 +++++++++++++++++++++++
+ 4 files changed, 222 insertions(+)
+ create mode 100644 arch/arm/boot/dts/am335x-bone-audio-reva.dts
  create mode 100644 arch/arm/boot/dts/am335x-bone-audio.dts
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack-audio-reva.dts
  create mode 100644 arch/arm/boot/dts/am335x-boneblack-audio.dts
 
+diff --git a/arch/arm/boot/dts/am335x-bone-audio-reva.dts b/arch/arm/boot/dts/am335x-bone-audio-reva.dts
+new file mode 100644
+index 0000000..537ab3b
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-audio-reva.dts
+@@ -0,0 +1,53 @@
++/*
++ * 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.
++ */
++/dts-v1/;
++
++#include "am33xx.dtsi"
++#include "am335x-bone-common.dtsi"
++#include "am335x-bone-common-pinmux.dtsi"
++
++/ {
++	model = "TI AM335x BeagleBone";
++	compatible = "ti,am335x-bone", "ti,am33xx";
++};
++
++&ldo3_reg {
++	regulator-min-microvolt = <1800000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-always-on;
++};
++
++&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
++	/* mmc1 */
++	P9_92_pinmux {
++		status = "disabled";
++	};
++};
++
++&mmc1 {
++	vmmc-supply = <&ldo3_reg>;
++};
++
++&am33xx_pinmux {
++	pinctrl-names = "default";
++	pinctrl-0 = <&clkout2_pin>;
++};
++
++&sham {
++	status = "okay";
++};
++
++&aes {
++	status = "okay";
++};
++
++#include "am335x-bone-audio-reva.dtsi"
 diff --git a/arch/arm/boot/dts/am335x-bone-audio.dts b/arch/arm/boot/dts/am335x-bone-audio.dts
 new file mode 100644
-index 0000000..fa15816
+index 0000000..88d306a
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-audio.dts
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -42,6 +105,10 @@ index 0000000..fa15816
 +};
 +
 +&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
 +	/* mmc1 */
 +	P9_92_pinmux {
 +		status = "disabled";
@@ -66,6 +133,70 @@ index 0000000..fa15816
 +};
 +
 +#include "am335x-bone-audio.dtsi"
+diff --git a/arch/arm/boot/dts/am335x-boneblack-audio-reva.dts b/arch/arm/boot/dts/am335x-boneblack-audio-reva.dts
+new file mode 100644
+index 0000000..533badd
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-boneblack-audio-reva.dts
+@@ -0,0 +1,58 @@
++/*
++ * 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.
++ */
++/dts-v1/;
++
++#include "am33xx.dtsi"
++#include "am335x-bone-common.dtsi"
++#include "am335x-bone-common-pinmux.dtsi"
++
++/ {
++	model = "TI AM335x BeagleBone Black";
++	compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
++};
++
++&dcdc1_reg {
++	/* VDD_DDR3 voltage 1.35V */
++	regulator-name = "vdd_ddr3";
++	regulator-min-microvolt = <1350000>;
++	regulator-max-microvolt = <1350000>;
++	regulator-boot-on;
++	regulator-always-on;
++};
++
++&ldo3_reg {
++	regulator-min-microvolt = <1800000>;
++	regulator-max-microvolt = <1800000>;
++	regulator-always-on;
++};
++
++&ocp {
++	/* clkout2 */
++	P9_41_pinmux {
++		status = "disabled";
++	};
++	/* mmc1 */
++	P9_92_pinmux {
++		status = "disabled";
++	};
++};
++
++&mmc1 {
++	vmmc-supply = <&vmmcsd_fixed>;
++};
++
++&am33xx_pinmux {
++	pinctrl-names = "default";
++	pinctrl-0 = <&clkout2_pin>;
++};
++
++#include "am335x-boneblack-emmc.dtsi"
++/* #include "am335x-boneblack-nxp-hdmi-audio.dtsi" */
++
++#include "am335x-bone-audio-reva.dtsi"
++#include "am335x-boneblack-nxp-hdmi-no-audio.dtsi"
 diff --git a/arch/arm/boot/dts/am335x-boneblack-audio.dts b/arch/arm/boot/dts/am335x-boneblack-audio.dts
 new file mode 100644
 index 0000000..b3e7223