Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6495c4d2
Commit
6495c4d2
authored
Nov 11, 2016
by
Eric Anholt
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bcm2835-dt-next' into bcm2835-dt-64-next
parents
4f24450c
731b26a6
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
593 additions
and
21 deletions
+593
-21
Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt
...ntation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt
+1
-1
Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt
...tion/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt
+17
-0
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+66
-1
arch/arm/boot/dts/bcm2835-rpi-a.dts
arch/arm/boot/dts/bcm2835-rpi-a.dts
+68
-1
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+67
-1
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+67
-1
arch/arm/boot/dts/bcm2835-rpi-b.dts
arch/arm/boot/dts/bcm2835-rpi-b.dts
+68
-1
arch/arm/boot/dts/bcm2835-rpi-zero.dts
arch/arm/boot/dts/bcm2835-rpi-zero.dts
+1
-1
arch/arm/boot/dts/bcm2835-rpi.dtsi
arch/arm/boot/dts/bcm2835-rpi.dtsi
+9
-6
arch/arm/boot/dts/bcm2835.dtsi
arch/arm/boot/dts/bcm2835.dtsi
+6
-0
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+1
-1
arch/arm/boot/dts/bcm2836.dtsi
arch/arm/boot/dts/bcm2836.dtsi
+6
-0
arch/arm/boot/dts/bcm283x.dtsi
arch/arm/boot/dts/bcm283x.dtsi
+211
-1
drivers/pinctrl/bcm/pinctrl-bcm2835.c
drivers/pinctrl/bcm/pinctrl-bcm2835.c
+0
-6
include/dt-bindings/pinctrl/bcm2835.h
include/dt-bindings/pinctrl/bcm2835.h
+5
-0
No files found.
Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt
View file @
6495c4d2
...
...
@@ -12,7 +12,7 @@ Required properties:
Example:
mailbox: mailbox@7e00b8
0
0 {
mailbox: mailbox@7e00b8
8
0 {
compatible = "brcm,bcm2835-mbox";
reg = <0x7e00b880 0x40>;
interrupts = <0 1>;
...
...
Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt
0 → 100644
View file @
6495c4d2
Binding for Thermal Sensor driver for BCM2835 SoCs.
Required parameters:
-------------------
compatible: should be one of: "brcm,bcm2835-thermal",
"brcm,bcm2836-thermal" or "brcm,bcm2837-thermal"
reg: Address range of the thermal registers.
clocks: Phandle of the clock used by the thermal sensor.
Example:
thermal: thermal@7e212000 {
compatible = "brcm,bcm2835-thermal";
reg = <0x7e212000 0x8>;
clocks = <&clocks BCM2835_CLOCK_TSENS>;
};
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View file @
6495c4d2
...
...
@@ -22,7 +22,72 @@ pwr {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
&
alt3
>;
/*
*
This
is
based
on
the
unreleased
schematic
for
the
Model
A
+.
*
*
Legend
:
*
"NC"
=
not
connected
(
no
rail
from
the
SoC
)
*
"FOO"
=
GPIO
line
named
"FOO"
on
the
schematic
*
"FOO_N"
=
GPIO
line
named
"FOO"
on
schematic
,
active
low
*/
gpio
-
line
-
names
=
"SDA0"
,
"SCL0"
,
"SDA1"
,
"SCL1"
,
"GPIO_GCLK"
,
"GPIO5"
,
"GPIO6"
,
"SPI_CE1_N"
,
"SPI_CE0_N"
,
"SPI_MISO"
,
"SPI_MOSI"
,
"SPI_SCLK"
,
"GPIO12"
,
"GPIO13"
,
/*
Serial
port
*/
"TXD0"
,
"RXD0"
,
"GPIO16"
,
"GPIO17"
,
"GPIO18"
,
"GPIO19"
,
"GPIO20"
,
"GPIO21"
,
"GPIO22"
,
"GPIO23"
,
"GPIO24"
,
"GPIO25"
,
"GPIO26"
,
"GPIO27"
,
"SDA0"
,
"SCL0"
,
"NC"
,
/*
GPIO30
*/
"NC"
,
/*
GPIO31
*/
"NC"
,
/*
GPIO32
*/
"NC"
,
/*
GPIO33
*/
"NC"
,
/*
GPIO34
*/
"PWR_LOW_N"
,
/*
GPIO35
*/
"NC"
,
/*
GPIO36
*/
"NC"
,
/*
GPIO37
*/
"NC"
,
/*
GPIO38
*/
"NC"
,
/*
GPIO39
*/
"PWM0_OUT"
,
/*
GPIO40
*/
"CAM_GPIO0"
,
/*
GPIO41
*/
"NC"
,
/*
GPIO42
*/
"NC"
,
/*
GPIO43
*/
"NC"
,
/*
GPIO44
*/
"PWM1_OUT"
,
/*
GPIO45
*/
"HDMI_HPD_N"
,
"STATUS_LED"
,
/*
Used
by
SD
Card
*/
"SD_CLK_R"
,
"SD_CMD_R"
,
"SD_DATA0_R"
,
"SD_DATA1_R"
,
"SD_DATA2_R"
,
"SD_DATA3_R"
;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
>;
/*
I2S
interface
*/
i2s_alt0
:
i2s_alt0
{
...
...
arch/arm/boot/dts/bcm2835-rpi-a.dts
View file @
6495c4d2
...
...
@@ -15,7 +15,74 @@ act {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt2
&
alt3
>;
/*
*
Taken
from
Raspberry
-
Pi
-
Rev
-
1.0
-
Model
-
AB
-
Schematics
.
pdf
*
RPI00021
sheet
02
*
*
Legend
:
*
"NC"
=
not
connected
(
no
rail
from
the
SoC
)
*
"FOO"
=
GPIO
line
named
"FOO"
on
the
schematic
*
"FOO_N"
=
GPIO
line
named
"FOO"
on
schematic
,
active
low
*/
gpio
-
line
-
names
=
"SDA0"
,
"SCL0"
,
"SDA1"
,
"SCL1"
,
"GPIO_GCLK"
,
"CAM_CLK"
,
"LAN_RUN"
,
"SPI_CE1_N"
,
"SPI_CE0_N"
,
"SPI_MISO"
,
"SPI_MOSI"
,
"SPI_SCLK"
,
"NC"
,
/*
GPIO12
*/
"NC"
,
/*
GPIO13
*/
/*
Serial
port
*/
"TXD0"
,
"RXD0"
,
"STATUS_LED_N"
,
"GPIO17"
,
"GPIO18"
,
"NC"
,
/*
GPIO19
*/
"NC"
,
/*
GPIO20
*/
"GPIO21"
,
"GPIO22"
,
"GPIO23"
,
"GPIO24"
,
"GPIO25"
,
"NC"
,
/*
GPIO26
*/
"CAM_GPIO"
,
/*
Binary
number
representing
build
/
revision
*/
"CONFIG0"
,
"CONFIG1"
,
"CONFIG2"
,
"CONFIG3"
,
"NC"
,
/*
GPIO32
*/
"NC"
,
/*
GPIO33
*/
"NC"
,
/*
GPIO34
*/
"NC"
,
/*
GPIO35
*/
"NC"
,
/*
GPIO36
*/
"NC"
,
/*
GPIO37
*/
"NC"
,
/*
GPIO38
*/
"NC"
,
/*
GPIO39
*/
"PWM0_OUT"
,
"NC"
,
/*
GPIO41
*/
"NC"
,
/*
GPIO42
*/
"NC"
,
/*
GPIO43
*/
"NC"
,
/*
GPIO44
*/
"PWM1_OUT"
,
"HDMI_HPD_P"
,
"SD_CARD_DET"
,
/*
Used
by
SD
Card
*/
"SD_CLK_R"
,
"SD_CMD_R"
,
"SD_DATA0_R"
,
"SD_DATA1_R"
,
"SD_DATA2_R"
,
"SD_DATA3_R"
;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt2
>;
/*
I2S
interface
*/
i2s_alt2
:
i2s_alt2
{
...
...
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View file @
6495c4d2
...
...
@@ -23,7 +23,73 @@ pwr {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
&
alt3
>;
/*
*
Taken
from
Raspberry
-
Pi
-
B
-
Plus
-
V1
.2
-
Schematics
.
pdf
*
RPI
-
BPLUS
sheet
1
*
*
Legend
:
*
"NC"
=
not
connected
(
no
rail
from
the
SoC
)
*
"FOO"
=
GPIO
line
named
"FOO"
on
the
schematic
*
"FOO_N"
=
GPIO
line
named
"FOO"
on
schematic
,
active
low
*/
gpio
-
line
-
names
=
"SDA0"
,
"SCL0"
,
"SDA1"
,
"SCL1"
,
"GPIO_GCLK"
,
"GPIO5"
,
"GPIO6"
,
"SPI_CE1_N"
,
"SPI_CE0_N"
,
"SPI_MISO"
,
"SPI_MOSI"
,
"SPI_SCLK"
,
"GPIO12"
,
"GPIO13"
,
/*
Serial
port
*/
"TXD0"
,
"RXD0"
,
"GPIO16"
,
"GPIO17"
,
"GPIO18"
,
"GPIO19"
,
"GPIO20"
,
"GPIO21"
,
"GPIO22"
,
"GPIO23"
,
"GPIO24"
,
"GPIO25"
,
"GPIO26"
,
"GPIO27"
,
"SDA0"
,
"SCL0"
,
"NC"
,
/*
GPIO30
*/
"LAN_RUN"
,
/*
GPIO31
*/
"CAM_GPIO1"
,
/*
GPIO32
*/
"NC"
,
/*
GPIO33
*/
"NC"
,
/*
GPIO34
*/
"PWR_LOW_N"
,
/*
GPIO35
*/
"NC"
,
/*
GPIO36
*/
"NC"
,
/*
GPIO37
*/
"NC"
,
/*
GPIO38
*/
"NC"
,
/*
GPIO39
*/
"PWM0_OUT"
,
/*
GPIO40
*/
"CAM_GPIO0"
,
/*
GPIO41
*/
"NC"
,
/*
GPIO42
*/
"NC"
,
/*
GPIO43
*/
"ETHCLK"
,
/*
GPIO44
*/
"PWM1_OUT"
,
/*
GPIO45
*/
"HDMI_HPD_N"
,
"STATUS_LED"
,
/*
Used
by
SD
Card
*/
"SD_CLK_R"
,
"SD_CMD_R"
,
"SD_DATA0_R"
,
"SD_DATA1_R"
,
"SD_DATA2_R"
,
"SD_DATA3_R"
;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
>;
/*
I2S
interface
*/
i2s_alt0
:
i2s_alt0
{
...
...
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View file @
6495c4d2
...
...
@@ -16,7 +16,73 @@ act {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt2
&
alt3
>;
/*
*
Taken
from
Raspberry
-
Pi
-
Rev
-
2.0
-
Model
-
AB
-
Schematics
.
pdf
*
RPI00022
sheet
02
*
*
Legend
:
*
"NC"
=
not
connected
(
no
rail
from
the
SoC
)
*
"FOO"
=
GPIO
line
named
"FOO"
on
the
schematic
*
"FOO_N"
=
GPIO
line
named
"FOO"
on
schematic
,
active
low
*/
gpio
-
line
-
names
=
"SDA0"
,
"SCL0"
,
"SDA1"
,
"SCL1"
,
"GPIO_GCLK"
,
"CAM_CLK"
,
"LAN_RUN"
,
"SPI_CE1_N"
,
"SPI_CE0_N"
,
"SPI_MISO"
,
"SPI_MOSI"
,
"SPI_SCLK"
,
"NC"
,
/*
GPIO12
*/
"NC"
,
/*
GPIO13
*/
/*
Serial
port
*/
"TXD0"
,
"RXD0"
,
"STATUS_LED_N"
,
"GPIO17"
,
"GPIO18"
,
"NC"
,
/*
GPIO19
*/
"NC"
,
/*
GPIO20
*/
"CAM_GPIO"
,
"GPIO22"
,
"GPIO23"
,
"GPIO24"
,
"GPIO25"
,
"NC"
,
/*
GPIO26
*/
"GPIO27"
,
"GPIO28"
,
"GPIO29"
,
"GPIO30"
,
"GPIO31"
,
"NC"
,
/*
GPIO32
*/
"NC"
,
/*
GPIO33
*/
"NC"
,
/*
GPIO34
*/
"NC"
,
/*
GPIO35
*/
"NC"
,
/*
GPIO36
*/
"NC"
,
/*
GPIO37
*/
"NC"
,
/*
GPIO38
*/
"NC"
,
/*
GPIO39
*/
"PWM0_OUT"
,
"NC"
,
/*
GPIO41
*/
"NC"
,
/*
GPIO42
*/
"NC"
,
/*
GPIO43
*/
"NC"
,
/*
GPIO44
*/
"PWM1_OUT"
,
"HDMI_HPD_P"
,
"SD_CARD_DET"
,
/*
Used
by
SD
Card
*/
"SD_CLK_R"
,
"SD_CMD_R"
,
"SD_DATA0_R"
,
"SD_DATA1_R"
,
"SD_DATA2_R"
,
"SD_DATA3_R"
;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt2
>;
/*
I2S
interface
*/
i2s_alt2
:
i2s_alt2
{
...
...
arch/arm/boot/dts/bcm2835-rpi-b.dts
View file @
6495c4d2
...
...
@@ -16,7 +16,74 @@ act {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
alt3
>;
/*
*
Taken
from
Raspberry
-
Pi
-
Rev
-
1.0
-
Model
-
AB
-
Schematics
.
pdf
*
RPI00021
sheet
02
*
*
Legend
:
*
"NC"
=
not
connected
(
no
rail
from
the
SoC
)
*
"FOO"
=
GPIO
line
named
"FOO"
on
the
schematic
*
"FOO_N"
=
GPIO
line
named
"FOO"
on
schematic
,
active
low
*/
gpio
-
line
-
names
=
"SDA0"
,
"SCL0"
,
"SDA1"
,
"SCL1"
,
"GPIO_GCLK"
,
"CAM_CLK"
,
"LAN_RUN"
,
"SPI_CE1_N"
,
"SPI_CE0_N"
,
"SPI_MISO"
,
"SPI_MOSI"
,
"SPI_SCLK"
,
"NC"
,
/*
GPIO12
*/
"NC"
,
/*
GPIO13
*/
/*
Serial
port
*/
"TXD0"
,
"RXD0"
,
"STATUS_LED_N"
,
"GPIO17"
,
"GPIO18"
,
"NC"
,
/*
GPIO19
*/
"NC"
,
/*
GPIO20
*/
"GPIO21"
,
"GPIO22"
,
"GPIO23"
,
"GPIO24"
,
"GPIO25"
,
"NC"
,
/*
GPIO26
*/
"CAM_GPIO"
,
/*
Binary
number
representing
build
/
revision
*/
"CONFIG0"
,
"CONFIG1"
,
"CONFIG2"
,
"CONFIG3"
,
"NC"
,
/*
GPIO32
*/
"NC"
,
/*
GPIO33
*/
"NC"
,
/*
GPIO34
*/
"NC"
,
/*
GPIO35
*/
"NC"
,
/*
GPIO36
*/
"NC"
,
/*
GPIO37
*/
"NC"
,
/*
GPIO38
*/
"NC"
,
/*
GPIO39
*/
"PWM0_OUT"
,
"NC"
,
/*
GPIO41
*/
"NC"
,
/*
GPIO42
*/
"NC"
,
/*
GPIO43
*/
"NC"
,
/*
GPIO44
*/
"PWM1_OUT"
,
"HDMI_HPD_P"
,
"SD_CARD_DET"
,
/*
Used
by
SD
Card
*/
"SD_CLK_R"
,
"SD_CMD_R"
,
"SD_DATA0_R"
,
"SD_DATA1_R"
,
"SD_DATA2_R"
,
"SD_DATA3_R"
;
pinctrl
-
0
=
<&
gpioout
&
alt0
>;
};
&
hdmi
{
...
...
arch/arm/boot/dts/bcm2835-rpi-zero.dts
View file @
6495c4d2
...
...
@@ -26,7 +26,7 @@ act {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
&
alt3
>;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
>;
/*
I2S
interface
*/
i2s_alt0
:
i2s_alt0
{
...
...
arch/arm/boot/dts/bcm2835-rpi.dtsi
View file @
6495c4d2
...
...
@@ -39,22 +39,21 @@ gpioout: gpioout {
};
alt0: alt0 {
brcm,pins = <
0 1 2 3 4 5 7 8 9 10 11 14 15 40 4
5>;
brcm,pins = <
4 5 7 8 9 10 11 14 1
5>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
alt3: alt3 {
brcm,pins = <48 49 50 51 52 53>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_gpio0>;
status = "okay";
clock-frequency = <100000>;
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_gpio2>;
status = "okay";
clock-frequency = <100000>;
};
...
...
@@ -64,11 +63,15 @@ &i2c2 {
};
&sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio48>;
status = "okay";
bus-width = <4>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
status = "okay";
};
...
...
arch/arm/boot/dts/bcm2835.dtsi
View file @
6495c4d2
...
...
@@ -23,3 +23,9 @@ arm-pmu {
};
};
};
/* enable thermal sensor with the correct compatible property set */
&thermal {
compatible = "brcm,bcm2835-thermal";
status = "okay";
};
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View file @
6495c4d2
...
...
@@ -27,7 +27,7 @@ pwr {
};
&
gpio
{
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
&
alt3
>;
pinctrl
-
0
=
<&
gpioout
&
alt0
&
i2s_alt0
>;
/*
I2S
interface
*/
i2s_alt0
:
i2s_alt0
{
...
...
arch/arm/boot/dts/bcm2836.dtsi
View file @
6495c4d2
...
...
@@ -76,3 +76,9 @@ &intc {
interrupt-parent = <&local_intc>;
interrupts = <8>;
};
/* enable thermal sensor with the correct compatible property set */
&thermal {
compatible = "brcm,bcm2836-thermal";
status = "okay";
};
arch/arm/boot/dts/bcm283x.dtsi
View file @
6495c4d2
...
...
@@ -104,7 +104,7 @@ rng@7e104000 {
reg
=
<
0x7e104000
0x10
>;
};
mailbox
:
mailbox
@
7e00
b8
0
0
{
mailbox
:
mailbox
@
7e00
b8
8
0
{
compatible
=
"brcm,bcm2835-mbox"
;
reg
=
<
0x7e00b880
0x40
>;
interrupts
=
<
0
1
>;
...
...
@@ -132,6 +132,209 @@ gpio: gpio@7e200000 {
interrupt-controller;
#interrupt-cells = <2>;
/* Defines pin muxing groups according to
* BCM2835-ARM-Peripherals.pdf page 102.
*
* While each pin can have its mux selected
* for various functions individually, some
* groups only make sense to switch to a
* particular function together.
*/
dpi_gpio0: dpi_gpio0 {
brcm,pins = <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>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
emmc_gpio22: emmc_gpio22 {
brcm,pins = <22 23 24 25 26 27>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
emmc_gpio34: emmc_gpio34 {
brcm,pins = <34 35 36 37 38 39>;
brcm,function = <BCM2835_FSEL_ALT3>;
brcm,pull = <BCM2835_PUD_OFF
BCM2835_PUD_UP
BCM2835_PUD_UP
BCM2835_PUD_UP
BCM2835_PUD_UP
BCM2835_PUD_UP>;
};
emmc_gpio48: emmc_gpio48 {
brcm,pins = <48 49 50 51 52 53>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
gpclk0_gpio4: gpclk0_gpio4 {
brcm,pins = <4>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
gpclk1_gpio5: gpclk1_gpio5 {
brcm,pins = <5>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
gpclk1_gpio42: gpclk1_gpio42 {
brcm,pins = <42>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
gpclk1_gpio44: gpclk1_gpio44 {
brcm,pins = <44>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
gpclk2_gpio6: gpclk2_gpio6 {
brcm,pins = <6>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
gpclk2_gpio43: gpclk2_gpio43 {
brcm,pins = <43>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
i2c0_gpio0: i2c0_gpio0 {
brcm,pins = <0 1>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
i2c0_gpio32: i2c0_gpio32 {
brcm,pins = <32 34>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
i2c0_gpio44: i2c0_gpio44 {
brcm,pins = <44 45>;
brcm,function = <BCM2835_FSEL_ALT1>;
};
i2c1_gpio2: i2c1_gpio2 {
brcm,pins = <2 3>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
i2c1_gpio44: i2c1_gpio44 {
brcm,pins = <44 45>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
i2c_slave_gpio18: i2c_slave_gpio18 {
brcm,pins = <18 19 20 21>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
jtag_gpio4: jtag_gpio4 {
brcm,pins = <4 5 6 12 13>;
brcm,function = <BCM2835_FSEL_ALT4>;
};
jtag_gpio22: jtag_gpio22 {
brcm,pins = <22 23 24 25 26 27>;
brcm,function = <BCM2835_FSEL_ALT4>;
};
pcm_gpio18: pcm_gpio18 {
brcm,pins = <18 19 20 21>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
pcm_gpio28: pcm_gpio28 {
brcm,pins = <28 29 30 31>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
pwm0_gpio12: pwm0_gpio12 {
brcm,pins = <12>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
pwm0_gpio18: pwm0_gpio18 {
brcm,pins = <18>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
pwm0_gpio40: pwm0_gpio40 {
brcm,pins = <40>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
pwm1_gpio13: pwm1_gpio13 {
brcm,pins = <13>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
pwm1_gpio19: pwm1_gpio19 {
brcm,pins = <19>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
pwm1_gpio41: pwm1_gpio41 {
brcm,pins = <41>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
pwm1_gpio45: pwm1_gpio45 {
brcm,pins = <45>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
sdhost_gpio48: sdhost_gpio48 {
brcm,pins = <48 49 50 51 52 53>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
spi0_gpio7: spi0_gpio7 {
brcm,pins = <7 8 9 10 11>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
spi0_gpio35: spi0_gpio35 {
brcm,pins = <35 36 37 38 39>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
spi1_gpio16: spi1_gpio16 {
brcm,pins = <16 17 18 19 20 21>;
brcm,function = <BCM2835_FSEL_ALT4>;
};
spi2_gpio40: spi2_gpio40 {
brcm,pins = <40 41 42 43 44 45>;
brcm,function = <BCM2835_FSEL_ALT4>;
};
uart0_gpio14: uart0_gpio14 {
brcm,pins = <14 15>;
brcm,function = <BCM2835_FSEL_ALT0>;
};
/* Separate from the uart0_gpio14 group
* because it conflicts with spi1_gpio16, and
* people often run uart0 on the two pins
* without flow contrl.
*/
uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
brcm,pins = <16 17>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
uart0_gpio30: uart0_gpio30 {
brcm,pins = <30 31>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 {
brcm,pins = <32 33>;
brcm,function = <BCM2835_FSEL_ALT3>;
};
uart1_gpio14: uart1_gpio14 {
brcm,pins = <14 15>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
uart1_ctsrts_gpio16: uart1_ctsrts_gpio16 {
brcm,pins = <16 17>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
uart1_gpio32: uart1_gpio32 {
brcm,pins = <32 33>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
uart1_ctsrts_gpio30: uart1_ctsrts_gpio30 {
brcm,pins = <30 31>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
uart1_gpio36: uart1_gpio36 {
brcm,pins = <36 37 38 39>;
brcm,function = <BCM2835_FSEL_ALT2>;
};
uart1_gpio40: uart1_gpio40 {
brcm,pins = <40 41>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 {
brcm,pins = <42 43>;
brcm,function = <BCM2835_FSEL_ALT5>;
};
};
uart0: serial@7e201000 {
...
...
@@ -187,6 +390,13 @@ pixelvalve@7e207000 {
interrupts = <2 14>; /* pwa1 */
};
thermal: thermal@7e212000 {
compatible = "brcm,bcm2835-thermal";
reg = <0x7e212000 0x8>;
clocks = <&clocks BCM2835_CLOCK_TSENS>;
status = "disabled";
};
aux: aux@0x7e215000 {
compatible = "brcm,bcm2835-aux";
#clock-cells = <1>;
...
...
drivers/pinctrl/bcm/pinctrl-bcm2835.c
View file @
6495c4d2
...
...
@@ -76,12 +76,6 @@ enum bcm2835_pinconf_param {
BCM2835_PINCONF_PARAM_PULL
,
};
enum
bcm2835_pinconf_pull
{
BCM2835_PINCONFIG_PULL_NONE
,
BCM2835_PINCONFIG_PULL_DOWN
,
BCM2835_PINCONFIG_PULL_UP
,
};
#define BCM2835_PINCONF_PACK(_param_, _arg_) ((_param_) << 16 | (_arg_))
#define BCM2835_PINCONF_UNPACK_PARAM(_conf_) ((_conf_) >> 16)
#define BCM2835_PINCONF_UNPACK_ARG(_conf_) ((_conf_) & 0xffff)
...
...
include/dt-bindings/pinctrl/bcm2835.h
View file @
6495c4d2
...
...
@@ -24,4 +24,9 @@
#define BCM2835_FSEL_ALT2 6
#define BCM2835_FSEL_ALT3 7
/* brcm,pull property */
#define BCM2835_PUD_OFF 0
#define BCM2835_PUD_DOWN 1
#define BCM2835_PUD_UP 2
#endif
/* __DT_BINDINGS_PINCTRL_BCM2835_H__ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment