summaryrefslogtreecommitdiff
path: root/target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch
blob: eadaeaebb5bce52df07001ab671199b7b1fb1fde (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
From 93ad20e6fe455b39b7bc0c970435a414ca49f09c Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 15 Jun 2015 10:10:59 +0100
Subject: [PATCH 096/148] bcm2708-i2s: Don't use static pin configuration with
 DT

---
 sound/soc/bcm/bcm2708-i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/sound/soc/bcm/bcm2708-i2s.c
+++ b/sound/soc/bcm/bcm2708-i2s.c
@@ -409,8 +409,8 @@ static int bcm2708_i2s_hw_params(struct
 	if (csreg & (BCM2708_I2S_TXON | BCM2708_I2S_RXON))
 		return 0;
 
-
-	bcm2708_i2s_setup_gpio();
+	if (!dev->dev->of_node)
+		bcm2708_i2s_setup_gpio();
 
 	/*
 	 * Adjust the data length according to the format.