.. | .. |
---|
14 | 14 | compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", |
---|
15 | 15 | "google,veyron", "rockchip,rk3288"; |
---|
16 | 16 | |
---|
| 17 | + /delete-node/backlight-regulator; |
---|
| 18 | + /delete-node/panel-regulator; |
---|
17 | 19 | /delete-node/emmc-pwrseq; |
---|
| 20 | + /delete-node/vcc18-lcd; |
---|
| 21 | +}; |
---|
| 22 | + |
---|
| 23 | +&backlight { |
---|
| 24 | + /delete-property/power-supply; |
---|
18 | 25 | }; |
---|
19 | 26 | |
---|
20 | 27 | &emmc { |
---|
.. | .. |
---|
35 | 42 | force-hpd; |
---|
36 | 43 | }; |
---|
37 | 44 | |
---|
38 | | -&gpio_keys { |
---|
| 45 | +&lid_switch { |
---|
39 | 46 | pinctrl-0 = <&pwr_key_h &ap_lid_int_l>; |
---|
40 | 47 | |
---|
41 | 48 | power { |
---|
.. | .. |
---|
52 | 59 | i2c-scl-rising-time-ns = <300>; |
---|
53 | 60 | }; |
---|
54 | 61 | |
---|
| 62 | +&panel { |
---|
| 63 | + power-supply = <&vcc33_lcd>; |
---|
| 64 | +}; |
---|
| 65 | + |
---|
55 | 66 | &pinctrl { |
---|
| 67 | + pinctrl-names = "default", "sleep"; |
---|
| 68 | + pinctrl-0 = < |
---|
| 69 | + /* Common for sleep and wake, but no owners */ |
---|
| 70 | + &ddr0_retention |
---|
| 71 | + &ddrio_pwroff |
---|
| 72 | + &global_pwroff |
---|
| 73 | + |
---|
| 74 | + /* Wake only */ |
---|
| 75 | + &suspend_l_wake |
---|
| 76 | + &bt_dev_wake_awake |
---|
| 77 | + >; |
---|
| 78 | + pinctrl-1 = < |
---|
| 79 | + /* Common for sleep and wake, but no owners */ |
---|
| 80 | + &ddr0_retention |
---|
| 81 | + &ddrio_pwroff |
---|
| 82 | + &global_pwroff |
---|
| 83 | + |
---|
| 84 | + /* Sleep only */ |
---|
| 85 | + &suspend_l_sleep |
---|
| 86 | + &bt_dev_wake_sleep |
---|
| 87 | + >; |
---|
| 88 | + |
---|
| 89 | + /delete-node/ lcd; |
---|
| 90 | + |
---|
| 91 | + backlight { |
---|
| 92 | + /delete-node/ bl_pwr_en; |
---|
| 93 | + }; |
---|
| 94 | + |
---|
56 | 95 | buttons { |
---|
57 | 96 | pwr_key_h: pwr-key-h { |
---|
58 | 97 | rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
.. | .. |
---|
66 | 105 | }; |
---|
67 | 106 | |
---|
68 | 107 | sdmmc { |
---|
69 | | - sdmmc_wp_gpio: sdmmc-wp-gpio { |
---|
| 108 | + sdmmc_wp_pin: sdmmc-wp-pin { |
---|
70 | 109 | rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; |
---|
71 | 110 | }; |
---|
72 | 111 | }; |
---|
.. | .. |
---|
87 | 126 | |
---|
88 | 127 | &sdmmc { |
---|
89 | 128 | pinctrl-names = "default"; |
---|
90 | | - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio |
---|
91 | | - &sdmmc_wp_gpio &sdmmc_bus4>; |
---|
| 129 | + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin |
---|
| 130 | + &sdmmc_wp_pin &sdmmc_bus4>; |
---|
92 | 131 | wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>; |
---|
93 | 132 | }; |
---|
94 | 133 | |
---|