summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-07-17 11:59:25 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-07-17 11:59:25 +0100
commit10166a40662b118ae971d2bd7c257e2fb7d09462 (patch)
treed227eac715d88e83dfa9ad7fd45ef4acb15c820d
parentde50edbb210a0436977ad88d286bd0388043a63e (diff)
downloadkernel-10166a40662b118ae971d2bd7c257e2fb7d09462.tar.gz
kernel-10166a40662b118ae971d2bd7c257e2fb7d09462.tar.xz
kernel-10166a40662b118ae971d2bd7c257e2fb7d09462.zip
Add patch for BeagleBone Black DTB
-rw-r--r--arm-omap-bbb-dts.patch230
-rw-r--r--kernel.spec7
2 files changed, 237 insertions, 0 deletions
diff --git a/arm-omap-bbb-dts.patch b/arm-omap-bbb-dts.patch
new file mode 100644
index 000000000..0675729fe
--- /dev/null
+++ b/arm-omap-bbb-dts.patch
@@ -0,0 +1,230 @@
+From 227cadff47a2b00e91deb5b54f1fd551808d42ae Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Fri, 28 Jun 2013 14:18:08 +0300
+Subject: [PATCH 1/3] am335x: dts: Add beaglebone black DTS
+
+Added the beaglebone black's DTS file. Note that at some point in
+time we'll switch to using a common black.dtsi file.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+---
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/am335x-boneblack.dts | 196 +++++++++++++++++++++++++++++++++
+ 2 files changed, 198 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+--- a/arch/arm/boot/dts/Makefile.orig 2013-07-17 11:51:55.510389342 +0100
++++ b/arch/arm/boot/dts/Makefile 2013-07-17 11:55:09.492689175 +0100
+@@ -172,6 +172,7 @@
+ am335x-evm.dtb \
+ am335x-evmsk.dtb \
+ am335x-bone.dtb \
++ am335x-boneblack.dtb
+ am3517-evm.dtb \
+ am3517_mt_ventoux.dtb \
+ am43x-epos-evm.dtb
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+new file mode 100644
+index 0000000..d21e223
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -0,0 +1,196 @@
++/*
++ * 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"
++
++/ {
++ model = "TI AM335x BeagleBone";
++ compatible = "ti,am335x-bone", "ti,am33xx";
++
++ cpus {
++ cpu@0 {
++ cpu0-supply = <&dcdc2_reg>;
++
++ /*
++ * To consider voltage drop between PMIC and SoC,
++ * tolerance value is reduced to 2% from 4% and
++ * voltage value is increased as a precaution.
++ */
++ operating-points = <
++ /* kHz uV */
++ 1000000 1350000
++ 800000 1300000
++ 600000 1112000
++ 300000 969000
++ >;
++ };
++ };
++
++ memory {
++ device_type = "memory";
++ reg = <0x80000000 0x10000000>; /* 256 MB */
++ };
++
++ am33xx_pinmux: pinmux@44e10800 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&user_leds_s0>;
++
++ user_leds_s0: user_leds_s0 {
++ pinctrl-single,pins = <
++ 0x54 0x7 /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
++ 0x58 0x17 /* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */
++ 0x5c 0x7 /* gpmc_a7.gpio1_23, OUTPUT | MODE7 */
++ 0x60 0x17 /* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */
++ >;
++ };
++
++ emmc2_pins: pinmux_emmc2_pins {
++ pinctrl-single,pins = <
++ 0x80 0x32 /* gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */
++ 0x84 0x32 /* gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */
++ 0x00 0x31 /* gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */
++ 0x04 0x31 /* gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */
++ 0x08 0x31 /* gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */
++ 0x0c 0x31 /* gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */
++ 0x10 0x31 /* gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */
++ 0x14 0x31 /* gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */
++ 0x18 0x31 /* gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */
++ 0x1c 0x31 /* gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */
++ /* eMMC_RSTn */
++ 0x50 0x17 /* gpmc_a4.gpio1_20, OUTPUT | MODE7 | PULLUP */
++ >;
++ };
++ };
++
++ ocp {
++ uart1: serial@44e09000 {
++ status = "okay";
++ };
++
++ i2c0: i2c@44e0b000 {
++ status = "okay";
++ clock-frequency = <400000>;
++
++ tps: tps@24 {
++ reg = <0x24>;
++ };
++
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ led@2 {
++ label = "beaglebone:green:heartbeat";
++ gpios = <&gpio1 21 0>;
++ linux,default-trigger = "heartbeat";
++ default-state = "off";
++ };
++
++ led@3 {
++ label = "beaglebone:green:mmc0";
++ gpios = <&gpio1 22 0>;
++ linux,default-trigger = "mmc0";
++ default-state = "off";
++ };
++
++ led@4 {
++ label = "beaglebone:green:usr2";
++ gpios = <&gpio1 23 0>;
++ default-state = "off";
++ };
++
++ led@5 {
++ label = "beaglebone:green:usr3";
++ gpios = <&gpio1 24 0>;
++ default-state = "off";
++ };
++ };
++
++ vmmcsd_fixed: fixedregulator@0 {
++ compatible = "regulator-fixed";
++ regulator-name = "vmmcsd_fixed";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
++
++};
++
++/include/ "tps65217.dtsi"
++
++&tps {
++ regulators {
++ dcdc1_reg: regulator@0 {
++ regulator-always-on;
++ };
++
++ dcdc2_reg: regulator@1 {
++ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
++ regulator-name = "vdd_mpu";
++ regulator-min-microvolt = <925000>;
++ regulator-max-microvolt = <1325000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
++
++ dcdc3_reg: regulator@2 {
++ /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
++ regulator-name = "vdd_core";
++ regulator-min-microvolt = <925000>;
++ regulator-max-microvolt = <1150000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
++
++ ldo1_reg: regulator@3 {
++ regulator-always-on;
++ };
++
++ ldo2_reg: regulator@4 {
++ regulator-always-on;
++ };
++
++ ldo3_reg: regulator@5 {
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>; /* orig 3.3V*/
++ regulator-always-on;
++ };
++
++ ldo4_reg: regulator@6 {
++ regulator-always-on;
++ };
++ };
++};
++
++&cpsw_emac0 {
++ phy_id = <&davinci_mdio>, <0>;
++};
++
++&cpsw_emac1 {
++ phy_id = <&davinci_mdio>, <1>;
++};
++
++&mmc1 {
++ status = "okay";
++ vmmc-supply = <&vmmcsd_fixed>;
++ ti,vcc-aux-disable-is-sleep;
++};
++
++&mmc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&emmc2_pins>; /* wrong numbering */
++ vmmc-supply = <&ldo3_reg>;
++ bus-width = <8>;
++ ti,non-removable;
++ status = "okay";
++ ti,vcc-aux-disable-is-sleep;
++
++ reset-gpio = <&gpio1 20 0x00>;
++};
+--
+1.8.2.1
diff --git a/kernel.spec b/kernel.spec
index 2f18ce580..4be08896c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -731,6 +731,9 @@ Patch21005: arm-tegra-usb-no-reset-linux33.patch
# ARM wandboard
Patch21006: arm-wandboard-quad.patch
+# AM33xx
+Patch21007: arm-omap-bbb-dts.patch
+
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1325,6 +1328,7 @@ ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
ApplyPatch arm-omap-load-tfp410.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
ApplyPatch arm-wandboard-quad.patch
+ApplyPatch arm-omap-bbb-dts.patch
#
# bugfixes to drivers and filesystems
#
@@ -2261,6 +2265,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jul 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch for BeagleBone Black DTB
+
* Tue Jul 16 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc1.git0.1
- Linux v3.11-rc1
- Disable debugging options.