diff options
| author | Haoran Wang <Haoran.Wang@freescale.com> | 2016-02-19 12:28:30 +0800 |
|---|---|---|
| committer | Haoran Wang <Haoran.Wang@freescale.com> | 2016-02-22 14:39:57 +0800 |
| commit | 611411bd511031c1514e14352279f911fc707191 (patch) | |
| tree | b2840dc75c6b6dea2037e9e28aa53502263fb5c3 | |
| parent | 3ca9a2e6db80e525d8c6142fa63154726180eb13 (diff) | |
| download | freescale-master.tar.gz | |
Assign the BT_REG_ON pin to rfkill.
Disable lcdif in DTS due the BT_REG_ON reuse in it.
Change-Id: Ib4b527793812216a889836aea361cc0a3362291a
Signed-off-by: Haoran Wang <Haoran.Wang@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-picosom-hobbit.dts | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts index b3e932b1357..585cd30e914 100644 --- a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts +++ b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts @@ -61,15 +61,6 @@ enable-active-high; }; - bt_on: bt_on { - compatible = "regulator-fixed"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "bt_on"; - gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>; - regulator-boot-on; - }; - reg_2p5v: 2p5v { compatible = "regulator-fixed"; regulator-name = "2P5V"; @@ -147,6 +138,11 @@ linux,default-trigger = "timer"; }; }; + bt_rfkill { + compatible = "fsl,mxc_bt_rfkill"; + bt-power-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; + status ="okay"; + }; }; &cpu0 { @@ -428,8 +424,6 @@ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79 MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79 MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79 - /* used for lcd reset */ - MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x79 >; }; @@ -603,36 +597,7 @@ }; &lcdif { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdif_dat - &pinctrl_lcdif_ctrl>; - display = <&display0>; - status = "okay"; - - display0: display { - bits-per-pixel = <32>; - bus-width = <24>; - - display-timings { - native-mode = <&timing0>; - timing0: timing0 { - clock-frequency = <33200000>; - hactive = <800>; - vactive = <480>; - hfront-porch = <210>; - hback-porch = <46>; - hsync-len = <1>; - vback-porch = <22>; - vfront-porch = <23>; - vsync-len = <1>; - - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - }; - }; + status = "disabled"; }; &gpmi { |