leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DT Changes for 4.8 #2:

Browse Source 
- New board: at91sam9260ek
  - Fixes for the sam9_l9260
  - Sama5d2 Xplained PMIC fix
  - Addition of the PMU node for the sama5d2
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXem7KAAoJENiigzvaE+LCxNYP/19OGNvo56+RwyuLXbdIzzen
 1UsOUsYd1GBs/tuGzAmVPhgtnmjP4zKqUN2Vxvqpk2hq4sqKx4n47igsH+upqarQ
 q4Z9a0bqdqFUzyiq9ajQaNdM8axzz/Ydc21Kup1b6eJBLLU/JDys2d3UxHM3oY2Y
 IjsDNVMX5J/m8ihCy+YajuBH/3zqXcZOH3DY7TfWXaKr/FgDsQAafFny2nA4xcyO
 bGU4ucM3z58RyqCAgCKnj9k5Kc3gVsdHj6TbfIincX+P1Lh4o65D011pzxWFk8ag
 /TeWjRdQ3QpP2Lu8U3iDqN/zpsymGSW8Yc1DYzNPpQiId5rTNsNA0wOXCXvXTWka
 5ZpBo7nkpD5ZpaJJUhV0X3+Hu9D8jlGQumXDVLzeOLpNradLh6hGFbwrhfPFQydp
 Y3gbpaTR8Dc4Sz54Q4fWkrGKjrOXXaUXEh0T1KgxTrKOK3HNNWkK16DMAClGC8v3
 7+AEw6Jb0TaBfOGmU81PaIxXhU/jMn6xyqdFAhtz1Na3+4b4mhFhu9ZO6/JqHpIC
 8TvFRIMrTCQ6IBrwW+q1EI+hD07ucHDRIzn3Me/CE+WbNwuIO+gRZVyDHvbj1DjH
 kRxEnyYW4UxZrasF2JpqSXb5JF4paSI1l+0yIPhleQ9DJTAqp4dJA0/PlSffEfJI
 H/rbrSzD5M1Tu6Fy+Le9
 =F38N
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT Changes for 4.8 #2:
 - New board: at91sam9260ek
 - Fixes for the sam9_l9260
 - Sama5d2 Xplained PMIC fix
 - Addition of the PMU node for the sama5d2

* tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2_xplained: Update the pmic node
  ARM: dts: at91: sama5d2: add PMU node
  ARM: dts: at91: sam9_l9260: Modify information in LED nodes.
  ARM: dts: at91: sam9_l9260: Add pinctrl information to ethernet node.
  ARM: dts: at91: add at91sam9260ek board DT

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-07-04 21:15:39 -07:00
commit 35902cf1da
5 changed files with 259 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -17,6 +17,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
evk-pro3.dtb \
tny_a9260.dtb \
usb_a9260.dtb \
at91sam9260ek.dtb \
at91sam9261ek.dtb \
at91sam9263ek.dtb \
at91-sam9_l9260.dtb \

14
arch/arm/boot/dts/at91-sam9_l9260.dts
View File

@ -49,6 +49,7 @@
};
macb0: ethernet@fffc4000 {
pinctrl-0 = <&pinctrl_macb_rmii &pinctrl_macb_rmii_mii_alt>;
phy-mode = "mii";
#address-cells = <1>;
#size-cells = <0>;
@ -105,11 +106,16 @@
leds {
compatible = "gpio-leds";
b0 {
label = "b0";
gpios = <&pioA 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
pwr_led {
label = "sam9-l9260:yellow:pwr";
gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "cpu0";
};
status_led {
label = "sam9-l9260:green:status";
gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
linux,default-trigger = "timer";
};
};
};

41
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View File

@ -158,56 +158,64 @@
i2c-sda-hold-time-ns = <350>;
status = "okay";
pmic: act8865@5b {
compatible = "active-semi,act8865";
pmic@5b {
compatible = "active-semi,act8945a";
reg = <0x5b>;
active-semi,vsel-high;
active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
active-semi,irq_gpios = <&pioA 45 GPIO_ACTIVE_LOW>;
active-semi,input-voltage-threshold-microvolt = <6600>;
active-semi,precondition-timeout = <40>;
active-semi,total-timeout = <3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
status = "okay";
regulators {
vdd_1v35_reg: DCDC_REG1 {
vdd_1v35_reg: REG_DCDC1 {
regulator-name = "VDD_1V35";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
};
vdd_1v2_reg: DCDC_REG2 {
vdd_1v2_reg: REG_DCDC2 {
regulator-name = "VDD_1V2";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1300000>;
regulator-always-on;
};
vdd_3v3_reg: DCDC_REG3 {
vdd_3v3_reg: REG_DCDC3 {
regulator-name = "VDD_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vdd_fuse_reg: LDO_REG1 {
vdd_fuse_reg: REG_LDO1 {
regulator-name = "VDD_FUSE";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
vdd_3v3_lp_reg: LDO_REG2 {
vdd_3v3_lp_reg: REG_LDO2 {
regulator-name = "VDD_3V3_LP";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vdd_led_reg: LDO_REG3 {
vdd_led_reg: REG_LDO3 {
regulator-name = "VDD_LED";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vdd_sdhc_1v8_reg: LDO_REG4 {
vdd_sdhc_1v8_reg: REG_LDO4 {
regulator-name = "VDD_SDHC_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@ -309,6 +317,21 @@
bias-disable;
};
pinctrl_charger_chglev: charger_chglev {
pinmux = <PIN_PA12__GPIO>;
bias-disable;
};
pinctrl_charger_irq: charger_irq {
pinmux = <PIN_PB13__GPIO>;
bias-disable;
};
pinctrl_charger_lbo: charger_lbo {
pinmux = <PIN_PC8__GPIO>;
bias-pull-up;
};
pinctrl_flx0_default: flx0_default {
pinmux = <PIN_PB28__FLEXCOM0_IO0>,
<PIN_PB29__FLEXCOM0_IO1>;

211
arch/arm/boot/dts/at91sam9260ek.dts Normal file
View File

@ -0,0 +1,211 @@
/*
* Device Tree file for Atmel at91sam9260 Evaluation Kit
*
* Copyright (C) 2016 Atmel,
* 2016 Nicolas Ferre <nicolas.ferre@atmel.com>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "at91sam9260.dtsi"
/ {
model = "Atmel at91sam9260ek";
compatible = "atmel,at91sam9260ek", "atmel,at91sam9260", "atmel,at91sam9";
chosen {
stdout-path = &dbgu;
};
memory {
reg = <0x20000000 0x4000000>;
};
clocks {
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <18432000>;
};
};
ahb {
apb {
usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
mmc0: mmc@fffa8000 {
pinctrl-0 = <
&pinctrl_board_mmc0_slot1
&pinctrl_mmc0_clk
&pinctrl_mmc0_slot1_cmd_dat0
&pinctrl_mmc0_slot1_dat1_3>;
status = "okay";
slot@1 {
reg = <1>;
bus-width = <4>;
cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
};
};
usart0: serial@fffb0000 {
pinctrl-0 =
<&pinctrl_usart0
&pinctrl_usart0_rts
&pinctrl_usart0_cts
&pinctrl_usart0_dtr_dsr
&pinctrl_usart0_dcd
&pinctrl_usart0_ri>;
status = "okay";
};
usart1: serial@fffb4000 {
status = "okay";
};
ssc0: ssc@fffbc000 {
status = "okay";
pinctrl-0 = <&pinctrl_ssc0_tx>;
};
macb0: ethernet@fffc4000 {
phy-mode = "rmii";
status = "okay";
};
spi0: spi@fffc8000 {
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
mtd_dataflash@0 {
compatible = "atmel,at45", "atmel,dataflash";
spi-max-frequency = <50000000>;
reg = <1>;
};
};
dbgu: serial@fffff200 {
status = "okay";
};
pinctrl@fffff400 {
board {
pinctrl_board_mmc0_slot1: mmc0_slot1-board {
atmel,pins =
<AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
};
};
shdwc@fffffd10 {
atmel,wakeup-counter = <10>;
atmel,wakeup-rtt-timer;
};
rtc@fffffd20 {
atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "okay";
};
watchdog@fffffd40 {
status = "okay";
};
gpbr: syscon@fffffd50 {
status = "okay";
};
};
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};
nand0: nand@40000000 {
nand-bus-width = <8>;
nand-ecc-mode = "soft";
nand-on-flash-bbt;
status = "okay";
};
};
gpio_keys {
compatible = "gpio-keys";
btn3 {
label = "Button 3";
gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>;
gpio-key,wakeup;
};
btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
gpio-key,wakeup;
};
};
i2c@0 {
status = "okay";
24c512@50 {
compatible = "24c512";
reg = <0x50>;
};
};
leds {
compatible = "gpio-leds";
ds1 {
label = "ds1";
gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
ds5 {
label = "ds5";
gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
};
};
};

5
arch/arm/boot/dts/sama5d2.dtsi
View File

@ -72,6 +72,11 @@
};
};
pmu {
compatible = "arm,cortex-a5-pmu";
interrupts = <2 IRQ_TYPE_LEVEL_HIGH 0>;
};
memory {
reg = <0x20000000 0x20000000>;
};