Compare commits

..

11 Commits

Author SHA1 Message Date
Phil Elwell
6a12ecfa52 configs: Add USB gadget support (for Zero 2 W)
Bring the Pi 3 kernel in line with the Pi Zero and Pi 4 by enabling
USB gadget support, which is useful on Zero 2 W.

See: https://github.com/raspberrypi/firmware/issues/1654

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:56 +00:00
Phil Elwell
1e02427d49 brcmfmac: Protect against reprobing
It is important to reinitialise the firmware array pointers to protect
against the case that the brcmfmac driver is reprobed without first
being unloaded.

The potential hazard was noticed while investigating
https://github.com/raspberrypi/firmware/issues/1644 .

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:56 +00:00
Phil Elwell
1646810b3c brcmfmac: Read alternative firmware names from DT
Add the ability to load the names of alternative firmwares from the
Device Tree node. This permits separate firmwares for 43436s and 43438
and allows downstream firmwares to coexist with upstream.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Phil Elwell
82c23f9745 Revert "brcmfmac: BCM43436 needs dedicated firmware"
This reverts commit c52581ffa4.

Replace the hardcoded alternate firmware names with mappings provided
from Device Tree.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Phil Elwell
a4fd51ecb7 ARM: dts: Provide WLAN firmware names for Zero 2 W
BCM43430/2 may be BCM43430B0 or BCM43436P, and BCM43430/1 can be either
BCM43430A1 or BCM43436S, the former being upstream names and the
latter downstream names for differently-sourced sister parts.

Make the choice of firmwares board-specific (without making the actual
firmwares board-specific) by placing the alternative firmware names for
each part in the DT node.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Phil Elwell
4e66bf3cd6 ARM: dt: Add DT nodes for the WLAN interfaces
Mirror upstream changes into the downstream dts files.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Phil Elwell
b40638d339 ARM: dts: Rename Zero 2 W DT files
Retain the old names for backwards compatibility for a while, while the
necessary firmware change rolls out.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Phil Elwell
1a1dcc24e4 ARM: dts: Add Pi Zero 2 support
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2021-12-01 14:53:55 +00:00
Dom Cobley
727ea5ce7d clk-bcm2835: Remove VEC clock support
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
2021-12-01 14:53:54 +00:00
Dom Cobley
1b5086ca6f dt: Move VEC clock to clk-raspberrypi
clk-2835 is deprecated and gets an innacurate clock for VEC (107MHz).
Switch to clk-raspberrypi which uses the right PLL to get an accurate 108MHz.

Signed-off-by: Dom Cobley <popcornmix@gmail.com>
2021-12-01 14:53:54 +00:00
Dom Cobley
7a3819e174 clk-raspberrypi: Support VEC clock
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
2021-12-01 14:53:54 +00:00
2165 changed files with 12128 additions and 25429 deletions

View File

@@ -3003,10 +3003,10 @@
65 = /dev/infiniband/issm1 Second InfiniBand IsSM device
...
127 = /dev/infiniband/issm63 63rd InfiniBand IsSM device
192 = /dev/infiniband/uverbs0 First InfiniBand verbs device
193 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
128 = /dev/infiniband/uverbs0 First InfiniBand verbs device
129 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
...
223 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
159 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
232 char Biometric Devices
0 = /dev/biometric/sensor0/fingerprint first fingerprint sensor on first device

View File

@@ -5988,13 +5988,6 @@
improve timer resolution at the expense of processing
more timer interrupts.
xen.balloon_boot_timeout= [XEN]
The time (in seconds) to wait before giving up to boot
in case initial ballooning fails to free enough memory.
Applies only when running as HVM or PVH guest and
started with less memory configured than allowed at
max. Default is 180.
xen.event_eoi_delay= [XEN]
How long to delay EOI handling in case of event
storms (jiffies). Default is 10.

View File

@@ -54,7 +54,7 @@ properties:
- const: toradex,apalis_t30
- const: nvidia,tegra30
- items:
- const: toradex,apalis_t30-v1.1-eval
- const: toradex,apalis_t30-eval-v1.1
- const: toradex,apalis_t30-eval
- const: toradex,apalis_t30-v1.1
- const: toradex,apalis_t30

View File

@@ -18,7 +18,7 @@ properties:
const: ti,sn65dsi86
reg:
enum: [ 0x2c, 0x2d ]
const: 0x2d
enable-gpios:
maxItems: 1

View File

@@ -122,7 +122,7 @@ on various other factors also like;
so the device should have enough free bytes available its OOB/Spare
area to accommodate ECC for entire page. In general following expression
helps in determining if given device can accommodate ECC syndrome:
"2 + (PAGESIZE / 512) * ECC_BYTES" <= OOBSIZE"
"2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"
where
OOBSIZE number of bytes in OOB/spare area
PAGESIZE number of bytes in main-area of device page

View File

@@ -43,19 +43,19 @@ group emmc_nb
group pwm0
- pin 11 (GPIO1-11)
- functions pwm, led, gpio
- functions pwm, gpio
group pwm1
- pin 12
- functions pwm, led, gpio
- functions pwm, gpio
group pwm2
- pin 13
- functions pwm, led, gpio
- functions pwm, gpio
group pwm3
- pin 14
- functions pwm, led, gpio
- functions pwm, gpio
group pmic1
- pin 7

View File

@@ -13,14 +13,6 @@ common regulator binding documented in:
Required properties of the main device node (the parent!):
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
[1] If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
property is specified, then all the eight voltage values for the
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
Optional properties of the main device node (the parent!):
- s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV)
units for buck2 when changing voltage using gpio dvs. Refer to [1] below
for additional information.
@@ -33,13 +25,26 @@ Optional properties of the main device node (the parent!):
units for buck4 when changing voltage using gpio dvs. Refer to [1] below
for additional information.
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
[1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage'
property should specify atleast one voltage level (which would be a
safe operating voltage).
If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
property is specified, then all the eight voltage values for the
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
Optional properties of the main device node (the parent!):
- s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs.
- s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs.
- s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.
Additional properties required if either of the optional properties are used:
- s5m8767,pmic-buck-default-dvs-idx: Default voltage setting selected from
- s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from
the possible 8 options selectable by the dvs gpios. The value of this
property should be between 0 and 7. If not specified or if out of range, the
default value of this property is set to 0.

View File

@@ -29,7 +29,7 @@ recur_count
cpoint_name
Where in the kernel to trigger the action. It can be
one of INT_HARDWARE_ENTRY, INT_HW_IRQ_EN, INT_TASKLET_ENTRY,
FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_QUEUE_RQ,
FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_DISPATCH_CMD,
IDE_CORE_CP, or DIRECT
cpoint_type

View File

@@ -176,11 +176,11 @@ Master Keys
Each encrypted directory tree is protected by a *master key*. Master
keys can be up to 64 bytes long, and must be at least as long as the
greater of the security strength of the contents and filenames
encryption modes being used. For example, if any AES-256 mode is
used, the master key must be at least 256 bits, i.e. 32 bytes. A
stricter requirement applies if the key is used by a v1 encryption
policy and AES-256-XTS is used; such keys must be 64 bytes.
greater of the key length needed by the contents and filenames
encryption modes being used. For example, if AES-256-XTS is used for
contents encryption, the master key must be 64 bytes (512 bits). Note
that the XTS mode is defined to require a key twice as long as that
required by the underlying block cipher.
To "unlock" an encrypted directory tree, userspace must provide the
appropriate master key. There can be any number of master keys, each

View File

@@ -37,7 +37,8 @@ conn_reuse_mode - INTEGER
0: disable any special handling on port reuse. The new
connection will be delivered to the same real server that was
servicing the previous connection.
servicing the previous connection. This will effectively
disable expire_nodest_conn.
bit 1: enable rescheduling of new connections when it is safe.
That is, whenever expire_nodest_conn and for TCP sockets, when

View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 10
SUBLEVEL = 83
SUBLEVEL = 63
EXTRAVERSION =
NAME = Dare mighty things

View File

@@ -1026,9 +1026,6 @@ config RELR
config ARCH_HAS_MEM_ENCRYPT
bool
config ARCH_HAS_CC_PLATFORM
bool
config HAVE_SPARSE_SYSCALL_NR
bool
help

View File

@@ -60,7 +60,7 @@ extern inline void set_hae(unsigned long new_hae)
* Change virtual addresses to physical addresses and vv.
*/
#ifdef USE_48_BIT_KSEG
static inline unsigned long virt_to_phys(volatile void *address)
static inline unsigned long virt_to_phys(void *address)
{
return (unsigned long)address - IDENT_ADDR;
}
@@ -70,7 +70,7 @@ static inline void * phys_to_virt(unsigned long address)
return (void *) (address + IDENT_ADDR);
}
#else
static inline unsigned long virt_to_phys(volatile void *address)
static inline unsigned long virt_to_phys(void *address)
{
unsigned long phys = (unsigned long)address;
@@ -106,7 +106,7 @@ static inline void * phys_to_virt(unsigned long address)
extern unsigned long __direct_map_base;
extern unsigned long __direct_map_size;
static inline unsigned long __deprecated virt_to_bus(volatile void *address)
static inline unsigned long __deprecated virt_to_bus(void *address)
{
unsigned long phys = virt_to_phys(address);
unsigned long bus = phys + __direct_map_base;

View File

@@ -1123,7 +1123,7 @@ void clear_user_page(void *to, unsigned long u_vaddr, struct page *page)
clear_page(to);
clear_bit(PG_dc_clean, &page->flags);
}
EXPORT_SYMBOL(clear_user_page);
/**********************************************************************
* Explicit Cache flush request from user space via syscall

View File

@@ -87,7 +87,6 @@ config ARM
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_GCC_PLUGINS
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
select HAVE_IDE if PCI || ISA || PCMCIA
@@ -245,7 +244,7 @@ config ARM_PATCH_PHYS_VIRT
kernel in system memory.
This can only be used with non-XIP MMU kernels where the base
of physical memory is at a 2 MiB boundary.
of physical memory is at a 16MB boundary.
Only disable this option if you know that you do not require
this feature (eg, building a kernel for a single machine) and

View File

@@ -60,15 +60,15 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra)
# Note that GCC does not numerically define an architecture version
# macro, but instead defines a whole series of macros which makes
# testing for a specific architecture or later rather impossible.
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
# Only override the compiler option if ARMv6. The ARMv6K extensions are
# always available in ARMv7
ifeq ($(CONFIG_CPU_32v6),y)
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
endif
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t
arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4
arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3m
@@ -82,7 +82,7 @@ tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi
tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi
tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e
tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi
@@ -90,11 +90,11 @@ tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi
tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110
tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100
tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale
tune-$(CONFIG_CPU_XSC3) =-mtune=xscale
tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale
tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s
tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s
tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale)
tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
# Evaluate tune cc-option calls now
tune-y := $(tune-y)

View File

@@ -84,8 +84,6 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4
libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o
ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN}
CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280
OBJS += $(libfdt_objs) atags_to_fdt.o
endif

View File

@@ -47,10 +47,7 @@ extern char * strchrnul(const char *, int);
#endif
#ifdef CONFIG_KERNEL_XZ
/* Prevent KASAN override of string helpers in decompressor */
#undef memmove
#define memmove memmove
#undef memcpy
#define memcpy memcpy
#include "../../../../lib/decompress_unxz.c"
#endif

View File

@@ -468,10 +468,15 @@ dtb_check_done:
/*
* Compute the address of the hyp vectors after relocation.
* This requires some arithmetic since we cannot directly
* reference __hyp_stub_vectors in a PC-relative way.
* Call __hyp_set_vectors with the new address so that we
* can HVC again after the copy.
*/
adr_l r0, __hyp_stub_vectors
0: adr r0, 0b
movw r1, #:lower16:__hyp_stub_vectors - 0b
movt r1, #:upper16:__hyp_stub_vectors - 0b
add r0, r0, r1
sub r0, r0, r5
add r0, r0, r10
bl __hyp_set_vectors
@@ -622,11 +627,17 @@ not_relocated: mov r0, #0
cmp r0, #HYP_MODE @ if not booted in HYP mode...
bne __enter_kernel @ boot kernel directly
adr_l r0, __hyp_reentry_vectors
adr r12, .L__hyp_reentry_vectors_offset
ldr r0, [r12]
add r0, r0, r12
bl __hyp_set_vectors
__HVC(0) @ otherwise bounce to hyp mode
b . @ should never be reached
.align 2
.L__hyp_reentry_vectors_offset: .long __hyp_reentry_vectors - .
#else
b __enter_kernel
#endif

View File

@@ -208,12 +208,12 @@
};
pinctrl_hvi3c3_default: hvi3c3_default {
function = "I3C3";
function = "HVI3C3";
groups = "HVI3C3";
};
pinctrl_hvi3c4_default: hvi3c4_default {
function = "I3C4";
function = "HVI3C4";
groups = "HVI3C4";
};

View File

@@ -336,7 +336,7 @@
};
&shutdown_controller {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
atmel,wakeup-rtc-timer;
input@0 {

View File

@@ -92,8 +92,6 @@
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_leds>;
status = "okay"; /* Conflict with pwm0. */
red {
@@ -539,10 +537,6 @@
AT91_PIOA 19 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI) /* PA19 DAT2 periph A with pullup */
AT91_PIOA 20 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>; /* PA20 DAT3 periph A with pullup */
};
pinctrl_sdmmc0_cd: sdmmc0_cd {
atmel,pins =
<AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
sdmmc1 {
@@ -575,14 +569,6 @@
AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
leds {
pinctrl_gpio_leds: gpio_leds {
atmel,pins = <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOB 12 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
}; /* pinctrl */
&pwm0 {
@@ -594,7 +580,7 @@
&sdmmc0 {
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default &pinctrl_sdmmc0_cd>;
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";
cd-gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
disable-wp;
@@ -662,7 +648,7 @@
};
&shutdown_controller {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
status = "okay";
input@0 {

View File

@@ -71,6 +71,7 @@
isc: isc@f0008000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
status = "okay";
};
qspi1: spi@f0024000 {
@@ -137,7 +138,7 @@
};
shdwc@f8048010 {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
atmel,wakeup-rtc-timer;
input@0 {

View File

@@ -205,7 +205,7 @@
};
&shutdown_controller {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
atmel,wakeup-rtc-timer;
input@0 {

View File

@@ -693,7 +693,7 @@
};
&shutdown_controller {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
atmel,wakeup-rtc-timer;
input@0 {

View File

@@ -203,7 +203,7 @@
};
shdwc@f8048010 {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
input@0 {
reg = <0>;

View File

@@ -347,7 +347,7 @@
};
shdwc@f8048010 {
debounce-delay-us = <976>;
atmel,shdwc-debouncer = <976>;
atmel,wakeup-rtc-timer;
input@0 {

View File

@@ -57,8 +57,6 @@
};
spi0: spi@f0004000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0_cs>;
cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
status = "okay";
};
@@ -171,8 +169,6 @@
};
spi1: spi@f8008000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1_cs>;
cs-gpios = <&pioC 25 0>;
status = "okay";
};
@@ -252,26 +248,6 @@
<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_gpio_leds: gpio_leds_default {
atmel,pins =
<AT91_PIOE 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_spi0_cs: spi0_cs_default {
atmel,pins =
<AT91_PIOD 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_spi1_cs: spi1_cs_default {
atmel,pins = <AT91_PIOC 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_vcc_mmc0_reg_gpio: vcc_mmc0_reg_gpio_default {
atmel,pins = <AT91_PIOE 2 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
};
};
@@ -363,8 +339,6 @@
vcc_mmc0_reg: fixedregulator_mmc0 {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_vcc_mmc0_reg_gpio>;
gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
regulator-name = "mmc0-card-supply";
regulator-min-microvolt = <3300000>;
@@ -388,9 +362,6 @@
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_leds>;
status = "okay";
d2 {
label = "d2";

View File

@@ -90,8 +90,6 @@
};
spi1: spi@fc018000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0_cs>;
cs-gpios = <&pioB 21 0>;
status = "okay";
};
@@ -149,19 +147,6 @@
atmel,pins =
<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
pinctrl_spi0_cs: spi0_cs_default {
atmel,pins =
<AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_gpio_leds: gpio_leds_default {
atmel,pins =
<AT91_PIOD 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_vcc_mmc1_reg: vcc_mmc1_reg {
atmel,pins =
<AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
};
};
@@ -267,8 +252,6 @@
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_leds>;
status = "okay";
d8 {
@@ -295,8 +278,6 @@
vcc_mmc1_reg: fixedregulator_mmc1 {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_vcc_mmc1_reg>;
gpio = <&pioE 4 GPIO_ACTIVE_LOW>;
regulator-name = "VDD MCI1";
regulator-min-microvolt = <3300000>;

View File

@@ -262,7 +262,7 @@
&macb1 {
status = "okay";
phy-mode = "rmii";
phy-mode = "rgmii";
#address-cells = <1>;
#size-cells = <0>;

View File

@@ -77,7 +77,7 @@
interrupt-affinity = <&cpu0>, <&cpu1>;
};
mpcore-bus@19000000 {
mpcore@19000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x19000000 0x00023000>;
#address-cells = <1>;
@@ -219,7 +219,7 @@
status = "disabled";
};
sdio: mmc@21000 {
sdio: sdhci@21000 {
compatible = "brcm,sdhci-iproc-cygnus";
reg = <0x21000 0x100>;
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;

View File

@@ -65,6 +65,12 @@
status = "okay";
};
vcsm: vcsm {
compatible = "raspberrypi,bcm2835-vcsm";
firmware = <&firmware>;
status = "okay";
};
/* External sound card */
sound: sound {
status = "disabled";
@@ -142,14 +148,7 @@
/* Onboard audio */
audio: bcm2835_audio {
compatible = "brcm,bcm2835-audio";
brcm,firmware = <&firmware>;
brcm,pwm-channels = <8>;
status = "disabled";
};
};
&firmware {
vcio: vcio {
compatible = "raspberrypi,vcio";
};
};

View File

@@ -189,28 +189,6 @@
20 21>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
dpi_16bit_gpio0: dpi_16bit_gpio0 {
brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
12 13 14 15 16 17 18 19>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
dpi_16bit_gpio2: dpi_16bit_gpio2 {
brcm,pins = <2 3 4 5 6 7 8 9 10 11
12 13 14 15 16 17 18 19>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
dpi_16bit_cpadhi_gpio0: dpi_16bit_cpadhi_gpio0 {
brcm,pins = <0 1 2 3 4 5 6 7 8
12 13 14 15 16 17
20 21 22 23 24>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
dpi_16bit_cpadhi_gpio2: dpi_16bit_cpadhi_gpio2 {
brcm,pins = <2 3 4 5 6 7 8
12 13 14 15 16 17
20 21 22 23 24>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
};
&uart0 {
@@ -230,7 +208,6 @@
bus-width = <4>;
brcm,overclock-50 = <0>;
brcm,pio-limit = <1>;
firmware = <&firmware>;
};
&spi0 {

View File

@@ -54,8 +54,8 @@
regulator-always-on;
regulator-settling-time-us = <5000>;
gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
states = <1800000 0x1>,
<3300000 0x0>;
states = <1800000 0x1
3300000 0x0>;
status = "okay";
};
@@ -181,14 +181,12 @@
&hdmi0 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
status = "okay";
};
&hdmi1 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
wifi-2.4ghz-coexistence;
status = "okay";
};
@@ -273,16 +271,15 @@
};
&pcie0 {
pci@0,0 {
device_type = "pci";
pci@1,0 {
#address-cells = <3>;
#size-cells = <2>;
ranges;
reg = <0 0 0 0 0>;
usb@0,0 {
reg = <0 0 0 0 0>;
usb@1,0 {
reg = <0x10000 0 0 0 0>;
resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
};
};

View File

@@ -93,9 +93,9 @@
"PWR_LED_OFF",
"GLOBAL_RESET",
"VDD_SD_IO_SEL",
"GLOBAL_SHUTDOWN",
"CAM_GPIO",
"SD_PWR_ON",
"SHUTDOWN_REQUEST";
"SD_OC_N";
status = "okay";
};
@@ -273,16 +273,15 @@
};
&pcie0 {
pci@0,0 {
device_type = "pci";
pci@1,0 {
#address-cells = <3>;
#size-cells = <2>;
ranges;
reg = <0 0 0 0 0>;
usb@0,0 {
reg = <0 0 0 0 0>;
usb@1,0 {
reg = <0x10000 0 0 0 0>;
resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
};
};

View File

@@ -286,16 +286,15 @@
};
&pcie0 {
pci@0,0 {
device_type = "pci";
pci@1,0 {
#address-cells = <3>;
#size-cells = <2>;
ranges;
reg = <0 0 0 0 0>;
usb@0,0 {
reg = <0 0 0 0 0>;
usb@1,0 {
reg = <0x10000 0 0 0 0>;
resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
};
};

View File

@@ -519,17 +519,11 @@
#address-cells = <3>;
#interrupt-cells = <1>;
#size-cells = <2>;
interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "pcie", "msi";
interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143
IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 2 &gicv2 GIC_SPI 144
IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 3 &gicv2 GIC_SPI 145
IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 4 &gicv2 GIC_SPI 146
IRQ_TYPE_LEVEL_HIGH>;
msi-controller;
msi-parent = <&pcie0>;
@@ -559,8 +553,8 @@
compatible = "brcm,genet-mdio-v5";
reg = <0xe14 0x8>;
reg-names = "mdio";
#address-cells = <0x1>;
#size-cells = <0x0>;
#address-cells = <0x0>;
#size-cells = <0x1>;
};
};
};
@@ -595,8 +589,6 @@
<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
gpio-ranges = <&gpio 0 0 58>;
gpclk0_gpio49: gpclk0_gpio49 {
pin-gpclk {
pins = "gpio49";

View File

@@ -128,7 +128,7 @@
"hd";
interrupts = <2 8>, <2 9>;
ddc = <&i2c2>;
clocks = <&firmware_clocks 9>,
clocks = <&clocks BCM2835_PLLH_PIX>,
<&clocks BCM2835_CLOCK_HSM>;
clock-names = "pixel", "hdmi";
dmas = <&dma (17|(1<<27)|(1<<24))>;

View File

@@ -126,8 +126,6 @@
interrupt-controller;
#interrupt-cells = <2>;
gpio-ranges = <&gpio 0 0 54>;
/* Defines common pin muxing groups
*
* While each pin can have its mux selected

View File

@@ -20,7 +20,7 @@
bootargs = "console=ttyS0,115200 earlycon";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;

View File

@@ -19,7 +19,7 @@
bootargs = "console=ttyS0,115200";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;

View File

@@ -19,7 +19,7 @@
bootargs = "console=ttyS0,115200";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;

View File

@@ -16,7 +16,7 @@
bootargs = "console=ttyS0,115200";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;

View File

@@ -19,7 +19,7 @@
bootargs = "console=ttyS0,115200";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;

View File

@@ -30,7 +30,7 @@
bootargs = "console=ttyS0,115200";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;

View File

@@ -15,7 +15,7 @@
bootargs = "console=ttyS0,115200 earlycon";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};

View File

@@ -16,7 +16,7 @@
bootargs = "earlycon";
};
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;

View File

@@ -20,7 +20,7 @@
bootargs = " console=ttyS0,115200n8 earlycon";
};
memory@0 {
memory {
reg = <0x00000000 0x08000000>;
device_type = "memory";
};
@@ -195,25 +195,3 @@
};
};
};
&srab {
status = "okay";
ports {
port@0 {
reg = <0>;
label = "poe";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
fixed-link {
speed = <1000>;
duplex-full;
};
};
};
};

View File

@@ -242,8 +242,6 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
pcie0: pcie@12000 {
@@ -410,7 +408,7 @@
i2c0: i2c@18009000 {
compatible = "brcm,iproc-i2c";
reg = <0x18009000 0x50>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <100000>;

View File

@@ -38,7 +38,7 @@
model = "NorthStar SVK (BCM94708)";
compatible = "brcm,bcm94708", "brcm,bcm4708";
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};

View File

@@ -38,7 +38,7 @@
model = "NorthStar SVK (BCM94709)";
compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
memory@0 {
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};

View File

@@ -56,7 +56,6 @@
panel {
compatible = "edt,etm0700g0dh6";
pinctrl-0 = <&pinctrl_display_gpio>;
pinctrl-names = "default";
enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
port {
@@ -77,7 +76,8 @@
regulator-name = "vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 2 0>;
gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};

View File

@@ -70,12 +70,6 @@
clock-frequency = <11289600>;
};
achc_24M: achc-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24000000>;
};
sgtlsound: sound {
compatible = "fsl,imx53-cpuvo-sgtl5000",
"fsl,imx-audio-sgtl5000";
@@ -319,13 +313,16 @@
&gpio4 12 GPIO_ACTIVE_LOW>;
status = "okay";
spidev0: spi@1 {
compatible = "ge,achc", "nxp,kinetis-k20";
reg = <1>, <0>;
vdd-supply = <&reg_3v3>;
vdda-supply = <&reg_3v3>;
clocks = <&achc_24M>;
reset-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
spidev0: spi@0 {
compatible = "ge,achc";
reg = <0>;
spi-max-frequency = <1000000>;
};
spidev1: spi@1 {
compatible = "ge,achc";
reg = <1>;
spi-max-frequency = <1000000>;
};
gpioxra0: gpio@2 {

View File

@@ -5,7 +5,6 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pwm/pwm.h>
/ {
@@ -276,7 +275,6 @@
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
reg = <0>;
color = <LED_COLOR_ID_RED>;
};
chan@1 {
@@ -284,7 +282,6 @@
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
reg = <1>;
color = <LED_COLOR_ID_GREEN>;
};
chan@2 {
@@ -292,7 +289,6 @@
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
reg = <2>;
color = <LED_COLOR_ID_BLUE>;
};
chan@3 {
@@ -300,7 +296,6 @@
led-cur = /bits/ 8 <0x0>;
max-cur = /bits/ 8 <0x0>;
reg = <3>;
color = <LED_COLOR_ID_WHITE>;
};
};

View File

@@ -176,18 +176,7 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
phy-handle = <&phy>;
status = "okay";
mdio {
#address-cells = <1>;
#size-cells = <0>;
phy: ethernet-phy@1 {
reg = <1>;
qca,clk-out-frequency = <125000000>;
};
};
};
&hdmi {

View File

@@ -251,7 +251,7 @@
flash@0 {
/* Rev. A uses 64MB flash, Rev. B & C use 32MB flash */
compatible = "jedec,spi-nor";
compatible = "jedec,spi-nor", "s25fl256s1", "s25fl512s";
spi-max-frequency = <20000000>;
#address-cells = <1>;
#size-cells = <1>;

View File

@@ -331,6 +331,39 @@
#thermal-sensor-cells = <1>;
};
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <5000>;
thermal-sensors = <&tmu 0>;
trips {
cpu_alert: cpu-alert {
temperature = <85000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit: cpu-crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_alert>;
cooling-device =
<&cpu0 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
};
};
};
dspi0: spi@2100000 {
compatible = "fsl,ls1021a-v1.0-dspi";
#address-cells = <1>;
@@ -985,37 +1018,4 @@
big-endian;
};
};
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <5000>;
thermal-sensors = <&tmu 0>;
trips {
cpu_alert: cpu-alert {
temperature = <85000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit: cpu-crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_alert>;
cooling-device =
<&cpu0 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
};
};
};
};

View File

@@ -251,13 +251,8 @@
"pp2", "ppmmu2", "pp4", "ppmmu4",
"pp5", "ppmmu5", "pp6", "ppmmu6";
resets = <&reset RESET_MALI>;
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
clock-names = "bus", "core";
assigned-clocks = <&clkc CLKID_MALI>;
assigned-clock-rates = <318750000>;
operating-points-v2 = <&gpu_opp_table>;
};
};

View File

@@ -153,7 +153,7 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&vcc_5v>;
vin-supply = <&vcc_5v>;
pwms = <&pwm_cd 0 1148 0>;
pwm-dutycycle-range = <100 0>;
@@ -237,7 +237,7 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&vcc_5v>;
vin-supply = <&vcc_5v>;
pwms = <&pwm_cd 1 1148 0>;
pwm-dutycycle-range = <100 0>;

View File

@@ -39,8 +39,6 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&vcc_5v>;
pwms = <&pwm_cd 0 1148 0>;
pwm-dutycycle-range = <100 0>;
@@ -86,7 +84,7 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&vcc_5v>;
vin-supply = <&vcc_5v>;
pwms = <&pwm_cd 1 1148 0>;
pwm-dutycycle-range = <100 0>;

View File

@@ -136,7 +136,7 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&p5v0>;
vin-supply = <&p5v0>;
pwms = <&pwm_cd 0 12218 0>;
pwm-dutycycle-range = <91 0>;
@@ -168,7 +168,7 @@
regulator-min-microvolt = <860000>;
regulator-max-microvolt = <1140000>;
pwm-supply = <&p5v0>;
vin-supply = <&p5v0>;
pwms = <&pwm_cd 1 12218 0>;
pwm-dutycycle-range = <91 0>;

View File

@@ -29,7 +29,7 @@
compatible = "smsc,lan9221","smsc,lan9115";
bank-width = <2>;
gpmc,mux-add-data = <0>;
gpmc,mux-add-data;
gpmc,cs-on-ns = <0>;
gpmc,cs-rd-off-ns = <42>;
gpmc,cs-wr-off-ns = <36>;

View File

@@ -515,7 +515,7 @@
compatible = "bosch,bma180";
reg = <0x41>;
pinctrl-names = "default";
pinctrl-0 = <&bma180_pins>;
pintcrl-0 = <&bma180_pins>;
interrupt-parent = <&gpio4>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
};

View File

@@ -22,7 +22,7 @@
compatible = "smsc,lan9221","smsc,lan9115";
bank-width = <2>;
gpmc,mux-add-data = <0>;
gpmc,mux-add-data;
gpmc,cs-on-ns = <0>;
gpmc,cs-rd-off-ns = <42>;
gpmc,cs-wr-off-ns = <36>;

View File

@@ -101,7 +101,7 @@
nand@1,0 {
compatible = "ti,omap2-nand";
reg = <1 0 4>; /* CS1, offset 0, IO size 4 */
reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
interrupt-parent = <&gpmc>;
interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
<1 IRQ_TYPE_NONE>; /* termcount */

View File

@@ -49,7 +49,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
enc28j60.dtbo \
enc28j60-spi2.dtbo \
exc3000.dtbo \
fbtft.dtbo \
fe-pi-audio.dtbo \
fsm-demo.dtbo \
ghost-amp.dtbo \
@@ -232,7 +231,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
vc4-fkms-v3d.dtbo \
vc4-fkms-v3d-pi4.dtbo \
vc4-kms-dpi-at056tn53v1.dtbo \
vc4-kms-dpi-generic.dtbo \
vc4-kms-dsi-7inch.dtbo \
vc4-kms-dsi-lt070me05000.dtbo \
vc4-kms-dsi-lt070me05000-v2.dtbo \

View File

@@ -416,8 +416,6 @@ Info: Analog Devices ADV7282M analogue video to CSI2 bridge.
variants.
Load: dtoverlay=adv7282m,<param>=<val>
Params: addr Overrides the I2C address (default 0x21)
media-controller Configure use of Media Controller API for
configuring the sensor (default off)
Name: adv728x-m
@@ -428,8 +426,6 @@ Params: addr Overrides the I2C address (default 0x21)
adv7280m Select ADV7280-M.
adv7281m Select ADV7281-M.
adv7281ma Select ADV7281-MA.
media-controller Configure use of Media Controller API for
configuring the sensor (default off)
Name: akkordion-iqdacplus
@@ -857,130 +853,6 @@ Params: interrupt GPIO used for interrupt (default 4)
swapxy Touchscreen swapped x y axis
Name: fbtft
Info: Overlay for SPI-connected displays using the fbtft drivers.
This overlay seeks to replace the functionality provided by fbtft_device
which is now gone from the kernel.
Most displays from fbtft_device have been ported over.
Example:
dtoverlay=fbtft,spi0-0,rpi-display,reset_pin=23,dc_pin=24,led_pin=18,rotate=270
It is also possible to specify the controller (this will use the default
init sequence in the driver).
Example:
dtoverlay=fbtft,spi0-0,ili9341,bgr,reset_pin=23,dc_pin=24,led_pin=18,rotate=270
For devices on spi1 or spi2, the interfaces should be enabled
with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
The following features of fbtft_device have not been ported over:
- parallel bus is not supported
- the init property which overrides the controller initialization
sequence is not supported as a parameter due to memory limitations in
the bootloader responsible for applying the overlay.
See https://github.com/notro/fbtft/wiki/FBTFT-RPI-overlays for how to
create an overlay.
Load: dtoverlay=fbtft,<param>=<val>
Params:
spi<n>-<m> Configure device at spi<n>, cs<m>
(boolean, required)
speed SPI bus speed in Hz (default 32000000)
cpha Shifted clock phase (CPHA) mode
cpol Inverse clock polarity (CPOL) mode
adafruit18 Adafruit 1.8
adafruit22 Adafruit 2.2 (old)
adafruit22a Adafruit 2.2
adafruit28 Adafruit 2.8
adafruit13m Adafruit 1.3 OLED
admatec_c-berry28 C-Berry28
dogs102 EA DOGS102
er_tftm050_2 ER-TFTM070-2
er_tftm070_5 ER-TFTM070-5
ew24ha0 EW24HA0
ew24ha0_9bit EW24HA0 in 9-bit mode
freetronicsoled128 Freetronics OLED128
hy28a HY28A
hy28b HY28B
itdb28_spi ITDB02-2.8 with SPI interface circuit
mi0283qt-2 Watterott MI0283QT-2
mi0283qt-9a Watterott MI0283QT-9A
nokia3310 Nokia 3310
nokia3310a Nokia 3310a
nokia5110 Nokia 5110
piscreen PiScreen
pitft Adafruit PiTFT 2.8
pioled ILSoft OLED
rpi-display Watterott rpi-display
sainsmart18 Sainsmart 1.8
sainsmart32_spi Sainsmart 3.2 with SPI interfce circuit
tinylcd35 TinyLCD 3.5
tm022hdh26 Tianma TM022HDH26
tontec35_9481 Tontect 3.5 with ILI9481 controller
tontec35_9486 Tontect 3.5 with ILI9486 controller
waveshare32b Waveshare 3.2
waveshare22 Waveshare 2.2
bd663474 BD663474 display controller
hx8340bn HX8340BN display controller
hx8347d HX8347D display controller
hx8353d HX8353D display controller
hx8357d HX8357D display controller
ili9163 ILI9163 display controller
ili9320 ILI9320 display controller
ili9325 ILI9325 display controller
ili9340 ILI9340 display controller
ili9341 ILI9341 display controller
ili9481 ILI9481 display controller
ili9486 ILI9486 display controller
pcd8544 PCD8544 display controller
ra8875 RA8875 display controller
s6d02a1 S6D02A1 display controller
s6d1121 S6D1121 display controller
seps525 SEPS525 display controller
sh1106 SH1106 display controller
ssd1289 SSD1289 display controller
ssd1305 SSD1305 display controller
ssd1306 SSD1306 display controller
ssd1325 SSD1325 display controller
ssd1331 SSD1331 display controller
ssd1351 SSD1351 display controller
st7735r ST7735R display controller
st7789v ST7789V display controller
tls8204 TLS8204 display controller
uc1611 UC1611 display controller
uc1701 UC1701 display controller
upd161704 UPD161704 display controller
width Display width in pixels
height Display height in pixels
regwidth Display controller register width (default is
driver specific)
buswidth Display bus interface width (default 8)
debug Debug output level {0-7}
rotate Display rotation {0, 90, 180, 270} (counter
clockwise). Not supported by all drivers.
bgr Enable BGR mode (default off). Use if Red and
Blue are swapped. Not supported by all drivers.
fps Frames per second (default 30). In effect this
states how long the driver will wait after video
memory has been changed until display update
transfer is started.
txbuflen Length of the FBTFT transmit buffer
(default 4096)
startbyte Sets the Start byte used by fb_ili9320,
fb_ili9325 and fb_hx8347d. Common value is 0x70.
gamma String representation of Gamma Curve(s). Driver
specific. Not supported by all drivers.
reset_pin GPIO pin for RESET
dc_pin GPIO pin for D/C
led_pin GPIO pin for LED backlight
Name: fe-pi-audio
Info: Configures the Fe-Pi Audio Sound Card
Load: dtoverlay=fe-pi-audio
@@ -1155,11 +1027,6 @@ Info: Drives a GPIO high or low on poweroff (including halt). Using this
or reboot). This also disables the ability to trigger a boot by driving
GPIO3 low.
The GPIO starts in an inactive state. At poweroff time it is driven
active for 100ms, then inactive for 100ms, then active again. It is
safe to remove the power at any point after the initial activation of
the GPIO.
Users of this overlay are required to provide an external mechanism to
switch off the power supply when signalled - failure to do so results
in a kernel BUG, increased power consumption and undefined behaviour.
@@ -1175,8 +1042,6 @@ Params: gpiopin GPIO for signalling (default 26)
input Set if the gpio pin should be configured as
an input.
export Set to export the configured pin to sysfs
active_delay_ms Initial GPIO active period (default 100)
inactive_delay_ms Subsequent GPIO inactive period (default 100)
timeout_ms Specify (in ms) how long the kernel waits for
power-down before issuing a WARN (default 3000).
@@ -1843,8 +1708,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: imx290
@@ -1865,8 +1728,6 @@ Params: 4lane Enable 4 CSI2 lanes. This requires a Compute
2 = external, default external)
rotation Mounting rotation of the camera sensor (0 or
180, default 0)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: imx378
@@ -1878,8 +1739,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: imx477
@@ -1891,8 +1750,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: imx519
@@ -1904,8 +1761,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: iqaudio-codec
@@ -1969,9 +1824,8 @@ Name: irs1125
Info: Infineon irs1125 TOF camera module.
Uses Unicam 1, which is the standard camera connector on most Pi
variants.
Load: dtoverlay=irs1125,<param>=<val>
Params: media-controller Configure use of Media Controller API for
configuring the sensor (default off)
Load: dtoverlay=irs1125
Params: <None>
Name: jedec-spi-nor
@@ -2383,8 +2237,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: ov7251
@@ -2396,8 +2248,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default off)
Name: ov9281
@@ -2409,8 +2259,6 @@ Params: rotation Mounting rotation of the camera sensor (0 or
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
media-controller Configure use of Media Controller API for
configuring the sensor (default on)
Name: papirus
@@ -3391,8 +3239,6 @@ Params: 4lane Use 4 lanes (only applicable to Compute Modules
link-frequency Set the link frequency. Only values of 297000000
(574Mbit/s) and 486000000 (972Mbit/s - default)
are supported by the driver.
media-controller Configure use of Media Controller API for
configuring the sensor (default off)
Name: tc358743-audio
@@ -3563,34 +3409,6 @@ Load: dtoverlay=vc4-kms-dpi-at056tn53v1
Params: <None>
Name: vc4-kms-dpi-generic
Info: Enable a generic DPI display under KMS. Default timings are for the
Adafruit Kippah with 800x480 panel and RGB666 (GPIOs 0-21)
Requires vc4-kms-v3d to be loaded.
Load: dtoverlay=vc4-kms-dpi-generic,<param>=<val>
Params: clock-frequency Display clock frequency (Hz)
hactive Horizontal active pixels
hfp Horizontal front porch
hsync Horizontal sync pulse width
hbp Horizontal back porch
vactive Vertical active lines
vfp Vertical front porch
vsync Vertical sync pulse width
vbp Vertical back porch
hsync-invert Horizontal sync active low
vsync-invert Vertical sync active low
de-invert Data Enable active low
pixclk-invert Negative edge pixel clock
width-mm Define the screen width in mm
height-mm Define the screen height in mm
rgb565 Change to RGB565 output on GPIOs 0-19
rgb666-padhi Change to RGB666 output on GPIOs 0-9, 12-17, and
20-25
rgb888 Change to RGB888 output on GPIOs 0-27
bus-format Override the bus format for a MEDIA_BUS_FMT_*
value. NB also overridden by rgbXXX overrides.
Name: vc4-kms-dsi-7inch
Info: Enable the Raspberry Pi DSI 7" screen.
Includes the edt-ft5406 for the touchscreen element.
@@ -3648,8 +3466,8 @@ Params: cma-512 CMA is 512MB (needs 1GB)
cma-default Use upstream's default value
audio Enable or disable audio over HDMI (default "on")
noaudio Disable all HDMI audio (default "off")
composite Enable the composite output (default "off")
N.B. Disables all other outputs on a Pi 4.
nocomposite Disable the composite video output (default
"off")
Name: vc4-kms-v3d-pi4

View File

@@ -59,15 +59,7 @@
};
};
fragment@4 {
target = <&csi1>;
__dormant__ {
brcm,media-controller;
};
};
__overrides__ {
addr = <&adv728x>,"reg:0";
media-controller = <0>,"=4";
};
};

View File

@@ -8,19 +8,3 @@
/plugin/;
#include "edt-ft5406.dtsi"
/ {
fragment@0 {
target = <&i2c0if>;
__overlay__ {
status = "okay";
};
};
fragment@1 {
target = <&i2c0mux>;
__overlay__ {
status = "okay";
};
};
};

View File

@@ -27,8 +27,9 @@
__overlay__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ft5406: ts@38 {
compatible = "edt,edt-ft5506";
compatible = "edt,edt-ft5406";
reg = <0x38>;
touchscreen-size-x = < 800 >;
@@ -37,6 +38,13 @@
};
};
fragment@13 {
target = <&i2c0if>;
__overlay__ {
status = "okay";
};
};
__overrides__ {
sizex = <&ft5406>,"touchscreen-size-x:0";
sizey = <&ft5406>,"touchscreen-size-y:0";

View File

@@ -1,611 +0,0 @@
/*
* Device Tree overlay for fbtft drivers
*/
/dts-v1/;
/plugin/;
/ {
compatible = "brcm,bcm2835";
/* adafruit18 */
fragment@0 {
target = <&display>;
__dormant__ {
compatible = "sitronix,st7735r";
spi-max-frequency = <32000000>;
gamma = "02 1c 07 12 37 32 29 2d 29 25 2B 39 00 01 03 10\n03 1d 07 06 2E 2C 29 2D 2E 2E 37 3F 00 00 02 10";
};
};
/* adafruit22 */
fragment@1 {
target = <&display>;
__dormant__ {
compatible = "himax,hx8340bn";
spi-max-frequency = <32000000>;
buswidth = <9>;
bgr;
};
};
/* adafruit22a */
fragment@2 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9340";
spi-max-frequency = <32000000>;
bgr;
};
};
/* adafruit28 */
fragment@3 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9341";
spi-max-frequency = <32000000>;
bgr;
};
};
/* adafruit13m */
fragment@4 {
target = <&display>;
__dormant__ {
compatible = "solomon,ssd1306";
spi-max-frequency = <16000000>;
};
};
/* admatec_c-berry28 */
fragment@5 {
target = <&display>;
__dormant__ {
compatible = "sitronix,st7789v";
spi-max-frequency = <48000000>;
init = <0x01000011
0x02000078
0x0100003A 0x05
0x010000B2 0x0C 0x0C 0x00 0x33 0x33
0x010000B7 0x35
0x010000C2 0x01 0xFF
0x010000C3 0x17
0x010000C4 0x20
0x010000BB 0x17
0x010000C5 0x20
0x010000D0 0xA4 0xA1
0x01000029>;
gamma = "D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\nD0 00 14 15 13 0B 43 55 53 0C 17 14 23 20";
};
};
/* dogs102 */
fragment@6 {
target = <&display>;
__dormant__ {
compatible = "UltraChip,uc1701";
spi-max-frequency = <8000000>;
bgr;
};
};
/* er_tftm050_2 */
fragment@7 {
target = <&display>;
__dormant__ {
compatible = "raio,ra8875";
spi-max-frequency = <5000000>;
spi-cpha;
spi-cpol;
width = <480>;
height = <272>;
bgr;
};
};
/* er_tftm070_5 */
fragment@8 {
target = <&display>;
__dormant__ {
compatible = "raio,ra8875";
spi-max-frequency = <5000000>;
spi-cpha;
spi-cpol;
width = <800>;
height = <480>;
bgr;
};
};
/* ew24ha0 */
fragment@9 {
target = <&display>;
__dormant__ {
compatible = "ultrachip,uc1611";
spi-max-frequency = <32000000>;
spi-cpha;
spi-cpol;
};
};
/* ew24ha0_9bit */
fragment@10 {
target = <&display>;
__dormant__ {
compatible = "ultrachip,uc1611";
spi-max-frequency = <32000000>;
spi-cpha;
spi-cpol;
buswidth = <9>;
};
};
/* freetronicsoled128 */
fragment@11 {
target = <&display>;
__dormant__ {
compatible = "solomon,ssd1351";
spi-max-frequency = <20000000>;
backlight = <2>; /* FBTFT_ONBOARD_BACKLIGHT */
bgr;
};
};
/* hy28a */
fragment@12 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9320";
spi-max-frequency = <32000000>;
spi-cpha;
spi-cpol;
startbyte = <0x70>;
bgr;
};
};
/* hy28b */
fragment@13 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9325";
spi-max-frequency = <48000000>;
spi-cpha;
spi-cpol;
init = <0x010000e7 0x0010
0x01000000 0x0001
0x01000001 0x0100
0x01000002 0x0700
0x01000003 0x1030
0x01000004 0x0000
0x01000008 0x0207
0x01000009 0x0000
0x0100000a 0x0000
0x0100000c 0x0001
0x0100000d 0x0000
0x0100000f 0x0000
0x01000010 0x0000
0x01000011 0x0007
0x01000012 0x0000
0x01000013 0x0000
0x02000032
0x01000010 0x1590
0x01000011 0x0227
0x02000032
0x01000012 0x009c
0x02000032
0x01000013 0x1900
0x01000029 0x0023
0x0100002b 0x000e
0x02000032
0x01000020 0x0000
0x01000021 0x0000
0x02000032
0x01000050 0x0000
0x01000051 0x00ef
0x01000052 0x0000
0x01000053 0x013f
0x01000060 0xa700
0x01000061 0x0001
0x0100006a 0x0000
0x01000080 0x0000
0x01000081 0x0000
0x01000082 0x0000
0x01000083 0x0000
0x01000084 0x0000
0x01000085 0x0000
0x01000090 0x0010
0x01000092 0x0000
0x01000093 0x0003
0x01000095 0x0110
0x01000097 0x0000
0x01000098 0x0000
0x01000007 0x0133
0x01000020 0x0000
0x01000021 0x0000
0x02000064>;
startbyte = <0x70>;
bgr;
fps = <50>;
gamma = "04 1F 4 7 7 0 7 7 6 0\n0F 00 1 7 4 0 0 0 6 7";
};
};
/* itdb28_spi */
fragment@14 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9325";
spi-max-frequency = <32000000>;
bgr;
};
};
/* mi0283qt-2 */
fragment@15 {
target = <&display>;
__dormant__ {
compatible = "himax,hx8347d";
spi-max-frequency = <32000000>;
startbyte = <0x70>;
bgr;
};
};
/* mi0283qt-9a */
fragment@16 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9341";
spi-max-frequency = <32000000>;
buswidth = <9>;
bgr;
};
};
/* nokia3310 */
fragment@17 {
target = <&display>;
__dormant__ {
compatible = "philips,pcd8544";
spi-max-frequency = <400000>;
};
};
/* nokia3310a */
fragment@18 {
target = <&display>;
__dormant__ {
compatible = "teralane,tls8204";
spi-max-frequency = <1000000>;
};
};
/* nokia5110 */
fragment@19 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9163";
spi-max-frequency = <12000000>;
bgr;
};
};
/* piscreen */
fragment@20 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9486";
spi-max-frequency = <32000000>;
regwidth = <16>;
bgr;
};
};
/* pitft */
fragment@21 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9340";
spi-max-frequency = <32000000>;
init = <0x01000001
0x02000005
0x01000028
0x010000EF 0x03 0x80 0x02
0x010000CF 0x00 0xC1 0x30
0x010000ED 0x64 0x03 0x12 0x81
0x010000E8 0x85 0x00 0x78
0x010000CB 0x39 0x2C 0x00 0x34 0x02
0x010000F7 0x20
0x010000EA 0x00 0x00
0x010000C0 0x23
0x010000C1 0x10
0x010000C5 0x3E 0x28
0x010000C7 0x86
0x0100003A 0x55
0x010000B1 0x00 0x18
0x010000B6 0x08 0x82 0x27
0x010000F2 0x00
0x01000026 0x01
0x010000E0 0x0F 0x31 0x2B 0x0C 0x0E 0x08 0x4E 0xF1 0x37 0x07 0x10 0x03 0x0E 0x09 0x00
0x010000E1 0x00 0x0E 0x14 0x03 0x11 0x07 0x31 0xC1 0x48 0x08 0x0F 0x0C 0x31 0x36 0x0F
0x01000011
0x02000064
0x01000029
0x02000014>;
bgr;
};
};
/* pioled */
fragment@22 {
target = <&display>;
__dormant__ {
compatible = "solomon,ssd1351";
spi-max-frequency = <20000000>;
bgr;
gamma = "0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4";
};
};
/* rpi-display */
fragment@23 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9341";
spi-max-frequency = <32000000>;
bgr;
};
};
/* sainsmart18 */
fragment@24 {
target = <&display>;
__dormant__ {
compatible = "sitronix,st7735r";
spi-max-frequency = <32000000>;
};
};
/* sainsmart32_spi */
fragment@25 {
target = <&display>;
__dormant__ {
compatible = "solomon,ssd1289";
spi-max-frequency = <16000000>;
bgr;
};
};
/* tinylcd35 */
fragment@26 {
target = <&display>;
__dormant__ {
compatible = "neosec,tinylcd";
spi-max-frequency = <32000000>;
bgr;
};
};
/* tm022hdh26 */
fragment@27 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9341";
spi-max-frequency = <32000000>;
bgr;
};
};
/* tontec35_9481 - boards before 02 July 2014 */
fragment@28 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9481";
spi-max-frequency = <128000000>;
spi-cpha;
spi-cpol;
bgr;
};
};
/* tontec35_9486 - boards after 02 July 2014 */
fragment@29 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9486";
spi-max-frequency = <128000000>;
spi-cpha;
spi-cpol;
bgr;
};
};
/* waveshare32b */
fragment@30 {
target = <&display>;
__dormant__ {
compatible = "ilitek,ili9340";
spi-max-frequency = <48000000>;
init = <0x010000CB 0x39 0x2C 0x00 0x34 0x02
0x010000CF 0x00 0xC1 0x30
0x010000E8 0x85 0x00 0x78
0x010000EA 0x00 0x00
0x010000ED 0x64 0x03 0x12 0x81
0x010000F7 0x20
0x010000C0 0x23
0x010000C1 0x10
0x010000C5 0x3E 0x28
0x010000C7 0x86
0x01000036 0x28
0x0100003A 0x55
0x010000B1 0x00 0x18
0x010000B6 0x08 0x82 0x27
0x010000F2 0x00
0x01000026 0x01
0x010000E0 0x0F 0x31 0x2B 0x0C 0x0E 0x08 0x4E 0xF1 0x37 0x07 0x10 0x03 0x0E 0x09 0x00
0x010000E1 0x00 0x0E 0x14 0x03 0x11 0x07 0x31 0xC1 0x48 0x08 0x0F 0x0C 0x31 0x36 0x0F
0x01000011
0x02000078
0x01000029
0x0100002C>;
bgr;
};
};
/* waveshare22 */
fragment@31 {
target = <&display>;
__dormant__ {
compatible = "hitachi,bd663474";
spi-max-frequency = <32000000>;
spi-cpha;
spi-cpol;
};
};
spidev_fragment: fragment@100 {
target-path = "spi0/spidev@0";
__overlay__ {
status = "disabled";
};
};
display_fragment: fragment@101 {
target = <&spi0>;
__overlay__ {
/* needed to avoid dtc warning */
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
display: display@0{
reg = <0>;
spi-max-frequency = <32000000>;
fps = <30>;
buswidth = <8>;
};
};
};
__overrides__ {
spi0-0 = <&display_fragment>, "target:0=",<&spi0>,
<&spidev_fragment>, "target-path=spi0/spidev@0",
<&display>, "reg:0=0";
spi0-1 = <&display_fragment>, "target:0=",<&spi0>,
<&spidev_fragment>, "target-path=spi0/spidev@1",
<&display>, "reg:0=1";
spi1-0 = <&display_fragment>, "target:0=",<&spi1>,
<&spidev_fragment>, "target-path=spi1/spidev@0",
<&display>, "reg:0=0";
spi1-1 = <&display_fragment>, "target:0=",<&spi1>,
<&spidev_fragment>, "target-path=spi1/spidev@1",
<&display>, "reg:0=1";
spi1-2 = <&display_fragment>, "target:0=",<&spi1>,
<&spidev_fragment>, "target-path=spi1/spidev@2",
<&display>, "reg:0=2";
spi2-0 = <&display_fragment>, "target:0=",<&spi2>,
<&spidev_fragment>, "target-path=spi2/spidev@0",
<&display>, "reg:0=0";
spi2-1 = <&display_fragment>, "target:0=",<&spi2>,
<&spidev_fragment>, "target-path=spi2/spidev@1",
<&display>, "reg:0=1";
spi2-2 = <&display_fragment>, "target:0=",<&spi2>,
<&spidev_fragment>, "target-path=spi2/spidev@2",
<&display>, "reg:0=2";
speed = <&display>, "spi-max-frequency:0";
cpha = <&display>, "spi-cpha?";
cpol = <&display>, "spi-cpol?";
/* Displays */
adafruit18 = <0>, "+0";
adafruit22 = <0>, "+1";
adafruit22a = <0>, "+2";
adafruit28 = <0>, "+3";
adafruit13m = <0>, "+4";
admatec_c-berry28 = <0>, "+5";
dogs102 = <0>, "+6";
er_tftm050_2 = <0>, "+7";
er_tftm070_5 = <0>, "+8";
ew24ha0 = <0>, "+9";
ew24ha0_9bit = <0>, "+10";
freetronicsoled128 = <0>, "+11";
hy28a = <0>, "+12";
hy28b = <0>, "+13";
itdb28_spi = <0>, "+14";
mi0283qt-2 = <0>, "+15";
mi0283qt-9a = <0>, "+16";
nokia3310 = <0>, "+17";
nokia3310a = <0>, "+18";
nokia5110 = <0>, "+19";
piscreen = <0>, "+20";
pitft = <0>, "+21";
pioled = <0>, "+22";
rpi-display = <0>, "+23";
sainsmart18 = <0>, "+24";
sainsmart32_spi = <0>, "+25";
tinylcd35 = <0>, "+26";
tm022hdh26 = <0>, "+27";
tontec35_9481 = <0>, "+28";
tontec35_9486 = <0>, "+29";
waveshare32b = <0>, "+30";
waveshare22 = <0>, "+31";
/* Controllers */
bd663474 = <&display>, "compatible=hitachi,bd663474";
hx8340bn = <&display>, "compatible=himax,hx8340bn";
hx8347d = <&display>, "compatible=himax,hx8347d";
hx8353d = <&display>, "compatible=himax,hx8353d";
hx8357d = <&display>, "compatible=himax,hx8357d";
ili9163 = <&display>, "compatible=ilitek,ili9163";
ili9320 = <&display>, "compatible=ilitek,ili9320";
ili9325 = <&display>, "compatible=ilitek,ili9325";
ili9340 = <&display>, "compatible=ilitek,ili9340";
ili9341 = <&display>, "compatible=ilitek,ili9341";
ili9481 = <&display>, "compatible=ilitek,ili9481";
ili9486 = <&display>, "compatible=ilitek,ili9486";
pcd8544 = <&display>, "compatible=philips,pcd8544";
ra8875 = <&display>, "compatible=raio,ra8875";
s6d02a1 = <&display>, "compatible=samsung,s6d02a1";
s6d1121 = <&display>, "compatible=samsung,s6d1121";
seps525 = <&display>, "compatible=syncoam,seps525";
sh1106 = <&display>, "compatible=sinowealth,sh1106";
ssd1289 = <&display>, "compatible=solomon,ssd1289";
ssd1305 = <&display>, "compatible=solomon,ssd1305";
ssd1306 = <&display>, "compatible=solomon,ssd1306";
ssd1325 = <&display>, "compatible=solomon,ssd1325";
ssd1331 = <&display>, "compatible=solomon,ssd1331";
ssd1351 = <&display>, "compatible=solomon,ssd1351";
st7735r = <&display>, "compatible=sitronix,st7735r";
st7789v = <&display>, "compatible=sitronix,st7789v";
tls8204 = <&display>, "compatible=teralane,tls8204";
uc1611 = <&display>, "compatible=ultrachip,uc1611";
uc1701 = <&display>, "compatible=UltraChip,uc1701";
upd161704 = <&display>, "compatible=nec,upd161704";
width = <&display>, "width:0";
height = <&display>, "height:0";
regwidth = <&display>, "regwidth:0";
buswidth = <&display>, "buswidth:0";
debug = <&display>, "debug:0";
rotate = <&display>, "rotate:0";
bgr = <&display>, "bgr?";
fps = <&display>, "fps:0";
txbuflen = <&display>, "txbuflen:0";
startbyte = <&display>, "startbyte:0";
gamma = <&display>, "gamma";
reset_pin = <&display>, "reset-gpios:0=", <&gpio>,
<&display>, "reset-gpios:4",
<&display>, "reset-gpios:8=1"; /* GPIO_ACTIVE_LOW */
dc_pin = <&display>, "dc-gpios:0=", <&gpio>,
<&display>, "dc-gpios:4",
<&display>, "dc-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
led_pin = <&display>, "led-gpios:0=", <&gpio>,
<&display>, "led-gpios:4",
<&display>, "led-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
};
};

View File

@@ -33,7 +33,5 @@
input = <&power_ctrl>,"input?";
export = <&power_ctrl>,"export?";
timeout_ms = <&power_ctrl>,"timeout-ms:0";
active_delay_ms = <&power_ctrl>,"active-delay-ms:0";
inactive_delay_ms = <&power_ctrl>,"inactive-delay-ms:0";
};
};

View File

@@ -43,11 +43,6 @@
clocks = <&dacpro_osc>;
status = "okay";
};
hpamp: hpamp@60 {
compatible = "ti,tpa6130a2";
reg = <0x60>;
status = "disabled";
};
};
};

View File

@@ -108,16 +108,8 @@
};
};
fragment@6 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&imx219>,"rotation:0";
orientation = <&imx219>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -134,19 +134,11 @@
};
};
fragment@10 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
4lane = <0>, "-6+7-8+9";
clock-frequency = <&imx290_clk>,"clock-frequency:0",
<&imx290>,"clock-frequency:0";
rotation = <&imx290>,"rotation:0";
orientation = <&imx290>,"orientation:0";
media-controller = <0>,"=10";
};
};

View File

@@ -103,16 +103,8 @@
};
};
fragment@6 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&imx477>,"rotation:0";
orientation = <&imx477>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -108,16 +108,8 @@
};
};
fragment@6 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&imx519>,"rotation:0";
orientation = <&imx519>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -82,15 +82,4 @@
};
};
};
fragment@6 {
target = <&csi1>;
__dormant__ {
brcm,media-controller;
};
};
__overrides__ {
media-controller = <0>,"=6";
};
};

View File

@@ -87,16 +87,8 @@
};
};
fragment@6 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&ov5647>,"rotation:0";
orientation = <&ov5647>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -106,16 +106,8 @@
};
};
fragment@6 {
target = <&csi1>;
__dormant__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&ov7251>,"rotation:0";
orientation = <&ov7251>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -106,16 +106,8 @@
};
};
fragment@6 {
target = <&csi1>;
__overlay__ {
brcm,media-controller;
};
};
__overrides__ {
rotation = <&ov9281>,"rotation:0";
orientation = <&ov9281>,"orientation:0";
media-controller = <0>,"=6";
};
};

View File

@@ -100,16 +100,8 @@
};
};
fragment@9 {
target = <&csi1>;
__dormant__ {
brcm,media-controller;
};
};
__overrides__ {
4lane = <0>, "-2+3-7+8";
link-frequency = <&tc358743>,"link-frequencies#0";
media-controller = <0>,"=9";
};
};

View File

@@ -1,4 +1,4 @@
// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default,composite dwc2-overlay.dts,dr_mode=otg
// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default dwc2-overlay.dts,dr_mode=otg
/dts-v1/;
/plugin/;

View File

@@ -1,92 +0,0 @@
/*
* vc4-kms-dpi-at056tn53v1-overlay.dts
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/bcm2835.h>
/ {
compatible = "brcm,bcm2835";
fragment@0 {
target-path = "/";
__overlay__ {
panel: panel {
compatible = "panel-dpi";
width-mm = <154>;
height-mm = <83>;
bus-format = <0x1009>;
timing: panel-timing {
clock-frequency = <29500000>;
hactive = <800>;
hfront-porch = <24>;
hsync-len = <72>;
hback-porch = <96>;
hsync-active = <0>;
vactive = <480>;
vfront-porch = <3>;
vsync-len = <10>;
vback-porch = <7>;
vsync-active = <0>;
de-active = <1>;
pixelclk-active = <1>;
};
port {
panel_in: endpoint {
remote-endpoint = <&dpi_out>;
};
};
};
};
};
fragment@1 {
target = <&dpi>;
dpi_node: __overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dpi_18bit_gpio0>;
port {
dpi_out: endpoint {
remote-endpoint = <&panel_in>;
};
};
};
};
__overrides__ {
clock-frequency = <&timing>, "clock-frequency:0";
hactive = <&timing>, "hactive:0";
hfp = <&timing>, "hfront-porch:0";
hsync = <&timing>, "hsync-len:0";
hbp = <&timing>, "hback-porch:0";
vactive = <&timing>, "vactive:0";
vfp = <&timing>, "vfront-porch:0";
vsync = <&timing>, "vsync-len:0";
vbp = <&timing>, "vback-porch:0";
hsync-invert = <&timing>, "hsync-active:0=0";
vsync-invert = <&timing>, "vsync-active:0=0";
de-invert = <&timing>, "de-active:0=0";
pixclk-invert = <&timing>, "pixelclk-active:0=0";
width-mm = <&panel>, "width-mm:0";
height-mm = <&panel>, "height-mm:0";
rgb565 = <&panel>, "bus-format:0=0x1017",
<&dpi_node>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
rgb666-padhi = <&panel>, "bus-format:0=0x1015",
<&dpi_node>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
rgb888 = <&panel>, "bus-format:0=0x100a",
<&dpi_node>, "pinctrl-0:0=",<&dpi_gpio0>;
bus-format = <&panel>, "bus-format:0";
};
};

View File

@@ -113,6 +113,6 @@
};
__overrides__ {
disable_touch = <0>, "-10-11-12";
disable_touch = <0>, "-10-11-12-13";
};
};

View File

@@ -89,7 +89,7 @@
fragment@11 {
target = <&vec>;
__dormant__ {
__overlay__ {
status = "okay";
};
};
@@ -116,8 +116,8 @@
};
__overrides__ {
audio = <0>,"!13";
noaudio = <0>,"=13";
composite = <0>, "=11";
audio = <0>,"!13", <0>,"=14";
noaudio = <0>,"=13", <0>,"!14";
nocomposite = <0>, "!11";
};
};

View File

@@ -180,7 +180,7 @@
__overrides__ {
audio = <0>,"!17";
audio1 = <0>,"!18";
noaudio = <0>,"=17", <0>,"=18";
noaudio = <0>,"=17", <0>,"=18", <0>,"!19";
composite = <0>, "!1",
<0>, "!2",
<0>, "!3",

View File

@@ -198,7 +198,7 @@
clock-frequency = <19200000>;
};
pxo_board: pxo_board {
pxo_board {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <27000000>;
@@ -1148,7 +1148,7 @@
};
gpu: adreno-3xx@4300000 {
compatible = "qcom,adreno-320.2", "qcom,adreno";
compatible = "qcom,adreno-3xx";
reg = <0x04300000 0x20000>;
reg-names = "kgsl_3d0_reg_memory";
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
@@ -1163,6 +1163,7 @@
<&mmcc GFX3D_AHB_CLK>,
<&mmcc GFX3D_AXI_CLK>,
<&mmcc MMSS_IMEM_AHB_CLK>;
qcom,chipid = <0x03020002>;
iommus = <&gfx3d 0
&gfx3d 1
@@ -1261,9 +1262,9 @@
<&mmcc DSI1_BYTE_CLK>,
<&mmcc DSI_PIXEL_CLK>,
<&mmcc DSI1_ESC_CLK>;
clock-names = "iface", "bus", "core_mmss",
"src", "byte", "pixel",
"core";
clock-names = "iface_clk", "bus_clk", "core_mmss_clk",
"src_clk", "byte_clk", "pixel_clk",
"core_clk";
assigned-clocks = <&mmcc DSI1_BYTE_SRC>,
<&mmcc DSI1_ESC_SRC>,
@@ -1305,7 +1306,7 @@
reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";
clock-names = "iface_clk", "ref";
clocks = <&mmcc DSI_M_AHB_CLK>,
<&pxo_board>;
<&cxo_board>;
};

View File

@@ -19,12 +19,12 @@
stdout-path = "serial0:115200n8";
};
memory@42000000 {
memory@0 {
reg = <0x42000000 0x3e000000>;
device_type = "memory";
};
mdio0: mdio-0 {
mdio0: mdio@0 {
status = "okay";
compatible = "virtual,mdio-gpio";
gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
@@ -91,7 +91,7 @@
};
};
mdio1: mdio-1 {
mdio1: mdio@1 {
status = "okay";
compatible = "virtual,mdio-gpio";
gpios = <&qcom_pinmux 11 GPIO_ACTIVE_HIGH>,

View File

@@ -1528,8 +1528,8 @@
#phy-cells = <0>;
qcom,dsi-phy-index = <0>;
clocks = <&mmcc MDSS_AHB_CLK>, <&xo_board>;
clock-names = "iface", "ref";
clocks = <&mmcc MDSS_AHB_CLK>;
clock-names = "iface";
};
};

View File

@@ -47,7 +47,7 @@
};
gmac: eth@e0800000 {
compatible = "snps,dwmac-3.40a";
compatible = "st,spear600-gmac";
reg = <0xe0800000 0x8000>;
interrupts = <23 22>;
interrupt-names = "macirq", "eth_wake_irq";

View File

@@ -262,10 +262,10 @@
};
ab8500_ldo_aux2 {
/* Supplies the Cypress TMA140 touchscreen only with 3.0V */
/* Supplies the Cypress TMA140 touchscreen only with 3.3V */
regulator-name = "AUX2";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
ab8500_ldo_aux3 {
@@ -284,9 +284,9 @@
ab8500_ldo_aux5 {
regulator-name = "AUX5";
/* Intended for 1V8 for touchscreen but actually left unused */
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <2790000>;
regulator-always-on;
};
ab8500_ldo_aux6 {

View File

@@ -1091,7 +1091,7 @@
};
};
sai2a_pins_c: sai2a-2 {
sai2a_pins_c: sai2a-4 {
pins {
pinmux = <STM32_PINMUX('D', 13, AF10)>, /* SAI2_SCK_A */
<STM32_PINMUX('D', 11, AF10)>, /* SAI2_SD_A */
@@ -1102,7 +1102,7 @@
};
};
sai2a_sleep_pins_c: sai2a-2 {
sai2a_sleep_pins_c: sai2a-5 {
pins {
pinmux = <STM32_PINMUX('D', 13, ANALOG)>, /* SAI2_SCK_A */
<STM32_PINMUX('D', 11, ANALOG)>, /* SAI2_SD_A */
@@ -1147,14 +1147,14 @@
};
};
sai2b_pins_c: sai2b-2 {
sai2b_pins_c: sai2a-4 {
pins1 {
pinmux = <STM32_PINMUX('F', 11, AF10)>; /* SAI2_SD_B */
bias-disable;
};
};
sai2b_sleep_pins_c: sai2b-sleep-2 {
sai2b_sleep_pins_c: sai2a-sleep-5 {
pins {
pinmux = <STM32_PINMUX('F', 11, ANALOG)>; /* SAI2_SD_B */
};

View File

@@ -811,7 +811,7 @@
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-a";
reg = <0x4 0x20>;
reg = <0x4 0x1c>;
clocks = <&rcc SAI1_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 87 0x400 0x01>;
@@ -821,7 +821,7 @@
sai1b: audio-controller@4400a024 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-b";
reg = <0x24 0x20>;
reg = <0x24 0x1c>;
clocks = <&rcc SAI1_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 88 0x400 0x01>;
@@ -842,7 +842,7 @@
sai2a: audio-controller@4400b004 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-a";
reg = <0x4 0x20>;
reg = <0x4 0x1c>;
clocks = <&rcc SAI2_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 89 0x400 0x01>;
@@ -852,7 +852,7 @@
sai2b: audio-controller@4400b024 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-b";
reg = <0x24 0x20>;
reg = <0x24 0x1c>;
clocks = <&rcc SAI2_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 90 0x400 0x01>;
@@ -873,7 +873,7 @@
sai3a: audio-controller@4400c004 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-a";
reg = <0x04 0x20>;
reg = <0x04 0x1c>;
clocks = <&rcc SAI3_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 113 0x400 0x01>;
@@ -883,7 +883,7 @@
sai3b: audio-controller@4400c024 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-b";
reg = <0x24 0x20>;
reg = <0x24 0x1c>;
clocks = <&rcc SAI3_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 114 0x400 0x01>;
@@ -1250,7 +1250,7 @@
sai4a: audio-controller@50027004 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-a";
reg = <0x04 0x20>;
reg = <0x04 0x1c>;
clocks = <&rcc SAI4_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 99 0x400 0x01>;
@@ -1260,7 +1260,7 @@
sai4b: audio-controller@50027024 {
#sound-dai-cells = <0>;
compatible = "st,stm32-sai-sub-b";
reg = <0x24 0x20>;
reg = <0x24 0x1c>;
clocks = <&rcc SAI4_K>;
clock-names = "sai_ck";
dmas = <&dmamux1 100 0x400 0x01>;

View File

@@ -172,15 +172,15 @@
sgtl5000_tx_endpoint: endpoint@0 {
reg = <0>;
remote-endpoint = <&sai2a_endpoint>;
frame-master = <&sgtl5000_tx_endpoint>;
bitclock-master = <&sgtl5000_tx_endpoint>;
frame-master;
bitclock-master;
};
sgtl5000_rx_endpoint: endpoint@1 {
reg = <1>;
remote-endpoint = <&sai2b_endpoint>;
frame-master = <&sgtl5000_rx_endpoint>;
bitclock-master = <&sgtl5000_rx_endpoint>;
frame-master;
bitclock-master;
};
};

View File

@@ -185,8 +185,8 @@
&i2c4 {
hdmi-transmitter@3d {
compatible = "adi,adv7513";
reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>;
reg-names = "main", "edid", "cec", "packet";
reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>;
reg-names = "main", "cec", "edid", "packet";
clocks = <&cec_clock>;
clock-names = "cec";
@@ -204,6 +204,8 @@
adi,input-depth = <8>;
adi,input-colorspace = "rgb";
adi,input-clock = "1x";
adi,input-style = <1>;
adi,input-justification = "evenly";
ports {
#address-cells = <1>;

View File

@@ -198,7 +198,7 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-rx-bus-width = <4>;
spi-max-frequency = <50000000>;
spi-max-frequency = <108000000>;
#address-cells = <1>;
#size-cells = <1>;
};

View File

@@ -212,15 +212,15 @@
cs42l51_tx_endpoint: endpoint@0 {
reg = <0>;
remote-endpoint = <&sai2a_endpoint>;
frame-master = <&cs42l51_tx_endpoint>;
bitclock-master = <&cs42l51_tx_endpoint>;
frame-master;
bitclock-master;
};
cs42l51_rx_endpoint: endpoint@1 {
reg = <1>;
remote-endpoint = <&sai2b_endpoint>;
frame-master = <&cs42l51_rx_endpoint>;
bitclock-master = <&cs42l51_rx_endpoint>;
frame-master;
bitclock-master;
};
};
};

View File

@@ -112,7 +112,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
phy-mode = "rgmii-id";
phy-mode = "rgmii";
status = "okay";
};

View File

@@ -46,7 +46,7 @@
#include <dt-bindings/thermal/thermal.h>
/ {
cpu0_opp_table: opp-table-cpu {
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
opp-shared;
@@ -164,7 +164,7 @@
io-channels = <&ths>;
};
mali_opp_table: opp-table-gpu {
mali_opp_table: gpu-opp-table {
compatible = "operating-points-v2";
opp-144000000 {

Some files were not shown because too many files have changed in this diff Show More