diff options
| author | fang hui <hui.fang@freescale.com> | 2016-03-11 12:30:43 +0800 |
|---|---|---|
| committer | fang hui <hui.fang@freescale.com> | 2016-03-11 15:18:02 +0800 |
| commit | a61c68371b90b62543b168aa8bdb7b4dc476846a (patch) | |
| tree | 78cdb7868281f27071ae4d8164a59889ed46d10d | |
| parent | 9fd556167a517eace6c322fc5f3159fd3fc37c05 (diff) | |
| download | picoimx-3.14-a61c68371b90b62543b168aa8bdb7b4dc476846a.tar.gz | |
support sgtl5000 for picoimx
move sgtl5000 from i2c3 to i2c2.
change pin function for MX6UL_PAD_CSI_DATA06__SAI1_RX_DATA.
Change-Id: Iafac1212ce126cd0eaa7861b59ac83071643ef57
Signed-off-by: fang hui <hui.fang@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-picosom-hobbit.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-pinfunc.h | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts index d84e80fc1fb..76179a43ec2 100644 --- a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts +++ b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts @@ -310,14 +310,6 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; -}; - -&i2c3 { - clock_frequency = <100000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c3>; - status = "okay"; - codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; reg = <0x0a>; @@ -327,6 +319,13 @@ }; }; +&i2c3 { + clock_frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + &iomuxc { pinctrl-names = "default"; pico-imx6ul { diff --git a/arch/arm/boot/dts/imx6ul-pinfunc.h b/arch/arm/boot/dts/imx6ul-pinfunc.h index 1bb774b94eb..26c6615c408 100644 --- a/arch/arm/boot/dts/imx6ul-pinfunc.h +++ b/arch/arm/boot/dts/imx6ul-pinfunc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. * * 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 @@ -924,7 +924,7 @@ #define MX6UL_PAD_CSI_DATA06__ECSPI1_MOSI 0x01FC 0x0488 0x053C 3 1 #define MX6UL_PAD_CSI_DATA06__EIM_AD06 0x01FC 0x0488 0x0000 4 0 #define MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x01FC 0x0488 0x0000 5 0 -#define MX6UL_PAD_CSI_DATA06__SAI1_RX_DATA 0x01FC 0x0488 0x0000 6 0 +#define MX6UL_PAD_CSI_DATA06__SAI1_RX_DATA 0x01FC 0x0488 0x05E4 6 1 #define MX6UL_PAD_CSI_DATA06__USDHC1_RESET_B 0x01FC 0x0488 0x0000 8 0 #define MX6UL_PAD_CSI_DATA07__CSI_DATA09 0x0200 0x048C 0x04E8 0 1 #define MX6UL_PAD_CSI_DATA07__USDHC2_DATA7 0x0200 0x048C 0x0698 1 2 |