diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 04:58:59 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 04:58:59 -0500 |
| commit | c5517b1ea7b2f8e6acb8de194eef2e69c51c8994 (patch) | |
| tree | d740b5b584dcc9d7a178f908f8950153157c1bb6 /arch/arm/boot/dts/sama5d3xmb.dtsi | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
| parent | b8659752c37ec157ee254cff443b1c9d523aea22 (diff) | |
Merge branch 'at91-3.19-fixes' into at91-3.20-soc
Diffstat (limited to 'arch/arm/boot/dts/sama5d3xmb.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d3xmb.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index 49c10d33df30..77e03655aca3 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi | |||
| @@ -176,7 +176,7 @@ | |||
| 176 | "Headphone Jack", "HPOUTR", | 176 | "Headphone Jack", "HPOUTR", |
| 177 | "IN2L", "Line In Jack", | 177 | "IN2L", "Line In Jack", |
| 178 | "IN2R", "Line In Jack", | 178 | "IN2R", "Line In Jack", |
| 179 | "MICBIAS", "IN1L", | 179 | "Mic", "MICBIAS", |
| 180 | "IN1L", "Mic"; | 180 | "IN1L", "Mic"; |
| 181 | 181 | ||
| 182 | atmel,ssc-controller = <&ssc0>; | 182 | atmel,ssc-controller = <&ssc0>; |