Robert,
For your perusal, I have attached my patch to get my cape
peacefully coexisting (I hope) with the changes in 3.16.
Best regards,
Dave.
On 07/31/2014 01:32 PM, David Lambert wrote:
Robert,
I seem to have an issue with my
am335x-boneblack-cape-bone-argus.dts in 3.16.0-rc7-bone1. This time it
appears that there is a clash with the Ethernet subsystem. Has
something changed in this area from 3.15?
Regards,
Dave.
On 07/16/2014 08:13 AM, David Lambert wrote:
Thanks Robert. That works fine!
Regards,
Dave.
On 07/15/2014 07:04 PM, Robert Nelson wrote:
On Tue, Jul 15, 2014 at 6:52 PM, David Lambert <d...@lambsys.com>
wrote:
On 07/15/2014 04:40 PM, Robert Nelson wrote:
On Tue, Jul 15, 2014 at 4:35 PM, David Lambert <d...@lambsys.com>
wrote:
Thanks so much Robert - I think you nailed it! Unfortunately I
did not
inherit this change as I could not import am335x-bone-common.dtsi
due to
the
clash:
/* pinctrl-0 = <&clkout2_pin>; clash with argus-ups */
I'll clean that up in a bit and push it.. I have another patch from
John for audio too, so i'll get a new bone tag released this
evening..
Regards,
Also I found this one.
/* pinctrl-0 = <&ecap0_pin_p9_42>; clash with Argus */
Here's what i came up for the v3.15.x branch. This should make usb
work now..
https://github.com/RobertCNelson/bb-kernel/commit/e34510a7b5c6712386590818ba84e8ea8752f7f0
Not sure of the best way to handle these sort of situations.
Currently I am
just copying then editing the contents of am335x-bone-common.dtsi
into my
dts. This is obviously a very messy hack. Maybe
am335x-bone-common.dtsi
could be subdivided into smaller chunks????
Yeah, it needs to be cleaned up badly.. It's only getting worse with
more patches on linux-omap.. We just need a weekend, few kegs and do a
cleanup..
1: am335x-bone-common.dtsi (only common stuff and all pinmux's)
2: am335x-boneblack-common.dtsi (no eMMC/HDMI/HDMI Audio)
3: am335x-boneblack-eMMC.dtsi
4: am335x-boneblack-HDMI.dtsi
5: am335x-boneblack-HDMIA.dtsi
am335x-bone.dtb = (1)
am335x-boneblack.dtb = (1+2+3+4+5)
Then it should be easy to expand on "am335x-boneblack-common.dtsi" and
enable your cape.
Regards,
--
For more options, visit http://beagleboard.org/discuss
---
You received this message because you are subscribed to the Google Groups "BeagleBoard" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to beagleboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
>From 97426cfbbf2ae9942ad36682e10a6f3f7ac0867e Mon Sep 17 00:00:00 2001
From: Dave Lambert <d...@lambsys.com>
Date: Thu, 31 Jul 2014 14:33:48 -0500
Subject: Updated dts to be in line with 3.16 changes.
---
.../boot/dts/am335x-boneblack-cape-bone-argus.dts | 215 +++++++++++++++++---
1 file changed, 186 insertions(+), 29 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
index fd864e3..a3e300a 100644
--- a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
@@ -59,7 +59,15 @@
};
};
- vmmcsd_fixed: fixedregulator@0 {
+ vbat: fixedregulator@0 {
+ compatible = "regulator-fixed";
+ regulator-name = "vbat";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-boot-on;
+ };
+
+ vmmcsd_fixed: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
@@ -101,6 +109,20 @@
>;
};
+ uart1_pins: pinmux_uart1_pins {
+ pinctrl-single,pins = <
+ 0x180 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_rxd.uart1_rxd */
+ 0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_txd.uart1_txd */
+ >;
+ };
+
+ uart2_pins: pinmux_uart2_pins {
+ pinctrl-single,pins = <
+ 0x150 0x21 /* spi0_sclk.uart2_rxd | MODE1 */
+ 0x154 0x01 /* spi0_d0.uart2_txd | MODE1 */
+ >;
+ };
+
uart4_pins: pinmux_uart4_pins {
pinctrl-single,pins = <
0x070 0x26 /* gpmc_wait0.uart4_rxd | MODE6 */
@@ -108,6 +130,13 @@
>;
};
+ uart5_pins: pinmux_uart5_pins {
+ pinctrl-single,pins = <
+ 0x0C4 0x24 /* lcd_data9.uart5_rxd | MODE4 */
+ 0x0C0 0x04 /* lcd_data8.uart5_txd | MODE4 */
+ >;
+ };
+
clkout2_pin: pinmux_clkout2_pin {
pinctrl-single,pins = <
0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
@@ -173,6 +202,47 @@
0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
>;
};
+ emmc_pins: pinmux_emmc_pins {
+ pinctrl-single,pins = <
+ 0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
+ 0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
+ 0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
+ 0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
+ 0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
+ 0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
+ 0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
+ 0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
+ 0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
+ 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
+ >;
+ };
+
+ 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 */
+ >;
+ };
+
+ ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
+ pinctrl-single,pins = <
+ 0x048 0x6 /* P9_14 (ZCZ ball U14) | MODE 6 */
+ >;
+ };
+
+ ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
+ pinctrl-single,pins = <
+ 0x04c 0x6 /* P9_16 (ZCZ ball T14) | MODE 6 */
+ >;
+ };
+
+ ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
+ pinctrl-single,pins = <
+ 0x164 0x0 /* P9_42 (ZCZ ball C18) | MODE 0 */
+ >;
+ };
argus_ups_pins: pinmux_argus_ups_pins { /* Set up pinmux */
pinctrl-single,pins = <
@@ -196,40 +266,40 @@
status = "okay";
};
-/*&uart4 {
+&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart4_pins>;
+ pinctrl-0 = <&uart1_pins>;
status = "okay";
-};*/
+};
&usb {
status = "okay";
+};
- control@44e10620 {
- status = "okay";
- };
+&usb_ctrl_mod {
+ status = "okay";
+};
- usb-phy@47401300 {
- status = "okay";
- };
+&usb0_phy {
+ status = "okay";
+};
- usb-phy@47401b00 {
- status = "okay";
- };
+&usb1_phy {
+ status = "okay";
+};
- usb@47401000 {
- status = "okay";
- };
+&usb0 {
+ status = "okay";
+};
- usb@47401800 {
- status = "okay";
- dr_mode = "host";
- };
+&usb1 {
+ status = "okay";
+ dr_mode = "host";
+};
- dma-controller@47402000 {
- status = "okay";
- };
+&cppi41dma {
+ status = "okay";
};
&i2c0 {
@@ -277,7 +347,57 @@
};
};
-#include "tps65217.dtsi"
+&epwmss0 {
+ pinctrl-names = "default";
+/* pinctrl-0 = <&ecap0_pin_p9_42>; Clashes with argus-ups */
+ status = "okay";
+
+ ecap@48300100 {
+ status = "okay";
+ };
+};
+
+&epwmss1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &ehrpwm1_pin_p9_14
+ &ehrpwm1_pin_p9_16
+ >;
+
+ status = "okay";
+
+ ehrpwm@48302200 {
+ status = "okay";
+ };
+};
+
+&spi0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi0_pins>;
+ status = "okay";
+
+ spidev0: spi@0 {
+ compatible = "spidev";
+ reg = <0>;
+ spi-max-frequency = <16000000>;
+ spi-cpha;
+ };
+
+ spidev1: spi@1 {
+ compatible = "spidev";
+ reg = <1>;
+ spi-max-frequency = <16000000>;
+ };
+};
+
+&tscadc {
+ status = "okay";
+ adc {
+ ti,adc-channels = <4 5 6>;
+ };
+};
+
+/include/ "tps65217.dtsi"
&tps {
regulators {
@@ -312,8 +432,6 @@
};
ldo3_reg: regulator@5 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
regulator-always-on;
};
@@ -337,16 +455,16 @@
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
-
+ status = "okay";
};
&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
};
-
&mmc1 {
status = "okay";
bus-width = <0x4>;
@@ -354,10 +472,49 @@
pinctrl-0 = <&mmc1_pins>;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
cd-inverted;
- vmmc-supply = <&vmmcsd_fixed>;
};
/ {
+ ocp {
+ //FIXME: these pwm's still need work, this guild isn't working..
+ //http://elinux.org/EBC_Exercise_13_Pulse_Width_Modulation
+ pwm_test_P9_14@0 {
+ compatible = "pwm_test";
+ pwms = <&ehrpwm1 0 500000 1>;
+ pwm-names = "PWM_P9_14";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ehrpwm1_pin_p9_14>;
+ enabled = <1>;
+ duty = <0>;
+ status = "okay";
+ };
+
+ pwm_test_P9_16@0 {
+ compatible = "pwm_test";
+ pwms = <&ehrpwm1 0 500000 1>;
+ pwm-names = "PWM_P9_16";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ehrpwm1_pin_p9_16>;
+ enabled = <1>;
+ duty = <0>;
+ status = "okay";
+ };
+
+ pwm_test_P9_42 {
+ compatible = "pwm_test";
+ pwms = <&ecap0 0 500000 1>;
+ pwm-names = "PWM_P9_42";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ecap0_pin_p9_42>;
+ enabled = <1>;
+ duty = <0>;
+ status = "okay";
+ };
+ };
+};
+
+
+/ {
cpus {
cpu@0 {
cpu0-supply = <&dcdc2_reg>;
--
1.7.10.4
