Commit 832e1173 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.5-rockchip-dts32-1' of... 

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

New rk3288 features are Gamma support for the VOPs as well as declaring
the cpuid found in the efuses. Veyron display got a cleanup to use the
interpolated backlight values instead of declaring huge tables
and finally a cleanup fixing some tabs/spaces issues in the dts files.

* tag 'v5.5-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: remove some tabs and spaces from dtsi files
  ARM: dts: rockchip: Add RK3288 VOP gamma LUT address
  ARM: dts: rockchip: Use interpolated brightness tables for veyron
  ARM: dts: rockchip: Add cpu id to rk3288 efuse node

Link: https://lore.kernel.org/r/1770986.Em1ahGqaF7@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9bfa8cf0 a562a8ac

arch/arm/boot/dts/rk3288-tinker.dtsi

+5 −9
Original line number Diff line number Diff line
@@ -382,18 +382,15 @@ 


	pmic {

		pmic_int: pmic-int {

			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO \

					&pcfg_pull_up>;

			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		dvs_1: dvs-1 {

			rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO \

					&pcfg_pull_down>;

			rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		dvs_2: dvs-2 {

			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO \

					&pcfg_pull_down>;

			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};
@@ -406,8 +403,7 @@ 
		};



		sdmmc_clk: sdmmc-clk {

			rockchip,pins = <6 RK_PC4 1 \

					&pcfg_pull_none_drv_8ma>;

			rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;

		};



		sdmmc_cmd: sdmmc-cmd {

arch/arm/boot/dts/rk3288-veyron-edp.dtsi

+2 −33
Original line number Diff line number Diff line
@@ -41,39 +41,8 @@ 


	backlight: backlight {

		compatible = "pwm-backlight";

		brightness-levels = <

			  0   1   2   3   4   5   6   7

			  8   9  10  11  12  13  14  15

			 16  17  18  19  20  21  22  23

			 24  25  26  27  28  29  30  31

			 32  33  34  35  36  37  38  39

			 40  41  42  43  44  45  46  47

			 48  49  50  51  52  53  54  55

			 56  57  58  59  60  61  62  63

			 64  65  66  67  68  69  70  71

			 72  73  74  75  76  77  78  79

			 80  81  82  83  84  85  86  87

			 88  89  90  91  92  93  94  95

			 96  97  98  99 100 101 102 103

			104 105 106 107 108 109 110 111

			112 113 114 115 116 117 118 119

			120 121 122 123 124 125 126 127

			128 129 130 131 132 133 134 135

			136 137 138 139 140 141 142 143

			144 145 146 147 148 149 150 151

			152 153 154 155 156 157 158 159

			160 161 162 163 164 165 166 167

			168 169 170 171 172 173 174 175

			176 177 178 179 180 181 182 183

			184 185 186 187 188 189 190 191

			192 193 194 195 196 197 198 199

			200 201 202 203 204 205 206 207

			208 209 210 211 212 213 214 215

			216 217 218 219 220 221 222 223

			224 225 226 227 228 229 230 231

			232 233 234 235 236 237 238 239

			240 241 242 243 244 245 246 247

			248 249 250 251 252 253 254 255>;

		brightness-levels = <0 255>;

		num-interpolated-steps = <255>;

		default-brightness-level = <128>;

		enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

arch/arm/boot/dts/rk3288-veyron-jaq.dts

+2 −33
Original line number Diff line number Diff line
@@ -20,39 +20,8 @@ 


&backlight {

	/* Jaq panel PWM must be >= 3%, so start non-zero brightness at 8 */

	brightness-levels = <

		  0

		  8   9  10  11  12  13  14  15

		 16  17  18  19  20  21  22  23

		 24  25  26  27  28  29  30  31

		 32  33  34  35  36  37  38  39

		 40  41  42  43  44  45  46  47

		 48  49  50  51  52  53  54  55

		 56  57  58  59  60  61  62  63

		 64  65  66  67  68  69  70  71

		 72  73  74  75  76  77  78  79

		 80  81  82  83  84  85  86  87

		 88  89  90  91  92  93  94  95

		 96  97  98  99 100 101 102 103

		104 105 106 107 108 109 110 111

		112 113 114 115 116 117 118 119

		120 121 122 123 124 125 126 127

		128 129 130 131 132 133 134 135

		136 137 138 139 140 141 142 143

		144 145 146 147 148 149 150 151

		152 153 154 155 156 157 158 159

		160 161 162 163 164 165 166 167

		168 169 170 171 172 173 174 175

		176 177 178 179 180 181 182 183

		184 185 186 187 188 189 190 191

		192 193 194 195 196 197 198 199

		200 201 202 203 204 205 206 207

		208 209 210 211 212 213 214 215

		216 217 218 219 220 221 222 223

		224 225 226 227 228 229 230 231

		232 233 234 235 236 237 238 239

		240 241 242 243 244 245 246 247

		248 249 250 251 252 253 254 255>;

	brightness-levels = <0 8 255>;

	num-interpolated-steps = <247>;

};



&rk808 {

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+2 −33
Original line number Diff line number Diff line
@@ -38,39 +38,8 @@ 


&backlight {

	/* Minnie panel PWM must be >= 1%, so start non-zero brightness at 3 */

	brightness-levels = <

			  0   3   4   5   6   7

			  8   9  10  11  12  13  14  15

			 16  17  18  19  20  21  22  23

			 24  25  26  27  28  29  30  31

			 32  33  34  35  36  37  38  39

			 40  41  42  43  44  45  46  47

			 48  49  50  51  52  53  54  55

			 56  57  58  59  60  61  62  63

			 64  65  66  67  68  69  70  71

			 72  73  74  75  76  77  78  79

			 80  81  82  83  84  85  86  87

			 88  89  90  91  92  93  94  95

			 96  97  98  99 100 101 102 103

			104 105 106 107 108 109 110 111

			112 113 114 115 116 117 118 119

			120 121 122 123 124 125 126 127

			128 129 130 131 132 133 134 135

			136 137 138 139 140 141 142 143

			144 145 146 147 148 149 150 151

			152 153 154 155 156 157 158 159

			160 161 162 163 164 165 166 167

			168 169 170 171 172 173 174 175

			176 177 178 179 180 181 182 183

			184 185 186 187 188 189 190 191

			192 193 194 195 196 197 198 199

			200 201 202 203 204 205 206 207

			208 209 210 211 212 213 214 215

			216 217 218 219 220 221 222 223

			224 225 226 227 228 229 230 231

			232 233 234 235 236 237 238 239

			240 241 242 243 244 245 246 247

			248 249 250 251 252 253 254 255>;

	brightness-levels = <0 3 255>;

	num-interpolated-steps = <252>;

};



&i2c_tunnel {

arch/arm/boot/dts/rk3288-veyron-tiger.dts

+2 −33
Original line number Diff line number Diff line
@@ -23,39 +23,8 @@ 


&backlight {

	/* Tiger panel PWM must be >= 1%, so start non-zero brightness at 3 */

	brightness-levels = <

		  0   3   4   5   6   7

		  8   9  10  11  12  13  14  15

		 16  17  18  19  20  21  22  23

		 24  25  26  27  28  29  30  31

		 32  33  34  35  36  37  38  39

		 40  41  42  43  44  45  46  47

		 48  49  50  51  52  53  54  55

		 56  57  58  59  60  61  62  63

		 64  65  66  67  68  69  70  71

		 72  73  74  75  76  77  78  79

		 80  81  82  83  84  85  86  87

		 88  89  90  91  92  93  94  95

		 96  97  98  99 100 101 102 103

		104 105 106 107 108 109 110 111

		112 113 114 115 116 117 118 119

		120 121 122 123 124 125 126 127

		128 129 130 131 132 133 134 135

		136 137 138 139 140 141 142 143

		144 145 146 147 148 149 150 151

		152 153 154 155 156 157 158 159

		160 161 162 163 164 165 166 167

		168 169 170 171 172 173 174 175

		176 177 178 179 180 181 182 183

		184 185 186 187 188 189 190 191

		192 193 194 195 196 197 198 199

		200 201 202 203 204 205 206 207

		208 209 210 211 212 213 214 215

		216 217 218 219 220 221 222 223

		224 225 226 227 228 229 230 231

		232 233 234 235 236 237 238 239

		240 241 242 243 244 245 246 247

		248 249 250 251 252 253 254 255>;

	brightness-levels = <0 3 255>;

	num-interpolated-steps = <252>;

};



&backlight_regulator {

CRA Git | Maintained and supported by SUSTech CRA and CCSE