Commit bcb84a10 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.2-rockchip-dts32-2' of... 

Merge tag 'v5.2-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Much love for rk3288 in general (power coefficients for the scheduler)
and veyron chromeos devices in particular (regulators, suspend, cleanups)
and bulk conversion of the remaining gpios to the helper constants denoting
the iomux.

* tag 'v5.2-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: vdd_gpu off in suspend for rk3288-veyron
  ARM: dts: rockchip: vcc33_ccd off in suspend for rk3288-veyron-chromebook
  ARM: dts: rockchip: Add DDR retention/poweroff to rk3288-veyron hogs
  ARM: dts: rockchip: Add dynamic-power-coefficient for rk3288
  ARM: dts: rockchip: bulk convert gpios to their constant counterparts
  ARM: dts: rockchip: Add BT_EN to the power sequence for veyron
  ARM: dts: rockchip: Remove unnecessary setting of UART0 SCLK rate on veyron

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ad884001 356150e8

arch/arm/boot/dts/rk3036-kylin.dts

+5 −5
Original line number Diff line number Diff line
@@ -368,31 +368,31 @@ 
&pinctrl {

	leds {

		led_ctl: led-ctl {

			rockchip,pins = <2 30 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		pmic_int: pmic-int {

			rockchip,pins = <2 2 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	sdio {

		bt_wake_h: bt-wake-h {

			rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	sdmmc {

		sdmmc_pwr: sdmmc-pwr {

			rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	sleep {

		global_pwroff: global-pwroff {

			rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>;

			rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;

		};

	};

};

arch/arm/boot/dts/rk3036.dtsi

+68 −68
Original line number Diff line number Diff line
@@ -551,71 +551,71 @@ 


		pwm0 {

			pwm0_pin: pwm0-pin {

				rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;

			};

		};



		pwm1 {

			pwm1_pin: pwm1-pin {

				rockchip,pins = <0 1 RK_FUNC_2 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;

			};

		};



		pwm2 {

			pwm2_pin: pwm2-pin {

				rockchip,pins = <0 1 2 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;

			};

		};



		pwm3 {

			pwm3_pin: pwm3-pin {

				rockchip,pins = <0 27 1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PD3 1 &pcfg_pull_none>;

			};

		};



		sdmmc {

			sdmmc_clk: sdmmc-clk {

				rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none>;

			};



			sdmmc_cmd: sdmmc-cmd {

				rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PB7 1 &pcfg_pull_default>;

			};



			sdmmc_cd: sdmmc-cd {

				rockchip,pins = <1 17 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PC1 1 &pcfg_pull_default>;

			};



			sdmmc_bus1: sdmmc-bus1 {

				rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PC2 1 &pcfg_pull_default>;

			};



			sdmmc_bus4: sdmmc-bus4 {

				rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>,

						<1 19 RK_FUNC_1 &pcfg_pull_default>,

						<1 20 RK_FUNC_1 &pcfg_pull_default>,

						<1 21 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PC2 1 &pcfg_pull_default>,

						<1 RK_PC3 1 &pcfg_pull_default>,

						<1 RK_PC4 1 &pcfg_pull_default>,

						<1 RK_PC5 1 &pcfg_pull_default>;

			};

		};



		sdio {

			sdio_bus1: sdio-bus1 {

				rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <0 RK_PB3 1 &pcfg_pull_default>;

			};



			sdio_bus4: sdio-bus4 {

				rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>,

						<0 12 RK_FUNC_1 &pcfg_pull_default>,

						<0 13 RK_FUNC_1 &pcfg_pull_default>,

						<0 14 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <0 RK_PB3 1 &pcfg_pull_default>,

						<0 RK_PB4 1 &pcfg_pull_default>,

						<0 RK_PB5 1 &pcfg_pull_default>,

						<0 RK_PB6 1 &pcfg_pull_default>;

			};



			sdio_cmd: sdio-cmd {

				rockchip,pins = <0 8 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <0 RK_PB0 1 &pcfg_pull_default>;

			};



			sdio_clk: sdio-clk {

				rockchip,pins = <0 9 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PB1 1 &pcfg_pull_none>;

			};

		};
@@ -625,135 +625,135 @@ 
			 * We also have external pulls, so disable the internal ones.

			 */

			emmc_clk: emmc-clk {

				rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none>;

				rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none>;

			};



			emmc_cmd: emmc-cmd {

				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>;

				rockchip,pins = <2 RK_PA1 2 &pcfg_pull_default>;

			};



			emmc_bus8: emmc-bus8 {

				rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>,

						<1 25 RK_FUNC_2 &pcfg_pull_default>,

						<1 26 RK_FUNC_2 &pcfg_pull_default>,

						<1 27 RK_FUNC_2 &pcfg_pull_default>,

						<1 28 RK_FUNC_2 &pcfg_pull_default>,

						<1 29 RK_FUNC_2 &pcfg_pull_default>,

						<1 30 RK_FUNC_2 &pcfg_pull_default>,

						<1 31 RK_FUNC_2 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PD0 2 &pcfg_pull_default>,

						<1 RK_PD1 2 &pcfg_pull_default>,

						<1 RK_PD2 2 &pcfg_pull_default>,

						<1 RK_PD3 2 &pcfg_pull_default>,

						<1 RK_PD4 2 &pcfg_pull_default>,

						<1 RK_PD5 2 &pcfg_pull_default>,

						<1 RK_PD6 2 &pcfg_pull_default>,

						<1 RK_PD7 2 &pcfg_pull_default>;

			};

		};



		emac {

			emac_xfer: emac-xfer {

				rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_default>, /* crs_dvalid */

						<2 13 RK_FUNC_1 &pcfg_pull_default>, /* tx_en */

						<2 14 RK_FUNC_1 &pcfg_pull_default>, /* mac_clk */

						<2 15 RK_FUNC_1 &pcfg_pull_default>, /* rx_err */

						<2 16 RK_FUNC_1 &pcfg_pull_default>, /* rxd1 */

						<2 17 RK_FUNC_1 &pcfg_pull_default>, /* rxd0 */

						<2 18 RK_FUNC_1 &pcfg_pull_default>, /* txd1 */

						<2 19 RK_FUNC_1 &pcfg_pull_default>; /* txd0 */

				rockchip,pins = <2 RK_PB2 1 &pcfg_pull_default>, /* crs_dvalid */

						<2 RK_PB5 1 &pcfg_pull_default>, /* tx_en */

						<2 RK_PB6 1 &pcfg_pull_default>, /* mac_clk */

						<2 RK_PB7 1 &pcfg_pull_default>, /* rx_err */

						<2 RK_PC0 1 &pcfg_pull_default>, /* rxd1 */

						<2 RK_PC1 1 &pcfg_pull_default>, /* rxd0 */

						<2 RK_PC2 1 &pcfg_pull_default>, /* txd1 */

						<2 RK_PC3 1 &pcfg_pull_default>; /* txd0 */

			};



			emac_mdio: emac-mdio {

				rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_default>, /* mac_md */

						<2 25 RK_FUNC_1 &pcfg_pull_default>; /* mac_mdclk */

				rockchip,pins = <2 RK_PB4 1 &pcfg_pull_default>, /* mac_md */

						<2 RK_PD1 1 &pcfg_pull_default>; /* mac_mdclk */

			};

		};



		i2c0 {

			i2c0_xfer: i2c0-xfer {

				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,

						<0 1 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>,

						<0 RK_PA1 1 &pcfg_pull_none>;

			};

		};



		i2c1 {

			i2c1_xfer: i2c1-xfer {

				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_none>,

						<0 3 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>,

						<0 RK_PA3 1 &pcfg_pull_none>;

			};

		};



		i2c2 {

			i2c2_xfer: i2c2-xfer {

				rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>,

						<2 21 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>,

						<2 RK_PC5 1 &pcfg_pull_none>;

			};

		};



		i2s {

			i2s_bus: i2s-bus {

				rockchip,pins = <1 0 RK_FUNC_1 &pcfg_pull_default>,

						<1 1 RK_FUNC_1 &pcfg_pull_default>,

						<1 2 RK_FUNC_1 &pcfg_pull_default>,

						<1 3 RK_FUNC_1 &pcfg_pull_default>,

						<1 4 RK_FUNC_1 &pcfg_pull_default>,

						<1 5 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PA0 1 &pcfg_pull_default>,

						<1 RK_PA1 1 &pcfg_pull_default>,

						<1 RK_PA2 1 &pcfg_pull_default>,

						<1 RK_PA3 1 &pcfg_pull_default>,

						<1 RK_PA4 1 &pcfg_pull_default>,

						<1 RK_PA5 1 &pcfg_pull_default>;

			};

		};



		hdmi {

			hdmi_ctl: hdmi-ctl {

				rockchip,pins = <1 8  RK_FUNC_1 &pcfg_pull_none>,

						<1 9  RK_FUNC_1 &pcfg_pull_none>,

						<1 10 RK_FUNC_1 &pcfg_pull_none>,

						<1 11 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <1 RK_PB0  1 &pcfg_pull_none>,

						<1 RK_PB1  1 &pcfg_pull_none>,

						<1 RK_PB2 1 &pcfg_pull_none>,

						<1 RK_PB3 1 &pcfg_pull_none>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,

						<0 17 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PC0 1 &pcfg_pull_default>,

						<0 RK_PC1 1 &pcfg_pull_none>;

			};



			uart0_cts: uart0-cts {

				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>;

				rockchip,pins = <0 RK_PC2 1 &pcfg_pull_default>;

			};



			uart0_rts: uart0-rts {

				rockchip,pins = <0 19 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <0 RK_PC3 1 &pcfg_pull_none>;

			};

		};



		uart1 {

			uart1_xfer: uart1-xfer {

				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>,

						<2 23 RK_FUNC_1 &pcfg_pull_none>;

				rockchip,pins = <2 RK_PC6 1 &pcfg_pull_default>,

						<2 RK_PC7 1 &pcfg_pull_none>;

			};

			/* no rts / cts for uart1 */

		};



		uart2 {

			uart2_xfer: uart2-xfer {

				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>,

						<1 19 RK_FUNC_2 &pcfg_pull_none>;

				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_default>,

						<1 RK_PC3 2 &pcfg_pull_none>;

			};

			/* no rts / cts for uart2 */

		};



		spi-pins {

			spi_txd:spi-txd {

				rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PD5 3 &pcfg_pull_default>;

			};



			spi_rxd:spi-rxd {

				rockchip,pins = <1 28 RK_FUNC_3 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PD4 3 &pcfg_pull_default>;

			};



			spi_clk:spi-clk {

				rockchip,pins = <2 0 RK_FUNC_2 &pcfg_pull_default>;

				rockchip,pins = <2 RK_PA0 2 &pcfg_pull_default>;

			};



			spi_cs0:spi-cs0 {

				rockchip,pins = <1 30 RK_FUNC_3 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PD6 3 &pcfg_pull_default>;



			};



			spi_cs1:spi-cs1 {

				rockchip,pins = <1 31 RK_FUNC_3 &pcfg_pull_default>;

				rockchip,pins = <1 RK_PD7 3 &pcfg_pull_default>;



			};

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
&pinctrl {

	lan8720a {

		phy_int: phy-int {

			rockchip,pins = <RK_GPIO1 26 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

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

+4 −4
Original line number Diff line number Diff line
@@ -136,25 +136,25 @@ 
&pinctrl {

	usb-host {

		host_drv: host-drv {

			rockchip,pins = <RK_GPIO0 6 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	usb-otg {

		otg_drv: otg-drv {

			rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	sdmmc {

		sdmmc_pwr: sdmmc-pwr {

			rockchip,pins = <RK_GPIO3 7 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	sdio {

		wifi_pwr: wifi-pwr {

			rockchip,pins = <RK_GPIO3 24 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

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

+13 −13
Original line number Diff line number Diff line
@@ -322,71 +322,71 @@ 


	ak8963 {

		comp_int: comp-int {

			rockchip,pins = <4 17 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	emac {

		rmii_rst: rmii-rst {

			rockchip,pins = <1 30 RK_FUNC_GPIO &pcfg_output_high>;

			rockchip,pins = <1 RK_PD6 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};



	ir {

		ir_int: ir-int {

			rockchip,pins = <6 1 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <6 RK_PA1 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	keys {

		pwr_key: pwr-key {

			rockchip,pins = <6 2 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <6 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	mma8452 {

		gsensor_int: gsensor-int {

			rockchip,pins = <4 16 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	mmc {

		sdmmc_pwr: sdmmc-pwr {

			rockchip,pins = <3 7 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	usb_host {

		host_drv: host-drv {

			rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_default>;

		};



		hub_rst: hub-rst {

			rockchip,pins = <1 31 RK_FUNC_GPIO &pcfg_output_high>;

			rockchip,pins = <1 RK_PD7 RK_FUNC_GPIO &pcfg_output_high>;

		};



		sata_pwr: sata-pwr {

			rockchip,pins = <4 22 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_default>;

		};



		sata_reset: sata-reset {

			rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_output_high>;

			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};



	usb_otg {

		otg_drv: otg-drv {

			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_default>;

		};

	};



	tps {

		pmic_int: pmic-int {

			rockchip,pins = <6 4 RK_FUNC_GPIO &pcfg_pull_default>;

			rockchip,pins = <6 RK_PA4 RK_FUNC_GPIO &pcfg_pull_default>;

		};



		pwr_hold: pwr-hold {

			rockchip,pins = <6 8 RK_FUNC_GPIO &pcfg_output_high>;

			rockchip,pins = <6 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE