Skip to content

Commit

Permalink
Merge tag 'imx-dt-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/git/shawnguo/linux into next/dt

Merge "i.MX device tree updates for 4.7, take 2: from Shawn Guo:

The i.MX device tree updates for 4.7, take 2:
 - Update display clock configuration for imx6q-b850v3 board
 - Use watchdog external reset for imx6q-ba16 board
 - Update operating points settings for i.MX6UL/SX/DL
 - New board support: imx6ul-pico-hobbit and imx6q-marsboard
 - Add SAI audio support for imx6ul-14x14-evk board
 - Enable USB OTG support for M53EVK board
 - A couple of fixes on DTC warnings

* tag 'imx-dt-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mx5: dts: Enable USB OTG on M53EVK
  ARM: dts: imx6ul-14x14-evk: Add audio support
  ARM: dts: imx6qdl: Remove unneeded unit-addresses
  ARM: dts: imx6: apalis: parallel lcd display support on ixora
  ARM: dts: imx6sx-sdb: Add 198MHz operational point
  ARM: dts: imx28-m28: Remove unneeded partition nodes
  ARM: dts: imx6ul-pico-hobbit: Add initial support
  ARM: dts: imx6: Do not hardcode the CLKO clock
  ARM: dts: imx6: Add dts for Embest MarS Board
  ARM: dts: imx6: fix dtc warnings for ipu endpoints
  ARM: dts: imx6dl: Fix the VDD_ARM_CAP voltage for 396MHz operation
  ARM: dts: imx6sx: Add 198MHz operating point
  ARM: dts: imx6ul: Fix operating points
  ARM: dts: imx6q-ba16: use wdog external reset
  ARM: dts: imx: b450/b650v3: Move ldb_di clk assignment
  ARM: dts: imx6q-b850v3: Update display clock source
  ARM: dts: imx6q-b850v3: Remove ldb panel
  • Loading branch information
@arndb
arndb committed May 10, 2016
2 parents 7430bc1 + 194521f commit 21c9a64
Show file tree
Hide file tree
Showing 32 changed files with 1,130 additions and 99 deletions.
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-gw552x.dtb \
imx6q-hummingboard.dtb \
imx6q-icore-rqs.dtb \
imx6q-marsboard.dtb \
imx6q-nitrogen6x.dtb \
imx6q-nitrogen6_max.dtb \
imx6q-novena.dtb \
Expand Down Expand Up @@ -392,6 +393,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
imx6ul-tx6ul-mainboard.dtb
Expand Down
26 changes: 0 additions & 26 deletions arch/arm/boot/dts/imx28-m28.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,6 @@
pinctrl-names = "default";
pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
status = "okay";

partition@0 {
label = "bootloader";
reg = <0x00000000 0x00300000>;
read-only;
};

partition@1 {
label = "environment";
reg = <0x00300000 0x00080000>;
};

partition@2 {
label = "redundant-environment";
reg = <0x00380000 0x00080000>;
};

partition@3 {
label = "kernel";
reg = <0x00400000 0x00400000>;
};

partition@4 {
label = "filesystem";
reg = <0x00800000 0x0f800000>;
};
};
};

Expand Down
21 changes: 20 additions & 1 deletion arch/arm/boot/dts/imx53-m53evk.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 2 0>;
};

reg_usb_otg_vbus: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 4 0>;
};
};

sound {
Expand Down Expand Up @@ -168,6 +177,12 @@
>;
};

pinctrl_usbotg: usbotggrp {
fsl,pins = <
MX53_PAD_GPIO_4__GPIO1_4 0x000b0
>;
};

led_pin_gpio: led_gpio@0 {
fsl,pins = <
MX53_PAD_PATA_DATA8__GPIO2_8 0x80000000
Expand Down Expand Up @@ -351,6 +366,10 @@
};

&usbotg {
dr_mode = "peripheral";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
dr_mode = "otg";
vbus-supply = <&reg_usb_otg_vbus>;
disable-over-current;
status = "okay";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6dl-riotboard.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
codec: sgtl5000@0a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks 201>;
clocks = <&clks IMX6QDL_CLK_CKO>;
VDDA-supply = <&reg_2p5v>;
VDDIO-supply = <&reg_3p3v>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6dl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/* kHz uV */
996000 1250000
792000 1175000
396000 1075000
396000 1150000
>;
fsl,soc-operating-points = <
/* ARM kHz SOC-PU uV */
Expand Down
45 changes: 45 additions & 0 deletions arch/arm/boot/dts/imx6q-apalis-ixora.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,47 @@
};
};

lcd_display: display@di0 {
compatible = "fsl,imx-parallel-display";
#address-cells = <1>;
#size-cells = <0>;
interface-pix-fmt = "rgb24";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ipu1_lcdif>;
status = "okay";

port@0 {
reg = <0>;

lcd_display_in: endpoint {
remote-endpoint = <&ipu1_di0_disp1>;
};
};

port@1 {
reg = <1>;

lcd_display_out: endpoint {
remote-endpoint = <&lcd_panel_in>;
};
};
};

panel: panel {
/*
* edt,et057090dhu: EDT 5.7" LCD TFT
* edt,et070080dh6: EDT 7.0" LCD TFT
*/
compatible = "edt,et057090dhu";
backlight = <&backlight>;

port {
lcd_panel_in: endpoint {
remote-endpoint = <&lcd_display_out>;
};
};
};

leds {
compatible = "gpio-leds";

Expand Down Expand Up @@ -169,6 +210,10 @@
};
};

&ipu1_di0_disp1 {
remote-endpoint = <&lcd_display_in>;
};

&ldb {
status = "okay";
};
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/boot/dts/imx6q-b450v3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@
};
};

&ldb {
&clks {
assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
};

&ldb {
status = "okay";

lvds0: lvds-channel@0 {
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/boot/dts/imx6q-b650v3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@
};
};

&ldb {
&clks {
assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
};

&ldb {
status = "okay";

lvds0: lvds-channel@0 {
Expand Down
33 changes: 10 additions & 23 deletions arch/arm/boot/dts/imx6q-b850v3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,40 +51,27 @@
chosen {
stdout-path = &uart3;
};
};

panel-lvds0 {
compatible = "auo,b133htn01";
backlight = <&backlight_lvds>;
ddc-i2c-bus = <&mux2_i2c2>;

port {
panel_in_lvds0: endpoint {
remote-endpoint = <&lvds0_out>;
};
};
};
&clks {
assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
<&clks IMX6QDL_CLK_LDB_DI1_SEL>,
<&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>,
<&clks IMX6QDL_CLK_IPU1_DI1_PRE_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
<&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
<&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
<&clks IMX6QDL_CLK_PLL2_PFD2_396M>;
};

&ldb {
assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
fsl,dual-channel;
status = "okay";

lvds0: lvds-channel@0 {
fsl,data-mapping = "spwg";
fsl,data-width = <24>;
status = "okay";

port@4 {
reg = <4>;

lvds0_out: endpoint {
remote-endpoint = <&panel_in_lvds0>;
};
};
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/imx6q-ba16.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
fsl,ext-reset-output;
};

&iomuxc {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-gw5400-a.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
codec: sgtl5000@0a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks 201>;
clocks = <&clks IMX6QDL_CLK_CKO>;
VDDA-supply = <&sw4_reg>;
VDDIO-supply = <&reg_3p3v>;
};
Expand Down
Loading

0 comments on commit 21c9a64

Please sign in to comment.