linux-ti33x-psp 3.2: enable w1 for beaglebone, fix bootlogo

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2026-05-08 04:20:11 +00:00 · 2012-02-07 11:11:09 +01:00
parent 584043688c
commit 4a759de7bb
23 changed files with 153 additions and 72 deletions
@@ -1,4 +1,4 @@
-From d26b2d246668587049b1362a42c9b829f2ca288a Mon Sep 17 00:00:00 2001
+From b3f548e71f6b8b568e1b683b1585406c942d1d3d Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 7 Oct 2011 15:29:28 +0200
 Subject: [PATCH 01/21] f_rndis: HACK around undefined variables
@@ -27,5 +27,5 @@ index 6614490..d2f1b6f 100644
 	 * the network link ... which is unavailable to this code
 	 * until we're activated via set_alt().
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 0188ea8b0633815f9ed9a728a6a1a53d64c1093c Mon Sep 17 00:00:00 2001
+From 72c2e6a521c288a0620f5ec7420f27899d1f519d Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 3 Nov 2011 17:35:50 +0100
 Subject: [PATCH 02/21] da8xx-fb: add DVI support for beaglebone
@@ -34,5 +34,5 @@ index 85eda33..dea8936 100644
 
 /* Enable the Raster Engine of the LCD Controller */
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 11622554369db32c7c14572efb525ef5e418338d Mon Sep 17 00:00:00 2001
+From 3a58d6b8a90793dd793265b09219871b53aaf63a Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 10:21:32 +0100
 Subject: [PATCH 03/21] arm:omap:mux33xx: Add i2c2 pin mux
@@ -26,5 +26,5 @@ index 81a657e..36bb10a 100644
 	_AM33XX_MUXENTRY(UART1_RXD, 0,
 		"uart1_rxd", "mmc1_sdwp", NULL, NULL,
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 4f823ac4857d0d48b53b7a8799a745f746bfda1a Mon Sep 17 00:00:00 2001
+From 4ed424e6817669025702b1ea5bfa6b798a811b6d Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 16 Nov 2011 07:23:37 -0600
 Subject: [PATCH 04/21] omap:hwmod:33xx: Add support for third i2c bus
@@ -88,5 +88,5 @@ index 9b15ffe..f9b91fa 100644
 	&am33xx_icss_hwmod,
 	/* ieee5000 class */
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From c240df1d9fd60f318e719d0e77bc5955fecbb64e Mon Sep 17 00:00:00 2001
+From 788e842835e3ecb2d218ab11381e9c9dea4fa91c Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 30 Jan 2012 21:30:09 +0100
-Subject: [PATCH 05/21] beaglebone: rebase everything onto 3.2  - WARNING
- MEGAPATCH
+Subject: [PATCH 05/21] beaglebone: rebase everything onto 3.2 - WARNING MEGAPATCH

 ---
 arch/arm/mach-omap2/board-am335xevm.c |  429 ++++++++++++++++++++++++++++++++-
@@ -544,5 +543,5 @@ index 4c09cc9..e0c20c5 100644
 	/* Beagle Bone has Micro-SD slot which doesn't have Write Protect pin */
 	am335x_mmc[0].gpio_wp = -EINVAL;
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 873c06849ccdb685b5cab1e6e809eda260427d42 Mon Sep 17 00:00:00 2001
+From 2e5a948c8a5bcd6ac904ec5e6feb44eaa8085dce Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 10:04:03 +0100
 Subject: [PATCH 06/21] more beaglebone merges
@@ -121,5 +121,5 @@ index e0c20c5..177ab9e 100644
 	} else if (!strncmp("1.0", config.version, 3)) {
 		gp_evm_revision = GP_EVM_REV_IS_1_0;
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 6f50bf55f6182ecd09aac93d3b613a99159b606c Mon Sep 17 00:00:00 2001
+From 418ca67a6e1bc3009b63587b0d65d064fa9c6e1a Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 10:09:06 +0100
 Subject: [PATCH 07/21] beaglebone: disable tsadc
@@ -27,5 +27,5 @@ index 177ab9e..87ccf14 100644
 
 static struct platform_device tsc_device = {
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From 7cb067cd1bd237a7a9978747fc4f96fa90b5d146 Mon Sep 17 00:00:00 2001
+From 0a97d120ca4b129c763c420b4c85e71f68286704 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Wed, 30 Nov 2011 15:00:40 +0100
-Subject: [PATCH 08/21] tscadc: Add general purpose mode, untested with
- touchscreen functionality
+Subject: [PATCH 08/21] tscadc: Add general purpose mode, untested with touchscreen functionality

 Signed-off-by: Joel A Fernandes <joelagnel@ti.com>

@@ -407,5 +406,5 @@ index 2c547bb..850cd4b 100644
 +	int mode;
 };
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From f7330897eabdf0275cd51213fe1dc778e165d07c Mon Sep 17 00:00:00 2001
+From 7858340efc39a1b098e3d291ab8bb1ba553e08da Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Wed, 30 Nov 2011 15:02:17 +0100
 Subject: [PATCH 09/21] tscadc: Add board file mfd support, fix warning
@@ -40,5 +40,5 @@ index 699503d..f813564 100644
 	int				clk_value;
 	int				clock_rate, irqenable, ctrl;
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From f02d01f3f7bafede91847480a72b50d8a8d45a6a Mon Sep 17 00:00:00 2001
+From a43c57a49ba30d4bb6087a6bb4f6200c785905c5 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Wed, 30 Nov 2011 15:03:59 +0100
 Subject: [PATCH 10/21] AM335X: init tsc bone style for new boards
@@ -22,5 +22,5 @@ index 17705b3..ac4f78f 100644
 };
 
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 0524d48ca4e3178d89d940b38f1fa26cf448ebb8 Mon Sep 17 00:00:00 2001
+From 6fdcca153f70cad5438d682987d6eae16aeb2ea7 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Mon, 28 Nov 2011 18:18:04 -0600
 Subject: [PATCH 11/21] tscadc: make stepconfig channel-configurable
@@ -42,5 +42,5 @@ index f813564..0b91bdc 100644
 		irqenable = TSCADC_IRQENB_FIFO0THRES;
 	}
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5b0c06b556db15cac8d14eb7e74307521481e185 Mon Sep 17 00:00:00 2001
+From aa9aa700a94ecef9726c46346a9503d473894f75 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Mon, 28 Nov 2011 20:55:25 -0600
 Subject: [PATCH 12/21] tscadc: Trigger through sysfs
@@ -143,5 +143,5 @@ index 850cd4b..fc239c6 100644
 #define TI_TSCADC_TSCMODE 0
 #define TI_TSCADC_GENMODE 1
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From edb40d9ed626b634bfe71c39a02602e2ae871175 Mon Sep 17 00:00:00 2001
+From a0828509fefd049bc014e850366f6e39196e4e2f Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Mon, 28 Nov 2011 20:56:48 -0600
 Subject: [PATCH 13/21] meta-ti: Remove debug messages for meta-ti
@@ -30,5 +30,5 @@ index a74d9ba..1f9cbf5 100644
 		for (i = 0; i < fifo1count; i++) {
 			read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0);
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From f36d060e6965cdbf797308fb2d80a77c4bbaeac3 Mon Sep 17 00:00:00 2001
+From 55f39df40bf9efe2576f39e8c0bd0e1390145b46 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <joelagnel@ti.com>
 Date: Tue, 29 Nov 2011 09:44:22 -0600
 Subject: [PATCH 14/21] tscadc: switch to polling instead of interrupts
@@ -50,5 +50,5 @@ index 1f9cbf5..8e2a994 100644
 	tscadc_writel(ts_dev, TSCADC_REG_IRQENABLE, irqenable);
 
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,4 +1,4 @@
-From 9289020d4d0f1dc6a973feca4b6465ee1dbcb1b7 Mon Sep 17 00:00:00 2001
+From baaf9182087ab02092c028f9a7d0c8a89c9cd4e2 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 14:50:55 +0100
 Subject: [PATCH 15/21] beaglebone: fix ADC init
@@ -43,5 +43,5 @@ index ac4f78f..177ab9e 100644
 };
 
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,7 +1,7 @@
-From 2d9d76c49c1a208d9cb4894bf26c9fb96f440e3f Mon Sep 17 00:00:00 2001
+From 8fc518e3bc8d60b01f1d94942bd733cebb9a0a0e Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 16:49:52 +0100
-Subject: [PATCH 17/21] AM335x: MUX: add ehrpwm1A
+Subject: [PATCH 16/21] AM335x: MUX: add ehrpwm1A

 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
@@ -22,5 +22,5 @@ index e4cd407..0a06241 100644
 		"gpmc_a3", "mii2_txd2", "rgmii2_td2", "mmc2_dat2",
 		NULL, NULL, NULL, "gpio1_19"),
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From 5fb56662c5ed2e0499b9bb43a542f896a8274cab Mon Sep 17 00:00:00 2001
+From cf8d37c600dbe0d13e55874db46d385db435d6dc Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 31 Jan 2012 17:02:10 +0100
-Subject: [PATCH 18/21] beaglebone: enable PWM for lcd backlight <- backlight
- is inverted
+Subject: [PATCH 17/21] beaglebone: enable PWM for lcd backlight <- backlight is inverted

 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
@@ -173,5 +172,5 @@ index e086839..5161eb4 100644
 
 #endif
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From 91e061ce4d020a11259adc79499cf7e6714eedb0 Mon Sep 17 00:00:00 2001
+From 05698cd9793d58226c5d5a986537aaf906433851 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 18 Jul 2011 23:13:41 -0500
-Subject: [PATCH 19/21] omap_hsmmc: Set dto to max value of 14 to avoid SD
- Card timeouts
+Subject: [PATCH 18/21] omap_hsmmc: Set dto to max value of 14 to avoid SD Card timeouts

 This fixes MMC errors due to timeouts on certain SD Cards following suggestions
 to set dto to 14 by Jason Kridner and Steven Kipisz
@@ -30,5 +29,5 @@ index 703013c..554237f 100644
 	reg |= dto << DTO_SHIFT;
 	OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From 028a2779bf8e08a333b01a1c4fc71d6fae99ed73 Mon Sep 17 00:00:00 2001
+From 29f8dc540ea4b5ad963be07555d6ce9906b54dd4 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 1 Feb 2012 14:10:38 +0100
-Subject: [PATCH 20/21] beaglebone: set default brightness to 50% for pwm
- backlights
+Subject: [PATCH 19/21] beaglebone: set default brightness to 50% for pwm backlights

 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
@@ -23,5 +22,5 @@ index 6a77194..c31c0aa 100644
 
 #define PWM_DEVICE_ID   "ecap.0"
 -- 
-1.7.7.4
+1.7.2.5

@@ -1,8 +1,7 @@
-From effae95a02a22474626aa8abdfb8573fd3eb74b6 Mon Sep 17 00:00:00 2001
+From 4f8bf35db23976bbc4705ba57ae9e0df4b8442ab Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Mon, 21 Nov 2011 12:55:23 -0500
-Subject: [PATCH 21/21] st7735fb: WIP framebuffer driver supporting Adafruit
- 1.8" SPI LCD
+Subject: [PATCH 20/21] st7735fb: WIP framebuffer driver supporting Adafruit 1.8" SPI LCD

 Signed-off-by: Matt Porter <mporter@ti.com>
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
@@ -664,5 +663,5 @@ index 0000000..250f036
 +
 +
 -- 
-1.7.7.4
+1.7.2.5

@@ -0,0 +1,83 @@
+From 4428744c852ed5f9d5a7dfa9c5d0a783e6134582 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 7 Feb 2012 11:01:13 +0100
+Subject: [PATCH 21/21] beaglebone: use P8_6 (gpio1_3) as w1 bus
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-am335xevm.c |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
+index c31c0aa..538466d 100644
+--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
+@@ -37,6 +37,7 @@
+ #include <linux/mfd/tps65217.h>
+ #include <linux/pwm_backlight.h>
+ #include <linux/pwm/pwm.h>
+#include <linux/w1-gpio.h>
+ 
+ /* LCD controller is similar to DA850 */
+ #include <video/da8xx-fb.h>
+@@ -603,6 +604,11 @@ static struct pinmux_config bbtoys7_pin_mux[] = {
+ 	{NULL, 0},
+ };
+ 
+static struct pinmux_config w1_gpio_pin_mux[] = {
+	{"gpmc_ad3.gpio1_3",	OMAP_MUX_MODE7 | AM33XX_PIN_INPUT_PULLUP},
+	{NULL, 0},
+};
+
+ static struct pinmux_config tsc_pin_mux[] = {
+ 	{"ain0.ain0",           OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
+ 	{"ain1.ain1",           OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
+@@ -1026,6 +1032,19 @@ static struct pinmux_config profibus_pin_mux[] = {
+ 	{NULL, 0},
+ };
+ 
+#define BEAGLEBONE_W1_GPIO GPIO_TO_PIN(1, 3)
+
+static struct w1_gpio_platform_data bone_w1_gpio_pdata = {
+	.pin		= BEAGLEBONE_W1_GPIO,
+	.is_open_drain	= 0,
+};
+
+static struct platform_device bone_w1_device = {
+	.name			= "w1-gpio",
+	.id			= -1,
+	.dev.platform_data	= &bone_w1_gpio_pdata,
+};
+
+ /* LEDS - gpio1_21 -> gpio1_24 */
+ 
+ #define BEAGLEBONE_USR1_LED  GPIO_TO_PIN(1, 21)
+@@ -1349,6 +1368,17 @@ static void dvileds_init(int evm_id, int profile )
+ 		pr_err("failed to register BeagleBone DVI cape LEDS\n");
+ }
+ 
+static void bonew1_gpio_init(int evm_id, int profile )
+{
+	int err;
+	setup_pin_mux(w1_gpio_pin_mux);
+	err = platform_device_register(&bone_w1_device);
+	if (err)
+		pr_err("failed to register w1-gpio\n");
+	else
+		pr_info("w1-gpio connected to P8_6\n");
+}
+
+ static void rgmii1_init(int evm_id, int profile)
+ {
+ 	setup_pin_mux(rgmii1_pin_mux);
+@@ -2228,6 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
+ 	{i2c2_init,	DEV_ON_BASEBOARD, PROFILE_NONE},
+ 	{mmc0_init,	DEV_ON_BASEBOARD, PROFILE_NONE},
+ 	{boneleds_init,	DEV_ON_BASEBOARD, PROFILE_ALL},
+	{bonew1_gpio_init, DEV_ON_BASEBOARD, PROFILE_ALL},
+ 	{NULL, 0, 0},
+ };
+ 
+-- 
+1.7.2.5
+
@@ -1625,28 +1625,30 @@ CONFIG_W1_CON=y
 #
 # 1-wire Bus Masters
 #
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_GPIO is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=y
 # CONFIG_HDQ_MASTER_OMAP is not set

 #
 # 1-wire Slaves
 #
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_DS2408 is not set
-# CONFIG_W1_SLAVE_DS2423 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_DS2780 is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
+CONFIG_W1_SLAVE_THERM=y
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
@@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = ""

 BRANCH = "v3.2-staging"
 SRCREV = "83d907e1b05dabc44f3bb64532d7b58d059a14c0"
-MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}"

 COMPATIBLE_MACHINE = "(ti33x)"

@@ -40,12 +40,14 @@ PATCHES_OVER_PSP = " \
 	file://0013-meta-ti-Remove-debug-messages-for-meta-ti.patch \
 	file://0014-tscadc-switch-to-polling-instead-of-interrupts.patch \
 	file://0015-beaglebone-fix-ADC-init.patch \
-	file://0017-AM335x-MUX-add-ehrpwm1A.patch \
-	file://0018-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch \
-	file://0019-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch \
-	file://0020-beaglebone-set-default-brightness-to-50-for-pwm-back.patch \
-	file://0021-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch \
+	file://0016-AM335x-MUX-add-ehrpwm1A.patch \
+	file://0017-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch \
+	file://0018-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch \
+	file://0019-beaglebone-set-default-brightness-to-50-for-pwm-back.patch \
+	file://0020-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch \
+	file://0021-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch \
 "

 SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "", "${PATCHES_OVER_PSP}", d)}"
+SRC_URI_append_beaglebone = " file://logo_linux_clut224.ppm"