Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c36f7f9
backport: gpio_backlight.c from: v3.15.10
RobertCNelson Aug 20, 2014
3015b2f
firmware: am335x-pm-firmware.elf
RobertCNelson Sep 22, 2014
c252c4c
BeagleBone pinmux helper
pantoniou Dec 28, 2012
c37c2f6
pinmux-helper: Add runtime configuration capability
pantoniou Mar 6, 2013
be9e6ec
pinmux-helper: Switch to using kmalloc
pantoniou Mar 7, 2013
f74377e
gpio: Introduce GPIO OF helper
pantoniou Jun 4, 2013
0625665
Add dir-changeable property to gpio-of-helper
cdsteinkuehler Jan 26, 2014
88b6a77
am33xx.dtsi: add ocp label
Sep 4, 2014
adf6422
beaglebone: added expansion header to dtb
Sep 4, 2014
5e0cab5
bone-pinmux-helper: Add support for "mode" device-tree parameter The …
cdsteinkuehler Sep 16, 2014
1c93681
pinmux-helper: add P8_37_pinmux & P8_38_pinmux
RobertCNelson Sep 19, 2014
de8bf45
am335x-bone-common: split out am33xx_pinmux
RobertCNelson Sep 16, 2014
33b0e2f
am335x-boneblack: split out am33xx_pinmux
RobertCNelson Sep 16, 2014
bef0261
am335x-boneblack: split out emmc
RobertCNelson Sep 16, 2014
40ab71b
am335x-boneblack: split out nxp hdmi audio
RobertCNelson Sep 16, 2014
a020337
am335x-bone: nxp hdmi no audio
RobertCNelson Sep 16, 2014
0f65216
pinmux: bone/black disable pins for hdmi/audio/clkout2/mmc1
RobertCNelson Sep 19, 2014
e266f45
pinmux: i2c
RobertCNelson Sep 19, 2014
ef756ee
pinmux: uart
RobertCNelson Sep 19, 2014
ba1db73
pinmux: spi
RobertCNelson Sep 19, 2014
9403b6a
node: 4-wire touchscreen
RobertCNelson Sep 19, 2014
782a2cd
node: led-gpio
RobertCNelson Sep 19, 2014
bce1546
node: backlight-gpio
RobertCNelson Sep 19, 2014
9a55d02
node: keymap
RobertCNelson Sep 19, 2014
f7cd57f
node: panel
RobertCNelson Sep 19, 2014
2773bcf
cape: audio-revb
john3909 Jul 16, 2014
aa78268
cape: audio reva
RobertCNelson Sep 19, 2014
492aaa7
cape: crypto 00a0
RobertCNelson Sep 19, 2014
0744780
cape: rtc 01 00a1
RobertCNelson Sep 19, 2014
a3d5a48
cape: lcd
RobertCNelson Sep 19, 2014
57d06dd
cape: basic proto
RobertCNelson Sep 19, 2014
06f342f
hack: bbb enable 1ghz operation
RobertCNelson Sep 4, 2014
e1de21d
dts: am335x-bone-common: fixup leds to match 3.8
RobertCNelson Aug 27, 2014
f9c6b76
ARM: dts: am335x-bone*: Fix model name and update compatibility infor…
nmenon Sep 3, 2014
8f57216
ARM: dts: am335x-boneblack: dcdc1 set to 1.35v for ddr3
RobertCNelson Sep 11, 2014
171ac25
add base files
RobertCNelson Sep 18, 2014
ebd08ab
cape: Argus UPS cape support
jdal Jun 16, 2014
5adf71e
auto generated: cape: uarts
RobertCNelson Sep 19, 2014
cde18ad
auto generated: cape: audio
RobertCNelson Sep 19, 2014
5970735
auto generated: cape: lcd
RobertCNelson Sep 19, 2014
db37146
auto generated: cape: argus
RobertCNelson Sep 19, 2014
4736c55
auto generated: cape: rtc-01-00a1
RobertCNelson Sep 19, 2014
2e701c7
auto generated: cape: crypto-00a0
RobertCNelson Sep 19, 2014
8b3ebf6
auto generated: cape: 4dcape
RobertCNelson Sep 19, 2014
5c91294
auto generated: cape: bbb-exp-c
RobertCNelson Sep 19, 2014
a47bcc1
auto generated: cape: bb-view-43
RobertCNelson Sep 19, 2014
364660d
auto generated: capes: add dtbs to makefile
RobertCNelson Sep 19, 2014
77d04f7
DT doc: net: cpsw mac-address is optional
Aug 25, 2014
f0d9cb0
net: cpsw: Add missing return value
Aug 25, 2014
ee1cd44
net: cpsw: header, Add missing include
Aug 25, 2014
3e473fd
net: cpsw: Replace pr_err by dev_err
Aug 25, 2014
8abd2b4
net: cpsw: Add am33xx MACID readout
Sep 7, 2014
a4eac06
am33xx: define syscon control module device node
Sep 7, 2014
cbdae5e
arm: dts: am33xx, Add syscon phandle to cpsw node
Sep 7, 2014
dcce31e
cpsw: search for phy
Jul 1, 2014
0136bf6
sgx: hack just a copy of sgx-omap.h
RobertCNelson Sep 18, 2014
21e052a
arm: Export cache flush management symbols when !MULTI_CACHE
pantoniou Jan 3, 2013
17759ad
packaging: sync with mainline
RobertCNelson Jul 9, 2014
7134cb2
deb-pkg: install dtbs in linux-image package
RobertCNelson Jul 2, 2014
5bea78c
deb-pkg: no dtbs_install
RobertCNelson Jul 2, 2014
1fa4a2f
3.14.19-ti-r26 patchset
RobertCNelson Sep 24, 2014
169fcd3
3.14.19-ti-r26 bb.org_defconfig
RobertCNelson Sep 24, 2014
e380b6d
BeagleBone DTS : Enable run-time pinmux for HDMI
cdsteinkuehler Sep 28, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/net/cpsw.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ Optional properties:
- ti,hwmods : Must be "cpgmac0"
- no_bd_ram : Must be 0 or 1
- dual_emac : Specifies Switch to act as Dual EMAC
- syscon : Phandle to the system control device node, which is
the control module device of the am33x

Slave Properties:
Required properties:
- phy_id : Specifies slave phy id
- phy-mode : The interface between the SoC and the PHY (a string
that of_get_phy_mode() can understand)
- mac-address : Specifies slave MAC address

Optional properties:
- dual_emac_res_vlan : Specifies VID to be used to segregate the ports
- mac-address : See ethernet.txt file in the same directory

Note: "ti,hwmods" field is used to fetch the base address and irq
resources from TI, omap hwmod data base during device registration.
Expand All @@ -58,6 +60,7 @@ Examples:
active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
syscon = <&cm>;
cpsw_emac0: slave@0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "rgmii-txid";
Expand Down Expand Up @@ -86,6 +89,7 @@ Examples:
active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
syscon = <&cm>;
cpsw_emac0: slave@0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "rgmii-txid";
Expand Down
38 changes: 38 additions & 0 deletions arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,44 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
am335x-evmsk.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
am335x-boneblack-ttyO5.dtb \
am335x-boneblack-ttyO4.dtb \
am335x-boneblack-ttyO2.dtb \
am335x-boneblack-ttyO1.dtb \
am335x-boneblack-rtc-01-00a1.dtb \
am335x-boneblack-lcd7-01-00a3.dtb \
am335x-boneblack-lcd7-01-00a2.dtb \
am335x-boneblack-lcd4-01-00a1.dtb \
am335x-boneblack-lcd3-01-00a2.dtb \
am335x-boneblack-bbb-exp-c.dtb \
am335x-boneblack-4dcape-70t.dtb \
am335x-boneblack-4dcape-70.dtb \
am335x-boneblack-4dcape-43t.dtb \
am335x-boneblack-4dcape-43.dtb \
am335x-boneblack-crypto-00a0.dtb \
am335x-boneblack-cape-bone-argus.dtb \
am335x-boneblack-bb-view-43.dtb \
am335x-boneblack-audio-revb.dtb \
am335x-boneblack-audio-reva.dtb \
am335x-bone-ttyO5.dtb \
am335x-bone-ttyO4.dtb \
am335x-bone-ttyO2.dtb \
am335x-bone-ttyO1.dtb \
am335x-bone-rtc-01-00a1.dtb \
am335x-bone-lcd7-01-00a3.dtb \
am335x-bone-lcd7-01-00a2.dtb \
am335x-bone-lcd4-01-00a1.dtb \
am335x-bone-lcd3-01-00a2.dtb \
am335x-bone-bbb-exp-c.dtb \
am335x-bone-4dcape-70t.dtb \
am335x-bone-4dcape-70.dtb \
am335x-bone-4dcape-43t.dtb \
am335x-bone-4dcape-43.dtb \
am335x-bone-crypto-00a0.dtb \
am335x-bone-cape-bone-argus.dtb \
am335x-bone-bb-view-43.dtb \
am335x-bone-audio-revb.dtb \
am335x-bone-audio-reva.dtb \
am335x-nano.dtb \
am335x-base0033.dtb \
am3517-craneboard.dtb \
Expand Down
53 changes: 53 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-43.dts
Original file line number Diff line number Diff line change
@@ -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-4dcape-43.dtsi"
31 changes: 31 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-43.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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.
*/

/* Led */
/* #include "am335x-bone-led-gpio1-18.dtsi" */
#include "am335x-bone-led-gpio1-28.dtsi"
/* #include "am335x-bone-led-gpio3-19.dtsi" */
/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */

/* Keypad */
/* #include "am335x-bone-keymap0.dtsi" */
#include "am335x-bone-keymap1.dtsi"
/* #include "am335x-bone-keymap2.dtsi" */
/* #include "am335x-bone-keymap3.dtsi" */

/* Backlight */
#include "am335x-bone-bl-gpio1-18.dtsi"

/* Touchscreen */
/* #include "am335x-bone-ti-tscadc-4-wire.dtsi" */

/* Panel */
/* #include "am335x-bone-panel-320x240.dtsi" */
#include "am335x-bone-panel-480x272.dtsi"
/* #include "am335x-bone-panel-800x480.dtsi" */
/* #include "am335x-bone-panel-1240x600-24bit.dtsi" */
53 changes: 53 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-43t.dts
Original file line number Diff line number Diff line change
@@ -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-4dcape-43t.dtsi"
31 changes: 31 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-43t.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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.
*/

/* Led */
/* #include "am335x-bone-led-gpio1-18.dtsi" */
#include "am335x-bone-led-gpio1-28.dtsi"
/* #include "am335x-bone-led-gpio3-19.dtsi" */
/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */

/* Keypad */
/* #include "am335x-bone-keymap0.dtsi" */
#include "am335x-bone-keymap1.dtsi"
/* #include "am335x-bone-keymap2.dtsi" */
/* #include "am335x-bone-keymap3.dtsi" */

/* Backlight */
#include "am335x-bone-bl-gpio1-18.dtsi"

/* Touchscreen */
#include "am335x-bone-ti-tscadc-4-wire.dtsi"

/* Panel */
/* #include "am335x-bone-panel-320x240.dtsi" */
#include "am335x-bone-panel-480x272.dtsi"
/* #include "am335x-bone-panel-800x480.dtsi" */
/* #include "am335x-bone-panel-1240x600-24bit.dtsi" */
53 changes: 53 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-70.dts
Original file line number Diff line number Diff line change
@@ -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-4dcape-70.dtsi"
31 changes: 31 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-70.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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.
*/

/* Led */
/* #include "am335x-bone-led-gpio1-18.dtsi" */
#include "am335x-bone-led-gpio1-28.dtsi"
/* #include "am335x-bone-led-gpio3-19.dtsi" */
/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */

/* Keypad */
#include "am335x-bone-keymap0.dtsi"
/* #include "am335x-bone-keymap1.dtsi" */
/* #include "am335x-bone-keymap2.dtsi" */
/* #include "am335x-bone-keymap3.dtsi" */

/* Backlight */
#include "am335x-bone-bl-gpio1-18.dtsi"

/* Touchscreen */
/* #include "am335x-bone-ti-tscadc-4-wire.dtsi" */

/* Panel */
/* #include "am335x-bone-panel-320x240.dtsi" */
/* #include "am335x-bone-panel-480x272.dtsi" */
#include "am335x-bone-panel-800x480.dtsi"
/* #include "am335x-bone-panel-1240x600-24bit.dtsi" */
53 changes: 53 additions & 0 deletions arch/arm/boot/dts/am335x-bone-4dcape-70t.dts
Original file line number Diff line number Diff line change
@@ -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-4dcape-70t.dtsi"
Loading