Add SMARC-T335X rev. 00B0 support

Eric Lee
1 parent 5f08c606d2
Showing 2 changed files with 7 additions and 10 deletions Side-by-side Diff
arch/arm/mach-omap2/board-am335xevm.c
drivers/mmc/core/mmc.c
@@ -765,6 +765,8 @@
 static struct pinmux_config gpio_pin_mux[] = {
         {"mii1_rxdv.gpio3_4",            OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT
                                                        | AM33XX_PULL_DISA},
+	{"gpmc_ben0_cle.gpio2_5",        OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT
+                                                       | AM33XX_PULL_DISA},
         {"gpmc_a9.gpio1_25",             OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT
                                                        | AM33XX_PULL_DISA},
         {"gpmc_a8.gpio1_24",             OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT
  
@@ -958,15 +960,13 @@
  
 /* pinmux for usb0 drvvbus */
 static struct pinmux_config usb0_pin_mux[] = {
-/*	{"usb0_drvvbus.usb0_drvvbus",    OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT},*/
-        {"usb0_drvvbus.gpio0_18",    OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT_PULLUP},
+	{"usb0_drvvbus.usb0_drvvbus",    OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT},
 	{NULL, 0},
 };
  
 /* pinmux for usb1 drvvbus */
 static struct pinmux_config usb1_pin_mux[] = {
-/*	{"usb1_drvvbus.usb1_drvvbus",    OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT},*/
-        {"usb1_drvvbus.gpio3_13",    OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT_PULLUP},
+	{"usb1_drvvbus.usb1_drvvbus",    OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT},
 	{NULL, 0},
 };
  
  
@@ -1242,9 +1242,8 @@
 	return;
 }
  
-#define SMARC_BKLT_EN  GPIO_TO_PIN(2, 5)
 #define SMARC_GPIO0  GPIO_TO_PIN(3, 4)
-#define SMARC_GPIO1  GPIO_TO_PIN(0, 7)
+#define SMARC_GPIO1  GPIO_TO_PIN(2, 5)
 #define SMARC_GPIO2  GPIO_TO_PIN(1, 25)
 #define SMARC_GPIO3  GPIO_TO_PIN(1, 24)
 #define SMARC_GPIO4  GPIO_TO_PIN(2, 4)
@@ -1263,9 +1262,6 @@
 static void gpio_init(int evm_id, int profile)
 {
         setup_pin_mux(gpio_pin_mux);
-/* backlight */
-        gpio_request(SMARC_BKLT_EN, "BKLT_EN");
-        gpio_direction_output(SMARC_BKLT_EN, 1);
 /* GPIO0-GPIO11 */
 /* GPIO0*/
         gpio_request(SMARC_GPIO0, "GPIO0");
@@ -2410,6 +2406,7 @@
         {tps65217_init, DEV_ON_BASEBOARD, PROFILE_NONE},
         {rmii1_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
         {rmii2_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
+	{enable_ecap0,  DEV_ON_BASEBOARD, PROFILE_NONE},
         {usb0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
         {usb1_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
         {lcdc_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
@@ -262,7 +262,7 @@
 	}
  
 	card->ext_csd.rev = ext_csd[EXT_CSD_REV];
-	if (card->ext_csd.rev > 6) {
+	if (card->ext_csd.rev > 7) {
 		pr_err("%s: unrecognised EXT_CSD revision %d\n",
 			mmc_hostname(card->host), card->ext_csd.rev);
 		err = -EINVAL;
...	...	@@ -765,6 +765,8 @@
765	765	static struct pinmux_config gpio_pin_mux[] = {
766	766	{"mii1_rxdv.gpio3_4", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT
767	767	\| AM33XX_PULL_DISA},
	768	+ {"gpmc_ben0_cle.gpio2_5", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT
	769	+ \| AM33XX_PULL_DISA},
768	770	{"gpmc_a9.gpio1_25", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT
769	771	\| AM33XX_PULL_DISA},
770	772	{"gpmc_a8.gpio1_24", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT
771	773
...	...	@@ -958,15 +960,13 @@
958	960
959	961	/* pinmux for usb0 drvvbus */
960	962	static struct pinmux_config usb0_pin_mux[] = {
961		-/* {"usb0_drvvbus.usb0_drvvbus", OMAP_MUX_MODE0 \| AM33XX_PIN_OUTPUT},*/
962		- {"usb0_drvvbus.gpio0_18", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT_PULLUP},
	963	+ {"usb0_drvvbus.usb0_drvvbus", OMAP_MUX_MODE0 \| AM33XX_PIN_OUTPUT},
963	964	{NULL, 0},
964	965	};
965	966
966	967	/* pinmux for usb1 drvvbus */
967	968	static struct pinmux_config usb1_pin_mux[] = {
968		-/* {"usb1_drvvbus.usb1_drvvbus", OMAP_MUX_MODE0 \| AM33XX_PIN_OUTPUT},*/
969		- {"usb1_drvvbus.gpio3_13", OMAP_MUX_MODE7 \| AM33XX_PIN_OUTPUT_PULLUP},
	969	+ {"usb1_drvvbus.usb1_drvvbus", OMAP_MUX_MODE0 \| AM33XX_PIN_OUTPUT},
970	970	{NULL, 0},
971	971	};
972	972
973	973
...	...	@@ -1242,9 +1242,8 @@
1242	1242	return;
1243	1243	}
1244	1244
1245		-#define SMARC_BKLT_EN GPIO_TO_PIN(2, 5)
1246	1245	#define SMARC_GPIO0 GPIO_TO_PIN(3, 4)
1247		-#define SMARC_GPIO1 GPIO_TO_PIN(0, 7)
	1246	+#define SMARC_GPIO1 GPIO_TO_PIN(2, 5)
1248	1247	#define SMARC_GPIO2 GPIO_TO_PIN(1, 25)
1249	1248	#define SMARC_GPIO3 GPIO_TO_PIN(1, 24)
1250	1249	#define SMARC_GPIO4 GPIO_TO_PIN(2, 4)
...	...	@@ -1263,9 +1262,6 @@
1263	1262	static void gpio_init(int evm_id, int profile)
1264	1263	{
1265	1264	setup_pin_mux(gpio_pin_mux);
1266		-/* backlight */
1267		- gpio_request(SMARC_BKLT_EN, "BKLT_EN");
1268		- gpio_direction_output(SMARC_BKLT_EN, 1);
1269	1265	/* GPIO0-GPIO11 */
1270	1266	/* GPIO0*/
1271	1267	gpio_request(SMARC_GPIO0, "GPIO0");
...	...	@@ -2410,6 +2406,7 @@
2410	2406	{tps65217_init, DEV_ON_BASEBOARD, PROFILE_NONE},
2411	2407	{rmii1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
2412	2408	{rmii2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
	2409	+ {enable_ecap0, DEV_ON_BASEBOARD, PROFILE_NONE},
2413	2410	{usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
2414	2411	{usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
2415	2412	{lcdc_init, DEV_ON_BASEBOARD, PROFILE_NONE},
...	...	@@ -262,7 +262,7 @@
262	262	}
263	263
264	264	card->ext_csd.rev = ext_csd[EXT_CSD_REV];
265		- if (card->ext_csd.rev > 6) {
	265	+ if (card->ext_csd.rev > 7) {
266	266	pr_err("%s: unrecognised EXT_CSD revision %d\n",
267	267	mmc_hostname(card->host), card->ext_csd.rev);
268	268	err = -EINVAL;