Skip to content

Commit

Permalink
sync: am335x-peripheral/pinmux
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Nelson <[email protected]>
  • Loading branch information
RobertCNelson committed Jul 6, 2016
1 parent 2df92e5 commit 39b6035
Show file tree
Hide file tree
Showing 33 changed files with 718 additions and 122 deletions.
29 changes: 18 additions & 11 deletions arch/arm/boot/dts/am335x-abbbi.dts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@
status = "okay";
};

&cpu0_opp_table {
/*
* All PG 2.0 silicon may not support 1GHz but some of the early
* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
* to support 1GHz OPP so enable it for PG 2.0 on this board.
*/
oppnitro@1000000000 {
opp-supported-hw = <0x06 0x0100>;
};
};

&am33xx_pinmux {
adi_hdmi_bbbi_pins: adi_hdmi_bbbi_pins {
pinctrl-single,pins = <
Expand Down Expand Up @@ -149,16 +160,16 @@

/ {
clk_mcasp0_fixed: clk_mcasp0_fixed {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24576000>;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24576000>;
};

clk_mcasp0: clk_mcasp0 {
#clock-cells = <0>;
compatible = "gpio-gate-clock";
clocks = <&clk_mcasp0_fixed>;
enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
#clock-cells = <0>;
compatible = "gpio-gate-clock";
clocks = <&clk_mcasp0_fixed>;
enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
};

hdmi_audio: hdmi_audio@0 {
Expand All @@ -177,7 +188,3 @@
clock-names = "mclk";
};
};

&rtc {
system-power-controller;
};
15 changes: 15 additions & 0 deletions arch/arm/boot/dts/am335x-arduino-tre.dts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@
};
};

&cpu0_opp_table {
/*
* All PG 2.0 silicon may not support 1GHz but some of the early
* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
* to support 1GHz OPP so enable it for PG 2.0 on this board.
*/
oppnitro@1000000000 {
opp-supported-hw = <0x06 0x0100>;
};
};

&am33xx_pinmux {
pinctrl-names = "default";
pinctrl-0 = <&userled_pins>;
Expand Down Expand Up @@ -574,3 +585,7 @@
&aes {
status = "okay";
};

&sgx {
status = "okay";
};
31 changes: 22 additions & 9 deletions arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
};

leds {
pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&user_leds_default>;
pinctrl-1 = <&user_leds_sleep>;

compatible = "gpio-leds";

Expand Down Expand Up @@ -62,7 +63,7 @@
};

&am33xx_pinmux {
user_leds_s0: user_leds_s0 {
user_leds_default: user_leds_default {
pinctrl-single,pins = <
AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */
Expand All @@ -71,6 +72,15 @@
>;
};

user_leds_sleep: user_leds_sleep {
pinctrl-single,pins = <
AM33XX_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a6.gpio1_22 */
AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */
AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a8.gpio1_24 */
>;
};

i2c0_pins: pinmux_i2c0_pins {
pinctrl-single,pins = <
AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
Expand Down Expand Up @@ -267,7 +277,7 @@
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1325000>;
regulator-max-microvolt = <1351500>;
regulator-boot-on;
regulator-always-on;
};
Expand Down Expand Up @@ -308,15 +318,11 @@
phy-mode = "mii";
};

&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
phy-mode = "mii";
};

&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
slaves = <1>;
status = "okay";
};

Expand Down Expand Up @@ -348,5 +354,12 @@
};

&rtc {
clocks = <&clk_32768_ck>, <&clkdiv32k_ick>;
clock-names = "ext-clk", "int-clk";
system-power-controller;
};

&sgx {
status = "okay";
};

10 changes: 5 additions & 5 deletions arch/arm/boot/dts/am335x-bone-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,11 @@
phy-mode = "mii";
};

&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
phy-mode = "mii";
};

&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
slaves = <1>;
status = "okay";
};

Expand Down Expand Up @@ -412,6 +408,10 @@
system-power-controller;
};

&sgx {
status = "okay";
};

/* the cape manager */
/ {
bone_capemgr {
Expand Down
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* 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.
*/

/* standard */

&gpio1 {
emmc_rst {
gpio-hog;
gpios = <20 0>;
output-high;
line-name = "EMMC ResetN";
};
};
45 changes: 45 additions & 0 deletions arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* 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-can1.dtsi"

/* cape universal */

/*
*&ocp {
* P9_24_pinmux {
* mode = "can";
* };
* P9_26_pinmux {
* mode = "can";
* };
*};
*
*&dcan1 {
* pinctrl-0 = <>;
*};
*
*/

/* standard */

&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)
>;
};
};

&dcan1 {
pinctrl-0 = <&dcan1_pins>;
};
88 changes: 88 additions & 0 deletions arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* 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.
*/

/* Testing */
/* lsblk */

#include <dt-bindings/board/am335x-bbw-bbb-base.h>
#include "am335x-peripheral-emmc.dtsi"

/* cape universal */

/*
*&ocp {
* P8_21_pinmux {
* state = "disabled";
* };
* P8_20_pinmux {
* state = "disabled";
* };
* P8_25_pinmux {
* state = "disabled";
* };
* P8_24_pinmux {
* state = "disabled";
* };
* P8_05_pinmux {
* state = "disabled";
* };
* P8_06_pinmux {
* state = "disabled";
* };
* P8_23_pinmux {
* state = "disabled";
* };
* P8_22_pinmux {
* state = "disabled";
* };
* P8_03_pinmux {
* state = "disabled";
* };
* P8_04_pinmux {
* state = "disabled";
* };
*};
*
*&mmc2 {
* pinctrl-0 = <>;
*};
*
*/

/* standard */

&am33xx_pinmux {
emmc_pins: pinmux_emmc_pins {
pinctrl-single,pins = <
/* P8_21: gpmc_csn1.mmc1_clk */
BONE_P8_21 (PIN_INPUT_PULLUP | MUX_MODE2)
/* P8_20: gpmc_csn2.mmc1_cmd */
BONE_P8_20 (PIN_INPUT_PULLUP | MUX_MODE2)
/* P8_25: gpmc_ad0.mmc1_dat0 */
BONE_P8_25 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_24: gpmc_ad1.mmc1_dat1 */
BONE_P8_24 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_05: gpmc_ad2.mmc1_dat2 */
BONE_P8_05 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_06: gpmc_ad3.mmc1_dat3 */
BONE_P8_06 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_23: gpmc_ad4.mmc1_dat4 */
BONE_P8_23 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_22: gpmc_ad5.mmc1_dat5 */
BONE_P8_22 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_03: gpmc_ad6.mmc1_dat6 */
BONE_P8_03 (PIN_INPUT_PULLUP | MUX_MODE1)
/* P8_04: gpmc_ad7.mmc1_dat7 */
BONE_P8_04 (PIN_INPUT_PULLUP | MUX_MODE1)
>;
};
};

&mmc2 {
pinctrl-0 = <&emmc_pins>;
};
45 changes: 45 additions & 0 deletions arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* 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-i2c2.dtsi"

/* cape universal */

/*
*&ocp {
* P9_19_pinmux {
* mode = "i2c";
* };
* P9_20_pinmux {
* mode = "i2c";
* };
*};
*
*&dcan0 {
* pinctrl-0 = <>;
*};
*
*/

/* standard */

&am33xx_pinmux {
i2c2_pins: pinmux_i2c2_pins {
pinctrl-single,pins = <
/* P9_20: uart1_ctsn.i2c2_sda */
BONE_P9_20 (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3)
/* P9_19: uart1_rtsn.i2c2_scl */
BONE_P9_19 (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
};

&i2c2 {
pinctrl-0 = <&i2c2_pins>;
};
Loading

0 comments on commit 39b6035

Please sign in to comment.