Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d27199cb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.4-rockchip-dts32-1' of... 

Merge tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "Rockchip dts32 changes for 4.4" from Heiko Stuebner:

DTS changes including one new Veyron-board and the Radxa Rock2
system-on-module as well as the square baseboard. On top of that
a lot of mmc-related changes to improve speeds on the Cortex-A9
socs and also setting up the supplies for rk3288 mmc-controllers
for the following mmc-tuning support. And of course the dts-part
of the rk3288 power-domains.

* tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add the support power-domain node on RK3288 SoCs
  ARM: dts: rockchip: add rk3288-firefly iodomains
  ARM: dts: rockchip: fixup firefly mmc supplies
  ARM: dts: rockchip: add rk3288-popmetal iodomains
  ARM: dts: rockchip: add rk3288-popmetal mmc supplies
  ARM: dts: rockchip: add rk3288-popmetal board to dtb list
  ARM: dts: rockchip: Add dtb for the Radxa Rock 2 Square board
  ARM: dts: rockchip: support highspeed sd-cards on rk3066a boards
  ARM: dts: rockchip: support highspeed sd-cards for rk3188-radxarock
  ARM: dts: rockchip: Add the hdmi-ddc pinctrl settings for rk3288
  ARM: dts: rockchip: Remove specific cts pullup from veyron
  ARM: dts: rockchip: pull up cts lines on rk3288
  ARM: dts: rockchip: add veyron-jaq board
  ARM: dts: rockchip: Add support for SD/MMC on MarsBoard-RK3066
  dt-bindings: add power-domain header for RK3288 SoCs
parents a3e2ed44 b63af764

Documentation/devicetree/bindings/arm/rockchip.txt

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "radxa,rock", "rockchip,rk3188";



- Radxa Rock2 Square board:

    Required root node properties:

      - compatible = "radxa,rock2-square", "rockchip,rk3288";



- Firefly Firefly-RK3288 board:

    Required root node properties:

      - compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
@@ -31,6 +35,13 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "netxeon,r89", "rockchip,rk3288";



- Google Jaq (Haier Chromebook 11 and more):

    Required root node properties:

      - compatible = "google,veyron-jaq-rev5", "google,veyron-jaq-rev4",

		     "google,veyron-jaq-rev3", "google,veyron-jaq-rev2",

		     "google,veyron-jaq-rev1", "google,veyron-jaq",

		     "google,veyron", "rockchip,rk3288";



- Google Jerry (Hisense Chromebook C11 and more):

    Required root node properties:

      - compatible = "google,veyron-jerry-rev7", "google,veyron-jerry-rev6",

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -509,7 +509,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-evb-rk808.dtb \

	rk3288-firefly-beta.dtb \

	rk3288-firefly.dtb \

	rk3288-popmetal.dtb \

	rk3288-r89.dtb \

	rk3288-rock2-square.dtb \

	rk3288-veyron-jaq.dtb \

	rk3288-veyron-jerry.dtb \

	rk3288-veyron-minnie.dtb \

	rk3288-veyron-pinky.dtb \

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ 
	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	vmmc-supply = <&vcc_sd0>;

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	disable-wp;

};

arch/arm/boot/dts/rk3066a-marsboard.dts

+8 −0
Original line number Diff line number Diff line
@@ -178,6 +178,14 @@ 
	};

};



&mmc0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	vmmc-supply = <&vcc_sd0>;

};



&pinctrl {

	lan8720a {

		phy_int: phy-int {

arch/arm/boot/dts/rk3066a-rayeager.dts

+2 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	vmmc-supply = <&vcc_sd>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	status = "okay";

};