Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable ARCH_BCM2835 for downstream use #1099

Merged
merged 10 commits into from
Aug 22, 2015
Merged

Enable ARCH_BCM2835 for downstream use #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6deb589
irqchip: bcm2835: Add FIQ support
notro Jun 12, 2015
41975dc
dwc_otg: Add ARCH_BCM2835 support
notro Jul 24, 2015
0b0eb55
watchdog: bcm2835: Fix poweroff behaviour
notro Jun 17, 2015
1d56de9
lirc-rpi: Make buildable on bcm2835
notro Aug 15, 2015
0a101de
i2c-bcm2708: Make buildable on bcm2835
notro Aug 15, 2015
8006482
bcm2708-i2s: Make buildable on bcm2835
notro Aug 15, 2015
307f7da
bcm2835: Match with BCM2708 Device Trees
notro Aug 15, 2015
ea7f28a
bcm2835: Sync bcm2835_defconfig with bcmrpi_defconfig
notro Aug 15, 2015
2a530a1
bcm2835: Add support for uart1
notro Aug 15, 2015
9709c65
BCM2708: Use upstream interrupt driver on all Pi1's
Aug 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ config ARCH_BCM2708
select GENERIC_CLOCKEVENTS
select ARM_ERRATA_411920
select MACH_BCM2708
select MULTI_IRQ_HANDLER
select VC4
select FIQ
help
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ifeq ($(CONFIG_OF),y)
dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb
dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb
dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-cm.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-cm.dtb
dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb

# Raspberry Pi
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/bcm2708.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@
};
};
};

&intc {
compatible = "brcm,bcm2835-armctrl-ic";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/bcm2708_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
brcm,dma-channel-mask = <0x0f35>;
};

intc: interrupt-controller {
intc: interrupt-controller@7e00b200 {
compatible = "brcm,bcm2708-armctrl-ic";
reg = <0x7e00b200 0x200>;
interrupt-controller;
Expand Down
132 changes: 115 additions & 17 deletions arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,128 @@
/dts-v1/;
#include "bcm2835-rpi.dtsi"
#include "bcm2835.dtsi"

/ {
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
model = "Raspberry Pi Model B+";
};

leds {
act {
gpios = <&gpio 47 0>;
};
&gpio {
spi0_pins: spi0_pins {
brcm,pins = <7 8 9 10 11>;
brcm,function = <4>; /* alt0 */
};

pwr {
label = "PWR";
gpios = <&gpio 35 0>;
default-state = "keep";
linux,default-trigger = "default-on";
};
i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};
};

&gpio {
pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
};

/* I2S interface */
i2s_alt0: i2s_alt0 {
i2s_pins: i2s {
brcm,pins = <18 19 20 21>;
brcm,function = <BCM2835_FSEL_ALT0>;
brcm,function = <4>; /* alt0 */
};
};

&mmc {
status = "okay";
bus-width = <4>;
};

&fb {
status = "okay";
};

&uart0 {
status = "okay";
};

&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;

spidev@0{
compatible = "spidev";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
};

spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
};
};

&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
clock-frequency = <100000>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
clock-frequency = <100000>;
};

&i2c2 {
clock-frequency = <100000>;
};

&i2s {
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>;
};

&leds {
act_led: act {
label = "led0";
linux,default-trigger = "mmc0";
gpios = <&gpio 47 0>;
};

pwr_led: pwr {
label = "led1";
linux,default-trigger = "input";
gpios = <&gpio 35 0>;
};
};

/ {
__overrides__ {
uart0 = <&uart0>,"status";
uart0_clkrate = <&clk_uart0>,"clock-frequency:0";
uart1_clkrate = <&uart1>,"clock-frequency:0";
i2s = <&i2s>,"status";
spi = <&spi0>,"status";
i2c0 = <&i2c0>,"status";
i2c1 = <&i2c1>,"status";
i2c2_iknowwhatimdoing = <&i2c2>,"status";
i2c0_baudrate = <&i2c0>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";
i2c2_baudrate = <&i2c2>,"clock-frequency:0";
core_freq = <&clk_core>,"clock-frequency:0";

act_led_gpio = <&act_led>,"gpios:4";
act_led_activelow = <&act_led>,"gpios:8";
act_led_trigger = <&act_led>,"linux,default-trigger";

pwr_led_gpio = <&pwr_led>,"gpios:4";
pwr_led_activelow = <&pwr_led>,"gpios:8";
pwr_led_trigger = <&pwr_led>,"linux,default-trigger";

audio = <&audio>,"status";
watchdog = <&watchdog>,"status";
random = <&random>,"status";
};
};
117 changes: 106 additions & 11 deletions arch/arm/boot/dts/bcm2835-rpi-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,118 @@
/dts-v1/;
#include "bcm2835-rpi.dtsi"
#include "bcm2835.dtsi"

/ {
compatible = "raspberrypi,model-b", "brcm,bcm2835";
model = "Raspberry Pi Model B";

leds {
act {
gpios = <&gpio 16 1>;
};
};
};

&gpio {
pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
spi0_pins: spi0_pins {
brcm,pins = <7 8 9 10 11>;
brcm,function = <4>; /* alt0 */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

/* I2S interface */
i2s_alt2: i2s_alt2 {
i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
};

i2s_pins: i2s {
brcm,pins = <28 29 30 31>;
brcm,function = <BCM2835_FSEL_ALT2>;
brcm,function = <6>; /* alt2 */
};
};

&mmc {
status = "okay";
bus-width = <4>;
};

&fb {
status = "okay";
};

&uart0 {
status = "okay";
};

&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;

spidev@0{
compatible = "spidev";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
};

spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
};
};

&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
clock-frequency = <100000>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
clock-frequency = <100000>;
};

&i2c2 {
clock-frequency = <100000>;
};

&i2s {
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>;
};

&leds {
act_led: act {
label = "led0";
linux,default-trigger = "mmc0";
gpios = <&gpio 16 1>;
};
};

/ {
__overrides__ {
uart0 = <&uart0>,"status";
uart0_clkrate = <&clk_uart0>,"clock-frequency:0";
uart1_clkrate = <&uart1>,"clock-frequency:0";
i2s = <&i2s>,"status";
spi = <&spi0>,"status";
i2c0 = <&i2c0>,"status";
i2c1 = <&i2c1>,"status";
i2c2_iknowwhatimdoing = <&i2c2>,"status";
i2c0_baudrate = <&i2c0>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";
i2c2_baudrate = <&i2c2>,"clock-frequency:0";
core_freq = <&clk_core>,"clock-frequency:0";

act_led_gpio = <&act_led>,"gpios:4";
act_led_activelow = <&act_led>,"gpios:8";
act_led_trigger = <&act_led>,"linux,default-trigger";

audio = <&audio>,"status";
watchdog = <&watchdog>,"status";
random = <&random>,"status";
};
};
Loading