diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
| commit | 891483186052b259852f3f48926ff307763f4eb0 (patch) | |
| tree | 019e4a490e40ad5459f7dd3d4129021be696c495 /arch/arm/dts/am335x-brppt1-nand.dts | |
| parent | 36fec02b1f90b92cf51ec531564f9284eae27ab4 (diff) | |
| parent | 67bbc1ecd311c78b06e845a3fd4e333806782367 (diff) | |
Merge branch 'next'
Pull in changes that have been pending in our 'next' branch. This
includes:
- A large number of CI improvements including moving to gcc-9.2 for all
platforms.
- amlogic, xilinx, stm32, TI SoC updates
- USB and i2c subsystem updtaes
- Re-sync Kbuild/etc logic with v4.19 of the Linux kernel.
- RSA key handling improvements
Diffstat (limited to 'arch/arm/dts/am335x-brppt1-nand.dts')
| -rw-r--r-- | arch/arm/dts/am335x-brppt1-nand.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/dts/am335x-brppt1-nand.dts b/arch/arm/dts/am335x-brppt1-nand.dts index 11bd5c551c..9d4340f591 100644 --- a/arch/arm/dts/am335x-brppt1-nand.dts +++ b/arch/arm/dts/am335x-brppt1-nand.dts @@ -53,6 +53,8 @@ bkl-pwm = <&pwmbacklight>; bkl-tps = <&tps_bl>; + u-boot,dm-pre-reloc; + panel-info { ac-bias = <255>; ac-bias-intrpt = <0>; |