mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 06:41:06 -04:00
Merge tag 'samsung-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt
Samsung DTS ARM changes for v5.11, part two 1. Add devicetree of Samsung Galaxy Note 10.1 tablets (GT-N8010/GT-N8013), called P4 Note. These are quite old but still functional devices, based on Exynos4412. 2. Minor cleanups in Odroid XU3 Ethernet. 3. Minor fixes: ADC io-channel-ranges and P4 Note touchscreen GPIO polarity. * tag 'samsung-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: switch Atmel mxt reset GPIO to active low on P4 Note ARM: dts: s5pv210: Drop unneeded io-channel-ranges property in Aries ARM: dts: s5pv210: Drop incorrect use of io-channel-ranges property ARM: dts: exynos: Drop incorrect use of io-channel-ranges ARM: dts: exynos: add Samsung's Exynos4412-based P4 Note boards dt-bindings: arm: samsung: document bindings for P4 Note family board ARM: dts: exynos: Add an alias for the Ethernet interface on Odroid XU3 ARM: dts: exynos: Fix Ethernet interface description on Odroid XU3 Link: https://lore.kernel.org/r/20201201204404.22675-2-krzk@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -83,6 +83,14 @@ properties:
|
||||
- const: samsung,exynos4412
|
||||
- const: samsung,exynos4
|
||||
|
||||
- description: Samsung p4note family boards
|
||||
items:
|
||||
- enum:
|
||||
- samsung,n8010 # Samsung GT-N8010/GT-N8013
|
||||
- const: samsung,p4note
|
||||
- const: samsung,exynos4412
|
||||
- const: samsung,exynos4
|
||||
|
||||
- description: Exynos5250 based boards
|
||||
items:
|
||||
- enum:
|
||||
|
||||
@@ -197,6 +197,7 @@ dtb-$(CONFIG_ARCH_EXYNOS4) += \
|
||||
exynos4412-odroidx.dtb \
|
||||
exynos4412-odroidx2.dtb \
|
||||
exynos4412-origen.dtb \
|
||||
exynos4412-p4note-n8010.dtb \
|
||||
exynos4412-smdk4412.dtb \
|
||||
exynos4412-tiny4412.dtb \
|
||||
exynos4412-trats2.dtb
|
||||
|
||||
@@ -439,7 +439,6 @@ adc: adc@126c0000 {
|
||||
clock-names = "adc", "sclk";
|
||||
clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;
|
||||
#io-channel-cells = <1>;
|
||||
io-channel-ranges;
|
||||
samsung,syscon-phandle = <&pmu_system_controller>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
17
arch/arm/boot/dts/exynos4412-p4note-n8010.dts
Normal file
17
arch/arm/boot/dts/exynos4412-p4note-n8010.dts
Normal file
@@ -0,0 +1,17 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Samsung's Galaxy Note 10.1 - N801x (wifi only version)
|
||||
*
|
||||
* Copyright (c) 2013 Samsung Electronics Co., Ltd.
|
||||
* http://www.samsung.com
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "exynos4412-p4note.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Samsung Galaxy Note 10.1 (GT-N8010/N8013) based on Exynos4412";
|
||||
compatible = "samsung,n8010", "samsung,p4note", "samsung,exynos4412", "samsung,exynos4";
|
||||
|
||||
/* this is the base variant without any kind of modem */
|
||||
};
|
||||
1132
arch/arm/boot/dts/exynos4412-p4note.dtsi
Normal file
1132
arch/arm/boot/dts/exynos4412-p4note.dtsi
Normal file
File diff suppressed because it is too large
Load Diff
@@ -274,7 +274,6 @@ adc: adc@126c0000 {
|
||||
clocks = <&clock CLK_TSADC>;
|
||||
clock-names = "adc";
|
||||
#io-channel-cells = <1>;
|
||||
io-channel-ranges;
|
||||
samsung,syscon-phandle = <&pmu_system_controller>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -844,7 +844,6 @@ adc: adc@12d10000 {
|
||||
clocks = <&clock CLK_ADC>;
|
||||
clock-names = "adc";
|
||||
#io-channel-cells = <1>;
|
||||
io-channel-ranges;
|
||||
samsung,syscon-phandle = <&pmu_system_controller>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -15,6 +15,10 @@
|
||||
/ {
|
||||
model = "Hardkernel Odroid XU3";
|
||||
compatible = "hardkernel,odroid-xu3", "samsung,exynos5800", "samsung,exynos5";
|
||||
|
||||
aliases {
|
||||
ethernet = ðernet;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c_0 {
|
||||
@@ -76,13 +80,13 @@ &usbhost2 {
|
||||
#size-cells = <0>;
|
||||
|
||||
hub@1 {
|
||||
compatible = "usb8087,0024";
|
||||
compatible = "usb0424,9514";
|
||||
reg = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
ethernet: usbether@1 {
|
||||
compatible = "usb0c45,6310";
|
||||
compatible = "usb0424,ec00";
|
||||
reg = <1>;
|
||||
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
|
||||
};
|
||||
|
||||
@@ -101,7 +101,6 @@ adc: adc@12d10000 {
|
||||
reg = <0x12d10000 0x100>;
|
||||
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
|
||||
#io-channel-cells = <1>;
|
||||
io-channel-ranges;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
||||
@@ -589,7 +589,6 @@ gp2a_shunt: current-sense-shunt {
|
||||
io-channels = <&adc 9>;
|
||||
shunt-resistor-micro-ohms = <47000000>; /* 47 ohms */
|
||||
#io-channel-cells = <0>;
|
||||
io-channel-ranges;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -149,7 +149,6 @@ adc: adc@e1700000 {
|
||||
clocks = <&clocks CLK_TSADC>;
|
||||
clock-names = "adc";
|
||||
#io-channel-cells = <1>;
|
||||
io-channel-ranges;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user